From 21cfa24bc1491bce697f4496ce207982799fef20 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 23 Feb 2021 12:12:16 +0200 Subject: [PATCH] chore(release): 1.22.0 (#2590) See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.22.0/CHANGELOG.md) --- .github/dependabot.yml | 25 +- .github/workflows/auto-approve.yml | 13 + .github/workflows/dependabot.yml | 28 - .github/workflows/main.yml | 2 +- CHANGELOG.md | 10 + .../content/specification/2-type-system.md | 4 +- lerna.json | 2 +- package.json | 8 +- .../@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/go-runtime/.gitignore | 1 + .../@jsii/go-runtime/build-tools/gen-calc.ts | 1 + packages/@jsii/go-runtime/build-tools/gen.ts | 145 +- packages/@jsii/go-runtime/go.mod | 10 +- .../go-runtime/jsii-calc-test/main_test.go | 61 + .../@jsii/go-runtime/jsii-runtime-go/api.go | 26 +- .../go-runtime/jsii-runtime-go/client.go | 8 +- .../@jsii/go-runtime/jsii-runtime-go/doc.go | 4 + .../go-runtime/jsii-runtime-go/runtime.go | 223 +- .../jsii-runtime-go/type-registry.go | 196 ++ packages/@jsii/go-runtime/package.json | 4 +- packages/@jsii/integ-test/package.json | 4 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/kernel/package.json | 4 +- packages/@jsii/runtime/package.json | 6 +- packages/@jsii/runtime/test/playback.test.ts | 2 +- packages/@jsii/spec/package.json | 4 +- .../jsii-calc-base-of-base/package.json | 10 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 4 +- packages/jsii-calc/package.json | 4 +- packages/jsii-config/package.json | 4 +- packages/jsii-diff/package.json | 4 +- packages/jsii-pacmak/lib/targets/go.ts | 3 + .../jsii-pacmak/lib/targets/go/package.ts | 150 +- .../lib/targets/go/runtime/constants.ts | 4 +- .../lib/targets/go/runtime/function-call.ts | 31 +- .../lib/targets/go/runtime/method-call.ts | 2 - .../lib/targets/go/runtime/property-access.ts | 2 - .../jsii-pacmak/lib/targets/go/types/class.ts | 15 +- .../jsii-pacmak/lib/targets/go/types/enum.ts | 41 +- .../lib/targets/go/types/go-type-reference.ts | 28 - .../lib/targets/go/types/go-type.ts | 10 +- .../lib/targets/go/types/interface.ts | 15 +- .../lib/targets/go/types/struct.ts | 14 +- packages/jsii-pacmak/package.json | 4 +- packages/jsii-pacmak/test/build-test.sh | 6 +- .../prerelease-identifiers.test.ts.snap | 36 +- .../__snapshots__/target-go.test.ts.snap | 2718 ++++++++++------- packages/jsii-reflect/package.json | 4 +- packages/jsii-rosetta/package.json | 4 +- packages/jsii/lib/compiler.ts | 8 +- packages/jsii/package.json | 4 +- packages/oo-ascii-tree/package.json | 4 +- yarn.lock | 278 +- 56 files changed, 2703 insertions(+), 1505 deletions(-) create mode 100644 .github/workflows/auto-approve.yml delete mode 100644 .github/workflows/dependabot.yml create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/doc.go create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/type-registry.go diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e5104e642..bcc121c738 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,25 +1,10 @@ version: 2 updates: - - package-ecosystem: npm - directory: '/' - schedule: - interval: daily - labels: - - dependencies - versioning-strategy: increase - ignore: - - dependency-name: typescript - versions: - - '>= 3.10.a' - - dependency-name: '@types/node' - versions: - - '>= 11.a' - - package-ecosystem: nuget directory: '/packages/@jsii/dotnet-runtime/src' schedule: - interval: daily + interval: weekly labels: - dependencies - language/dotnet @@ -27,7 +12,7 @@ updates: - package-ecosystem: nuget directory: '/packages/@jsii/dotnet-runtime-test/test' schedule: - interval: daily + interval: weekly labels: - dependencies - language/dotnet @@ -35,7 +20,7 @@ updates: - package-ecosystem: pip directory: '/packages/@jsii/python-runtime' schedule: - interval: daily + interval: weekly labels: - dependencies - language/python @@ -43,7 +28,7 @@ updates: - package-ecosystem: pip directory: '/gh-pages' schedule: - interval: daily + interval: weekly labels: - dependencies - language/python @@ -68,3 +53,5 @@ updates: directory: '/' schedule: interval: daily + labels: + - dependencies diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml new file mode 100644 index 0000000000..312888dafa --- /dev/null +++ b/.github/workflows/auto-approve.yml @@ -0,0 +1,13 @@ +# Approve PRs with "pr/auto-approve". mergify takes care of the actual merge. + +name: auto-approve +on: pull_request + +jobs: + auto-approve: + if: contains(github.event.pull_request.labels.*.name, 'pr/auto-approve') + runs-on: ubuntu-latest + steps: + - uses: hmarr/auto-approve-action@v2.0.0 + with: + github-token: "${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }}" diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml deleted file mode 100644 index 0a708a5c84..0000000000 --- a/.github/workflows/dependabot.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Automatically manage PRs made by Dependabot - -name: Dependabot Pull Requests -on: - pull_request: - branches: - - main - paths: - - "!**" # <-- Excludes everything by default - - "**/package.json" # <-- Allows modfying any package.json - - "**/*.csproj" # <-- Allows modifying any .csproj file - - "**/Directory.Build.targets" # <-- Allows modifying any Directory.Build.targets file - - "yarn.lock" # <-- Allows modifying yarn.lock - types: - - opened - -jobs: - approve: - name: Auto-Approve - if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]' - runs-on: ubuntu-latest - steps: - - name: Request @dependabot auto-merge - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - command: 'squash and merge' - github-token: ${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }} - target: minor diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1110498fe1..43a1c4a051 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -415,7 +415,7 @@ jobs: - name: Integration Test (build) run: |- - npx lerna run build --concurrency=2 --stream 2>&1 > ${{ runner.temp }}/build.log + npx lerna run build --concurrency=1 --stream 2>&1 > ${{ runner.temp }}/build.log working-directory: aws-cdk env: # Make lots of memory available, aws-cdk-lib is __large__ diff --git a/CHANGELOG.md b/CHANGELOG.md index b10d960fce..69624768a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.22.0](https://github.com/aws/jsii/compare/v1.21.0...v1.22.0) (2021-02-18) + + +### Bug Fixes + +* **go:** map values incorrectly handled though de/serialization ([#2587](https://github.com/aws/jsii/issues/2587)) ([0359928](https://github.com/aws/jsii/commit/035992887b3346e6cb1e66d0bb66c3029de2917f)) +* **go-runtime:** enums are not encoded/decoded correctly ([#2585](https://github.com/aws/jsii/issues/2585)) ([4731aeb](https://github.com/aws/jsii/commit/4731aeb6ad85c04160b30232e85e3f8a43c712a6)), closes [#2534](https://github.com/aws/jsii/issues/2534) +* **jsii:** excessive "exclude" in "tsconfig.json" ([#1736](https://github.com/aws/jsii/issues/1736)) ([ecffb9f](https://github.com/aws/jsii/commit/ecffb9f9dd7f02643fb2af30d9c0052f7465691d)) +* **pacmak:** go local replace do not respect `--outdir` in some cases ([#2584](https://github.com/aws/jsii/issues/2584)) ([b9b9b4c](https://github.com/aws/jsii/commit/b9b9b4ca9dbb535b714df4ba506a31a5fc56c773)) + ## [1.21.0](https://github.com/aws/jsii/compare/v1.20.1...v1.21.0) (2021-02-15) diff --git a/gh-pages/content/specification/2-type-system.md b/gh-pages/content/specification/2-type-system.md index 5bad34a67a..1d774ce0b7 100644 --- a/gh-pages/content/specification/2-type-system.md +++ b/gh-pages/content/specification/2-type-system.md @@ -230,10 +230,10 @@ value: In **JavaScript**, `enum` entries are represented by their value equivalent. In order to support statically typed representations in other languages, these are serialized using a dedicated wrapper object, using a single key -(`$jsii.enum`) with the fully qualified name of the `enum` entry: +(`$jsii.enum`) with the fully qualified name of the `enum` entry (formatted as `/`): ```json -{ "$jsii.enum": "@scope/module.EnumType.ENTRY_NAME" } +{ "$jsii.enum": "@scope/module.EnumType/ENTRY_NAME" } ``` ### Identity Serialization diff --git a/lerna.json b/lerna.json index 8c08d9568b..01e322d2be 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.21.0" + "version": "1.22.0" } diff --git a/package.json b/package.json index ffb5c48f0e..be474577a7 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,13 @@ }, "devDependencies": { "@jest/types": "^26.6.2", - "@typescript-eslint/eslint-plugin": "^4.15.0", - "@typescript-eslint/parser": "^4.15.0", + "@typescript-eslint/eslint-plugin": "^4.15.1", + "@typescript-eslint/parser": "^4.15.1", "all-contributors-cli": "^6.20.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "eslint-config-prettier": "^7.2.0", "eslint-import-resolver-node": "^0.3.4", - "eslint-import-resolver-typescript": "^2.3.0", + "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-prettier": "^3.3.1", "jest-circus": "^26.6.3", diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index ef3f050780..23c957d93c 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@jsii/dotnet-runtime": "^0.0.0", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "jsii-calc": "^3.20.120", "jsii-pacmak": "^0.0.0", "typescript": "~3.9.9" diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 36a8eec561..160651039b 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/semver": "^7.3.4", "jsii-build-tools": "^0.0.0", "semver": "^7.3.4", diff --git a/packages/@jsii/go-runtime/.gitignore b/packages/@jsii/go-runtime/.gitignore index deeeb002ec..94ac84e87e 100644 --- a/packages/@jsii/go-runtime/.gitignore +++ b/packages/@jsii/go-runtime/.gitignore @@ -1,5 +1,6 @@ /jsii-calc/ *.generated.go +*.generated_test.go *.js *.d.ts diff --git a/packages/@jsii/go-runtime/build-tools/gen-calc.ts b/packages/@jsii/go-runtime/build-tools/gen-calc.ts index bbdeb1c82b..39ddd994a3 100644 --- a/packages/@jsii/go-runtime/build-tools/gen-calc.ts +++ b/packages/@jsii/go-runtime/build-tools/gen-calc.ts @@ -15,6 +15,7 @@ runCommand( '-t', 'go', '-v', + '-c', '-o', genRoot, '--recurse', diff --git a/packages/@jsii/go-runtime/build-tools/gen.ts b/packages/@jsii/go-runtime/build-tools/gen.ts index aaaeb51900..46ad7b7ee0 100644 --- a/packages/@jsii/go-runtime/build-tools/gen.ts +++ b/packages/@jsii/go-runtime/build-tools/gen.ts @@ -1,6 +1,7 @@ #!/usr/bin/env npx ts-node import { CodeMaker } from 'codemaker'; +import { createHash } from 'crypto'; import { readdirSync, readFileSync, statSync } from 'fs'; import { resolve } from 'path'; @@ -15,6 +16,7 @@ const EMBEDDED_RUNTIME_ROOT = resolve( const OUTPUT_DIR = resolve(__dirname, '..', 'jsii-runtime-go'); const RUNTIME_FILE = 'embeddedruntime.generated.go'; +const RUNTIME_TEST_FILE = 'embeddedruntime.generated_test.go'; const VERSION_FILE = 'version.generated.go'; const code = new CodeMaker({ indentationLevel: 1, indentCharacter: '\t' }); @@ -23,8 +25,10 @@ code.openFile(RUNTIME_FILE); code.line('package jsii'); code.line(); code.open('var embeddedruntime = map[string][]byte{'); -const bytesPerLine = 16; -const fileSize: Record = {}; +const fileInfo: Record< + string, + { readonly size: number; readonly hash: readonly string[] } +> = {}; (function emitFiles(directory: string, prefix?: string) { for (const file of readdirSync(directory)) { @@ -42,13 +46,13 @@ const fileSize: Record = {}; const key = prefix ? `${prefix}/${file}` : file; - const byteSlice = getByteSlice(fullPath); - fileSize[key] = byteSlice.length; + const { byteSlice, hash } = getByteSlice(fullPath); + fileInfo[key] = { + size: byteSlice.length, + hash, + }; code.open(`${JSON.stringify(key)}: []byte{`); - for (let i = 0; i < byteSlice.length; i += bytesPerLine) { - const line = byteSlice.slice(i, i + bytesPerLine); - code.line(`${line.join(', ')},`); - } + formatBytes(code, byteSlice); code.close('},'); } })(EMBEDDED_RUNTIME_ROOT); @@ -56,21 +60,69 @@ const fileSize: Record = {}; code.close('}'); code.line(); const mainKey = JSON.stringify( - Object.keys(fileSize).find((f) => f.endsWith('jsii-runtime.js')), + Object.keys(fileInfo).find((f) => f.endsWith('jsii-runtime.js')), )!; code.line(`const embeddedruntimeMain = ${mainKey}`); +code.closeFile(RUNTIME_FILE); + +// This allows us to sanity-check we've generated correct data +code.openFile(RUNTIME_TEST_FILE); +code.line('package jsii'); code.line(); -// This performs sanity tests upon initialization -code.open('func init() {'); -for (const [file, size] of Object.entries(fileSize)) { - code.open(`if len(embeddedruntime[${JSON.stringify(file)}]) != ${size} {`); - code.line( - `panic("Embedded runtime file ${file} does not have expected size of ${size} bytes!")`, - ); - code.close('}'); +code.open('import ('); +code.line('"crypto/sha512"'); +code.line('"testing"'); +code.close(')'); +code.line(); +code.openBlock('func TestEmbeddedruntime(t *testing.T)'); + +code.open( + 't.Run("embeddedruntime[embeddedruntimeMain] exists", func(t *testing.T) {', +); +code.openBlock('if _, exists := embeddedruntime[embeddedruntimeMain]; !exists'); +code.line( + 't.Errorf("embeddedruntimeMain refers to non-existent file %s", embeddedruntimeMain)', +); +code.closeBlock(); +code.close('})'); + +for (const [file, { size, hash }] of Object.entries(fileInfo)) { + code.line(); + code.open(`t.Run("embeddedruntime[\\"${file}\\"]", func(t *testing.T) {`); + + code.open('checkEmbeddedFile('); + code.line('t,'); + code.line(`"${file}",`); + code.line(`${readableNumber(size)},`); + code.open('[sha512.Size]byte{'); + formatBytes(code, hash); + code.close('},'); + code.close(')'); + + code.close('})'); } -code.close('}'); -code.closeFile(RUNTIME_FILE); +code.closeBlock(); +code.line(); +code.openBlock( + 'func checkEmbeddedFile(t *testing.T, name string, expectedSize int, expectedHash [sha512.Size]byte)', +); +code.line('data := embeddedruntime[name]'); +code.line(); +code.line('size := len(data)'); +code.openBlock('if size != expectedSize'); +code.line( + 't.Errorf("Size mismatch: expected %d bytes, got %d", expectedSize, size)', +); +code.closeBlock(); +code.line(); +code.line('hash := sha512.Sum512(data)'); +code.openBlock('if hash != expectedHash'); +code.line( + 't.Errorf("SHA512 do not match:\\nExpected: %x\\nActual: %x", expectedHash, hash)', +); +code.closeBlock(); +code.closeBlock(); +code.closeFile(RUNTIME_TEST_FILE); code.openFile(VERSION_FILE); code.line('package jsii'); @@ -83,12 +135,57 @@ code.closeFile(VERSION_FILE); code.save(OUTPUT_DIR).catch(console.error); -function getByteSlice(path: string) { - const fileData = readFileSync(path).toString('hex'); +function getByteSlice(path: string): { byteSlice: string[]; hash: string[] } { + const rawData = readFileSync(path); + return { + byteSlice: toHexBytes(rawData), + hash: toHexBytes(createHash('SHA512').update(rawData).digest()), + }; +} + +function toHexBytes(rawData: Buffer): string[] { + const hexString = rawData.toString('hex'); const result = []; - for (let i = 0; i < fileData.length; i += 2) { - result.push(`0x${fileData[i]}${fileData[i + 1]}`); + for (let i = 0; i < hexString.length; i += 2) { + result.push(`0x${hexString[i]}${hexString[i + 1]}`); } - return result; } + +function formatBytes( + code: CodeMaker, + byteSlice: readonly string[], + bytesPerLine = 16, +) { + for (let i = 0; i < byteSlice.length; i += bytesPerLine) { + const line = byteSlice.slice(i, i + bytesPerLine); + code.line(`${line.join(', ')},`); + } +} + +/** + * Turns a integer into a "human-readable" format, adding an `_` thousand + * separator. + * + * @param val an integer to be formatted. + * + * @returns the formatted number with thousand separators. + */ +function readableNumber(val: number): string { + return val.toFixed(0).replace( + // This regex can be a little jarring, so it is annotated below with the + // corresponding explanation. It can also be explained in plain english: + // matches the position before any sequence of N consecutive digits (0-9) + // where N is a multiple of 3. + /**/ /\B(?=(\d{3})+(?!\d))/g, + // \B -- not a word boundary (i.e: not start of input) + // (?= ) -- positive lookahead (does not consume input) + // ( )+ -- repeated one or more times + // \d -- any digit (0-9) + // {3} -- repeated exactly 3 times + // (?! ) -- negative lookahead (does not consume input) + // \d -- any digit (0-9), negated by surrounding group + // + '_', + ); +} diff --git a/packages/@jsii/go-runtime/go.mod b/packages/@jsii/go-runtime/go.mod index 57b9a15a5f..2a73c7aeeb 100644 --- a/packages/@jsii/go-runtime/go.mod +++ b/packages/@jsii/go-runtime/go.mod @@ -9,9 +9,9 @@ require ( ) replace ( - github.com/aws/jsii-runtime-go v0.0.0 => ./jsii-runtime-go - github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 v3.20.120 => ./jsii-calc/go/jsiicalc - github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase v0.0.0 => ./jsii-calc/go/scopejsiicalcbase - github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 => ./jsii-calc/go/scopejsiicalcbaseofbase - github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0 => ./jsii-calc/go/scopejsiicalclib + github.com/aws/jsii-runtime-go => ./jsii-runtime-go + github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 => ./jsii-calc/go/jsiicalc + github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase => ./jsii-calc/go/scopejsiicalcbase + github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 => ./jsii-calc/go/scopejsiicalcbaseofbase + github.com/aws/jsii/jsii-calc/go/scopejsiicalclib => ./jsii-calc/go/scopejsiicalclib ) diff --git a/packages/@jsii/go-runtime/jsii-calc-test/main_test.go b/packages/@jsii/go-runtime/jsii-calc-test/main_test.go index d19d5e48ac..e2e254946f 100644 --- a/packages/@jsii/go-runtime/jsii-calc-test/main_test.go +++ b/packages/@jsii/go-runtime/jsii-calc-test/main_test.go @@ -157,6 +157,46 @@ func TestAllTypes(t *testing.T) { }) } +func TestEnumUnmarshal(t *testing.T) { + actual := calc.EnumDispenser_RandomStringLikeEnum() + if actual != calc.StringEnumB { + t.Errorf("Expected StringEnum.B. Actual: %s", actual) + } +} + +func TestEnumRoundtrip(t *testing.T) { + allTypes := calc.NewAllTypes() + actual := allTypes.EnumMethod(calc.StringEnumA) + if actual != calc.StringEnumA { + t.Errorf("Expected StringEnum.A. Actual: %s", actual) + } + + actual = allTypes.EnumMethod(calc.StringEnumC) + if actual != calc.StringEnumC { + t.Errorf("Expected StringEnum.C. Actual: %s", actual) + } +} + +func TestOptionalEnums(t *testing.T) { + allTypes := calc.NewAllTypes() + actual := allTypes.GetOptionalEnumValue() + if actual != "" { + t.Error("Expected value to be nil") + } + + allTypes.SetOptionalEnumValue(calc.StringEnumB) + actual = allTypes.GetOptionalEnumValue() + if actual != calc.StringEnumB { + t.Errorf("Expected StringEnum.B. Actual: %s", actual) + } + + allTypes.SetOptionalEnumValue("") + actual = allTypes.GetOptionalEnumValue() + if actual != "" { + t.Error("Expected value to be nil") + } +} + func TestReturnsSpecialParam(t *testing.T) { retSpecialParam := returnsParam.NewReturnsSpecialParameter() val := retSpecialParam.ReturnsSpecialParam() @@ -166,3 +206,24 @@ func TestReturnsSpecialParam(t *testing.T) { t.Errorf("Expected type: %s; Actual: %s", expected, actual) } } + +func TestMaps(t *testing.T) { + allTypes := calc.NewAllTypes() + actual := allTypes.GetMapProperty() + if len(actual) != 0 { + t.Errorf("Expected length of empty map to be 0. Got: %d", len(actual)) + } + + question := "The answer to the ultimate question of life, the universe, and everything" + answer := calclib.NewNumber(42) + allTypes.SetMapProperty(map[string]calclib.NumberIface{ + question: answer, + }) + actual = allTypes.GetMapProperty() + if len(actual) != 1 { + t.Errorf("Expected length of empty map to be 1. Got: %d", len(actual)) + } + if actual[question].GetValue() != answer.GetValue() { + t.Errorf("Expected to have the value %v in there, got: %v", answer, actual[question]) + } +} diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/api.go b/packages/@jsii/go-runtime/jsii-runtime-go/api.go index ca8dafa357..844006ece9 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/api.go +++ b/packages/@jsii/go-runtime/jsii-runtime-go/api.go @@ -85,10 +85,18 @@ func (r kernelResponder) isResponse() { return } -type objref struct { +type objectRef struct { InstanceID string `json:"$jsii.byref"` } +type enumRef struct { + MemberFQN string `json:"$jsii.enum"` +} + +type wireMap struct { + MapData map[string]interface{} `json:"$jsii.map"` +} + type loadRequest struct { kernelRequester @@ -125,8 +133,8 @@ type createResponse struct { type delRequest struct { kernelRequester - API string `json:"api"` - ObjRef objref `json:"objref"` + API string `json:"api"` + ObjRef objectRef `json:"objref"` } type delResponse struct { @@ -136,9 +144,9 @@ type delResponse struct { type getRequest struct { kernelRequester - API string `json:"api"` - Property string `json:"property"` - ObjRef objref `json:"objref"` + API string `json:"api"` + Property string `json:"property"` + ObjRef objectRef `json:"objref"` } type staticGetRequest struct { @@ -161,7 +169,7 @@ type setRequest struct { API string `json:"api"` Property string `json:"property"` Value interface{} `json:"value"` - ObjRef objref `json:"objref"` + ObjRef objectRef `json:"objref"` } type staticSetRequest struct { @@ -192,7 +200,7 @@ type invokeRequest struct { API string `json:"api"` Method string `json:"method"` Arguments []interface{} `json:"args"` - ObjRef objref `json:"objref"` + ObjRef objectRef `json:"objref"` } type invokeResponse struct { @@ -207,7 +215,7 @@ type beginRequest struct { API string `json:"api"` Method *string `json:"method"` Arguments []interface{} `json:"args"` - ObjRef objref `json:"objref"` + ObjRef objectRef `json:"objref"` } type beginResponse struct { diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/client.go b/packages/@jsii/go-runtime/jsii-runtime-go/client.go index 01078361d7..1c6914bfc5 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/client.go +++ b/packages/@jsii/go-runtime/jsii-runtime-go/client.go @@ -35,6 +35,7 @@ type client struct { stdin io.WriteCloser tmpdir string + types *typeRegistry objects map[interface{}]string } @@ -86,6 +87,7 @@ func newClient() (*client, error) { clientinstance := &client{ objects: objmap, + types: newTypeRegistry(), } // Register a finalizer to call Close() @@ -170,13 +172,13 @@ func newClient() (*client, error) { if len(line) > 0 { result := consoleMessage{} err := json.Unmarshal(line, &result) - if (err != nil) { + if err != nil { fmt.Fprintf(os.Stderr, "%s\n", line) } else { - if (result.Stderr != nil) { + if result.Stderr != nil { os.Stderr.Write(result.Stderr) } - if (result.Stdout != nil) { + if result.Stdout != nil { os.Stdout.Write(result.Stdout) } } diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/doc.go b/packages/@jsii/go-runtime/jsii-runtime-go/doc.go new file mode 100644 index 0000000000..8e7fcd37e6 --- /dev/null +++ b/packages/@jsii/go-runtime/jsii-runtime-go/doc.go @@ -0,0 +1,4 @@ +// Package jsii provides the APIs used by code generated by the jsii-pacmak tool +// to interact with the @jsii/kernel process. It is not intended for users to +// directly interact with, and doing so could result in incorrect behavior. +package jsii diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go b/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go index f435c82b67..e18c52a89a 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go +++ b/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go @@ -8,11 +8,6 @@ import ( "regexp" ) -// Maps interface types to their concrete implementation structs. Used by -// `castAndSetToPtr` to instantiate a concrete type that implements the -// the interface as dictated by the type of the ret value. -type implementationMap = map[reflect.Type]reflect.Type - // Load ensures a npm package is loaded in the jsii kernel. func Load(name string, version string, tarball []byte) { client := getClient() @@ -42,6 +37,50 @@ func Load(name string, version string, tarball []byte) { } } +// RegisterClass associates a class fully qualified name to the specified struct +// type, and class interface. Panics if class is not a struct, iface is not an +// interface, or if the provided fqn was already used to register a different +// type. +func RegisterClass(fqn FQN, class reflect.Type, iface reflect.Type) { + client := getClient() + if err := client.types.registerClass(fqn, class, iface); err != nil { + panic(err) + } +} + +// RegisterEnum associates an enum's fully qualified name to the specified enum +// type, and members. Panics if enum is not a reflect.String type, any value in +// the provided members map is of a type ofther than enum, or if the provided +// fqn was already used to register a different type. +func RegisterEnum(fqn FQN, enum reflect.Type, members map[string]interface{}) { + client := getClient() + if err := client.types.registerEnum(fqn, enum, members); err != nil { + panic(err) + } +} + +// RegisterInterface associates an interface's fully qualified name to the +// specified interface type, and proxy struct. Panics if iface is not an +// interface, proxy is not a struct, or if the provided fqn was already used to +// register a different type. +func RegisterInterface(fqn FQN, iface reflect.Type, proxy reflect.Type) { + client := getClient() + if err := client.types.registerInterface(fqn, iface, proxy); err != nil { + panic(err) + } +} + +// RegisterStruct associates a struct's fully qualified name to the specified +// struct type, and struct interface. Panics if strct is not a struct, iface is +// not an interface, or if the provided fqn was already used to register a +// different type. +func RegisterStruct(fqn FQN, strct reflect.Type, iface reflect.Type) { + client := getClient() + if err := client.types.registerStruct(fqn, strct, iface); err != nil { + panic(err) + } +} + // Create will construct a new JSII object within the kernel runtime. This is // called by jsii object constructors. func Create(fqn FQN, args []interface{}, interfaces []FQN, overrides []Override, ret interface{}) { @@ -64,7 +103,7 @@ func Create(fqn FQN, args []interface{}, interfaces []FQN, overrides []Override, // Invoke will call a method on a jsii class instance. The response should be // decoded into the expected return type for the method being called. -func Invoke(obj interface{}, method string, args []interface{}, hasReturn bool, ret interface{}, implMap implementationMap) { +func Invoke(obj interface{}, method string, args []interface{}, hasReturn bool, ret interface{}) { client := getClient() // Find reference to class instance in client @@ -78,7 +117,7 @@ func Invoke(obj interface{}, method string, args []interface{}, hasReturn bool, API: "invoke", Method: method, Arguments: castPtrsToRef(args), - ObjRef: objref{ + ObjRef: objectRef{ InstanceID: refid, }, }) @@ -88,13 +127,13 @@ func Invoke(obj interface{}, method string, args []interface{}, hasReturn bool, } if hasReturn { - castAndSetToPtr(ret, res.Result, implMap) + client.castAndSetToPtr(ret, res.Result) } } -// InvokeStatic will call a static method on a given jsii class. The response +// StaticInvoke will call a static method on a given jsii class. The response // should be decoded into the expected return type for the method being called. -func InvokeStatic(fqn FQN, method string, args []interface{}, hasReturn bool, ret interface{}, implMap implementationMap) { +func StaticInvoke(fqn FQN, method string, args []interface{}, hasReturn bool, ret interface{}) { client := getClient() res, err := client.sinvoke(staticInvokeRequest{ @@ -109,13 +148,13 @@ func InvokeStatic(fqn FQN, method string, args []interface{}, hasReturn bool, re } if hasReturn { - castAndSetToPtr(ret, res.Result, implMap) + client.castAndSetToPtr(ret, res.Result) } } // Get reads a property value on a given jsii class instance. The response // should be decoded into the expected type of the property being read. -func Get(obj interface{}, property string, ret interface{}, implMap implementationMap) { +func Get(obj interface{}, property string, ret interface{}) { client := getClient() // Find reference to class instance in client @@ -128,7 +167,7 @@ func Get(obj interface{}, property string, ret interface{}, implMap implementati res, err := client.get(getRequest{ API: "get", Property: property, - ObjRef: objref{ + ObjRef: objectRef{ InstanceID: refid, }, }) @@ -137,12 +176,12 @@ func Get(obj interface{}, property string, ret interface{}, implMap implementati panic(err) } - castAndSetToPtr(ret, res.Value, implMap) + client.castAndSetToPtr(ret, res.Value) } // StaticGet reads a static property value on a given jsii class. The response // should be decoded into the expected type of the property being read. -func StaticGet(fqn FQN, property string, ret interface{}, implMap implementationMap) { +func StaticGet(fqn FQN, property string, ret interface{}) { client := getClient() res, err := client.sget(staticGetRequest{ @@ -155,7 +194,7 @@ func StaticGet(fqn FQN, property string, ret interface{}, implMap implementation panic(err) } - castAndSetToPtr(ret, res.Value, implMap) + client.castAndSetToPtr(ret, res.Value) } // Set writes a property on a given jsii class instance. The value should match @@ -174,7 +213,7 @@ func Set(obj interface{}, property string, value interface{}) { API: "set", Property: property, Value: castPtrToRef(value), - ObjRef: objref{ + ObjRef: objectRef{ InstanceID: refid, }, }) @@ -201,8 +240,8 @@ func StaticSet(fqn FQN, property string, value interface{}) { } } -func castValToRef(data interface{}) (objref, bool) { - ref := objref{} +func castValToRef(data interface{}) (objectRef, bool) { + ref := objectRef{} ok := false dataVal := reflect.ValueOf(data) @@ -223,27 +262,119 @@ func castValToRef(data interface{}) (objref, bool) { return ref, ok } +func castValToEnumRef(data reflect.Value) (enum enumRef, ok bool) { + ok = false + + if data.Kind() == reflect.Map { + for _, k := range data.MapKeys() { + // Finding values type requires extracting from reflect.Value + // otherwise .Kind() returns `interface{}` + v := reflect.ValueOf(data.MapIndex(k).Interface()) + + if k.Kind() == reflect.String && k.String() == "$jsii.enum" && v.Kind() == reflect.String { + enum.MemberFQN = v.String() + ok = true + return + } + } + } + + return +} + +// castValToMap attempts converting the provided jsii wire value to a +// go map. This recognizes the "$jsii.map" object and does the necessary +// recursive value conversion. +func (c *client) castValToMap(data reflect.Value, mapType reflect.Type) (m reflect.Value, ok bool) { + ok = false + + if data.Kind() != reflect.Map || data.Type().Key().Kind() != reflect.String { + return + } + + if mapType.Kind() == reflect.Map && mapType.Key().Kind() != reflect.String { + return + } + anyType := reflect.TypeOf((*interface{})(nil)).Elem() + if mapType == anyType { + mapType = reflect.TypeOf((map[string]interface{})(nil)) + } + + dataIter := data.MapRange() + for dataIter.Next() { + key := dataIter.Key().String() + if key != "$jsii.map" { + continue + } + + // Finding value type requries extracting from reflect.Value + // otherwise .Kind() returns `interface{}` + val := reflect.ValueOf(dataIter.Value().Interface()) + if val.Kind() != reflect.Map { + return + } + + ok = true + + m = reflect.MakeMap(mapType) + + iter := val.MapRange() + for iter.Next() { + val := iter.Value().Interface() + // Note: reflect.New(t) returns a pointer to a newly allocated t + convertedVal := reflect.New(mapType.Elem()) + c.castAndSetToPtr(convertedVal.Interface(), val) + + m.SetMapIndex(iter.Key(), convertedVal.Elem()) + } + return + } + return +} + // Accepts pointers to structs that implement interfaces and searches for an // existing object reference in the client. If it exists, it casts it to an // objref for the runtime. Recursively casts types that may contain nested // object references. func castPtrToRef(data interface{}) interface{} { + if data == nil { + return data + } + client := getClient() dataVal := reflect.ValueOf(data) - if dataVal.Kind() == reflect.Ptr { + switch dataVal.Kind() { + case reflect.Map: + result := wireMap{MapData: make(map[string]interface{})} + + iter := dataVal.MapRange() + for iter.Next() { + key := iter.Key().String() + val := iter.Value().Interface() + result.MapData[key] = castPtrToRef(val) + } + + return result + + case reflect.Ptr: valref, valHasRef := client.findObjectRef(data) if valHasRef { - return objref{InstanceID: valref} + return objectRef{InstanceID: valref} } - } else if dataVal.Kind() == reflect.Slice { + + case reflect.Slice: refs := make([]interface{}, dataVal.Len()) for i := 0; i < dataVal.Len(); i++ { refs[i] = dataVal.Index(i).Interface() } return refs - } + case reflect.String: + if enumRef, isEnumRef := client.types.tryRenderEnumRef(dataVal); isEnumRef { + return enumRef + } + } return data } @@ -264,28 +395,54 @@ func castPtrsToRef(args []interface{}) []interface{} { // argument to be the same type. Then it sets the value of the pointer element // to be the newly cast data. This is used to cast payloads from JSII to // expected return types for Get and Invoke functions. -func castAndSetToPtr(ptr interface{}, data interface{}, implMap implementationMap) { +func (c *client) castAndSetToPtr(ptr interface{}, data interface{}) { ptrVal := reflect.ValueOf(ptr).Elem() dataVal := reflect.ValueOf(data) - ref, isRef := castValToRef(data) + // object refs + if ref, isRef := castValToRef(data); isRef { + // If return data is JSII object references, add to objects table. + if concreteType, err := c.types.concreteTypeFor(ptrVal.Type()); err == nil { + ptrVal.Set(reflect.New(concreteType)) + c.objects[ptrVal.Interface()] = ref.InstanceID + } else { + panic(err) + } + return + } + + // enums + if enumref, isEnum := castValToEnumRef(dataVal); isEnum { + member, err := c.types.enumMemberForEnumRef(enumref) + if err != nil { + panic(err) + } + + ptrVal.Set(reflect.ValueOf(member)) + return + } + + // maps + if m, isMap := c.castValToMap(dataVal, ptrVal.Type()); isMap { + ptrVal.Set(m) + return + } + // arrays if ptrVal.Kind() == reflect.Slice && dataVal.Kind() == reflect.Slice { // If return type is a slice, recursively cast elements for i := 0; i < dataVal.Len(); i++ { innerType := ptrVal.Type().Elem() inner := reflect.New(innerType) - castAndSetToPtr(inner.Interface(), dataVal.Index(i).Interface(), implMap) + c.castAndSetToPtr(inner.Interface(), dataVal.Index(i).Interface()) ptrVal.Set(reflect.Append(ptrVal, inner.Elem())) } - } else if isRef { - // If return data is JSII object references, add to objects table. - concreteType := implMap[ptrVal.Type()] - ptrVal.Set(reflect.New(concreteType)) - client := getClient() - client.objects[ptrVal.Interface()] = ref.InstanceID - } else { + + return + } + + if data != nil { val := reflect.ValueOf(data) ptrVal.Set(val) } diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/type-registry.go b/packages/@jsii/go-runtime/jsii-runtime-go/type-registry.go new file mode 100644 index 0000000000..1379cd9d8c --- /dev/null +++ b/packages/@jsii/go-runtime/jsii-runtime-go/type-registry.go @@ -0,0 +1,196 @@ +package jsii + +import ( + "fmt" + "reflect" +) + +// typeRegistry is used to record runtime type information about the loaded +// modules, which is later used to correctly convert objects received from the +// JavaScript process into native go values. +type typeRegistry struct { + // fqnToType is used to obtain the native go type for a given jsii fully + // qualified type name. The kind of type being returned depends on what the + // FQN represents... This will be the second argument of provided to a + // register* function. + // enums are not included + fqnToType map[FQN]reflect.Type + + // ifaceToStruct provides the go struct that should be used to build a proxy + // for interface types, so the correct dynamic type can be returned from a + // conversion. + ifaceToStruct map[reflect.Type]reflect.Type + + // map enum member FQNs (e.g. "jsii-calc.StringEnum/A") to the corresponding + // go const for this member. + fqnToEnumMember map[string]interface{} + + // maps Go enum type ("StringEnum") to the corresponding jsii enum FQN (e.g. + // "jsii-calc.StringEnum") + typeToEnumFQN map[reflect.Type]FQN +} + +// newTypeRegistry creates a new type registry. +func newTypeRegistry() *typeRegistry { + return &typeRegistry{ + fqnToType: make(map[FQN]reflect.Type), + ifaceToStruct: make(map[reflect.Type]reflect.Type), + fqnToEnumMember: make(map[string]interface{}), + typeToEnumFQN: make(map[reflect.Type]FQN), + } +} + +// registerClass maps the given FQN to the provided class type, and interface +// type. This returns an error if the class type is not a go struct, or if the +// interface type is not a go interface. +func (t *typeRegistry) registerClass(fqn FQN, class reflect.Type, iface reflect.Type) error { + if class.Kind() != reflect.Struct { + return fmt.Errorf("the provided class is not a struct: %v", class) + } + if iface.Kind() != reflect.Interface { + return fmt.Errorf("the provided interface is not an interface: %v", iface) + } + + if existing, exists := t.fqnToType[fqn]; exists && existing != class { + return fmt.Errorf("another type was already registered with %s: %v", fqn, existing) + } + if existing, exists := t.ifaceToStruct[iface]; exists && existing != class { + return fmt.Errorf("another struct was already registered with %v: %v", iface, existing) + } + + t.fqnToType[fqn] = class + t.ifaceToStruct[iface] = class + + return nil +} + +// registerEnum maps the given FQN to the provided enum type, and records the +// provided members map (jsii member name => go value). This returns an error +// if the provided enum is not a string derivative, or of any of the provided +// member values has a type other than enm. +func (t *typeRegistry) registerEnum(fqn FQN, enm reflect.Type, members map[string]interface{}) error { + if enm.Kind() != reflect.String { + return fmt.Errorf("the provided enum is not a string derivative: %v", enm) + } + if existing, exists := t.fqnToType[fqn]; exists && existing != enm { + return fmt.Errorf("another type was already registered with %s: %v", fqn, existing) + } + for memberName, memberVal := range members { + vt := reflect.ValueOf(memberVal).Type() + if vt != enm { + return fmt.Errorf("the enum entry for key %s has incorrect type %v", memberName, vt) + } + // Not setting in t.fqnToEnumMember here so we don't cause any side-effects + // if the pre-condition fails at any point. This is done in a second loop. + } + + t.typeToEnumFQN[enm] = fqn + for memberName, memberVal := range members { + memberFQN := fmt.Sprintf("%s/%s", fqn, memberName) + t.fqnToEnumMember[memberFQN] = memberVal + } + + return nil +} + +// registerInterface maps the given FQN to the provided interface type, and +// proxy struct. Returns an error if the provided interface is not a go +// interface, or the provided proxy type not a go struct. +func (t *typeRegistry) registerInterface(fqn FQN, iface reflect.Type, proxy reflect.Type) error { + if iface.Kind() != reflect.Interface { + return fmt.Errorf("the provided interface is not an interface: %v", iface) + } + if proxy.Kind() != reflect.Struct { + return fmt.Errorf("the provided proxy is not a struct: %v", proxy) + } + + if existing, exists := t.fqnToType[fqn]; exists && existing != iface { + return fmt.Errorf("another type was already registered with %s: %v", fqn, existing) + } + if existing, exists := t.ifaceToStruct[iface]; exists && existing != proxy { + return fmt.Errorf("another struct was already registered with %v: %v", iface, existing) + } + + t.fqnToType[fqn] = iface + t.ifaceToStruct[iface] = proxy + + return nil +} + +// registerStruct maps the given FQN to the provided struct type, and struct +// interface. Returns an error if the provided struct type is not a go struct, +// or the provided iface not a go interface. +func (t *typeRegistry) registerStruct(fqn FQN, strct reflect.Type, iface reflect.Type) error { + if strct.Kind() != reflect.Struct { + return fmt.Errorf("the provided struct is not a struct: %v", strct) + } + if iface.Kind() != reflect.Interface { + return fmt.Errorf("the provided interface is not an interface: %v", iface) + } + + if existing, exists := t.fqnToType[fqn]; exists && existing != strct { + return fmt.Errorf("another type was already registered with %s: %v", fqn, existing) + } + if existing, exists := t.ifaceToStruct[iface]; exists && existing != strct { + return fmt.Errorf("another struct was already registered with %v: %v", iface, existing) + } + + t.fqnToType[fqn] = strct + t.ifaceToStruct[iface] = strct + + return nil +} + +// concreteTypeFor returns the concrete implementation of the provided struct +// or interface type. If typ is a struct, returns typ without futher effort. If +// it is an interface, returns the struct associated to this interface type. +// Returns an error if the argument is an interface, and no struct was +// registered for it using registerClass, registerInterface or registerStruct. +func (t *typeRegistry) concreteTypeFor(typ reflect.Type) (structType reflect.Type, err error) { + if typ.Kind() == reflect.Struct { + structType = typ + err = nil + } else if typ.Kind() == reflect.Interface { + var ok bool + if structType, ok = t.ifaceToStruct[typ]; !ok { + err = fmt.Errorf("no concrete type was registered for interface: %v", typ) + } + } else { + err = fmt.Errorf("invalid argument: expected a struct or interface type, but got %v", typ) + } + return +} + +// enumMemberForEnumRef returns the go enum member corresponding to a jsii fully +// qualified enum member name (e.g: "jsii-calc.StringEnum/A"). If no enum member +// was registered (via registerEnum) for the provided enumref, an error is +// returned. +func (t *typeRegistry) enumMemberForEnumRef(ref enumRef) (interface{}, error) { + if member, ok := t.fqnToEnumMember[ref.MemberFQN]; ok { + return member, nil + } + return nil, fmt.Errorf("no enum member registered for %s", ref.MemberFQN) +} + +// tryRenderEnumRef returns an enumref if the provided value corresponds to a +// registered enum type. The returned enumref is nil if the provided enum value +// is a zero-value (i.e: ""). +func (t *typeRegistry) tryRenderEnumRef(value reflect.Value) (ref *enumRef, isEnumRef bool) { + if value.Kind() != reflect.String { + isEnumRef = false + return + } + + if enumFQN, ok := t.typeToEnumFQN[value.Type()]; ok { + isEnumRef = true + if memberName := value.String(); memberName != "" { + ref = &enumRef{MemberFQN: fmt.Sprintf("%s/%s", enumFQN, memberName)} + } else { + ref = nil + } + } else { + isEnumRef = false + } + + return +} diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json index 1c71b71f29..9bf2aaeecf 100644 --- a/packages/@jsii/go-runtime/package.json +++ b/packages/@jsii/go-runtime/package.json @@ -23,9 +23,9 @@ }, "devDependencies": { "@types/fs-extra": "^8.1.1", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "codemaker": "^0.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "fs-extra": "^9.1.0", "jsii-calc": "^3.20.120", "jsii-pacmak": "^0.0.0", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index d4e3526ed2..cf2c802257 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -30,9 +30,9 @@ "@types/dotenv": "^8.2.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/tar": "^4.0.4", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "prettier": "^2.2.1", "typescript": "~3.9.9" } diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 3ece8f9db3..fd81883740 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "jsii-build-tools": "^0.0.0", "typescript": "~3.9.9" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index c69e553ab3..02590b3439 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -41,9 +41,9 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/tar": "^4.0.4", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index aed09a102c..1e52029977 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -41,8 +41,8 @@ "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", - "eslint": "^7.19.0", + "@types/node": "^10.17.52", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", @@ -50,7 +50,7 @@ "source-map-loader": "^2.0.1", "ts-jest": "^26.5.1", "typescript": "~3.9.9", - "webpack": "^5.21.2", + "webpack": "^5.22.0", "webpack-cli": "^4.5.0" } } diff --git a/packages/@jsii/runtime/test/playback.test.ts b/packages/@jsii/runtime/test/playback.test.ts index 1dc963af32..b4bcdab792 100644 --- a/packages/@jsii/runtime/test/playback.test.ts +++ b/packages/@jsii/runtime/test/playback.test.ts @@ -54,7 +54,7 @@ function createRecords(): string { ), env: { ...process.env, JSII_RECORD: records, JSII_NOSTACK: '1' }, stdio: ['inherit', 'pipe', 'pipe'], - timeout: 60_000, // 1 minute + timeout: 300_000, // 5 minutes }, ); diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 8c2c677b89..99f5e1348a 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -35,8 +35,8 @@ }, "devDependencies": { "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", - "eslint": "^7.19.0", + "@types/node": "^10.17.52", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "prettier": "^2.2.1", diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 8ae47f6a39..80acb388c2 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -21,8 +21,8 @@ "engines": { "node": ">= 10.3.0" }, - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "build/lib/index.js", + "types": "build/lib/index.d.ts", "scripts": { "build": "jsii --project-references && jsii-rosetta", "pacmak": "jsii-pacmak", @@ -30,7 +30,7 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", @@ -58,6 +58,10 @@ "module": "scope.jsii_calc_base_of_base" } }, + "tsc": { + "outDir": "./build", + "rootDir": "." + }, "versionFormat": "short", "metadata": { "jsii": { diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 2c16eb6f1c..37355acf8d 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -35,7 +35,7 @@ "@scope/jsii-calc-base-of-base": "^2.1.1" }, "devDependencies": { - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 47f766bba5..1c7ba7b779 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -39,7 +39,7 @@ "@scope/jsii-calc-base-of-base": "^2.1.1" }, "devDependencies": { - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 6b1a199fa1..cfaa3ab77f 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -38,8 +38,8 @@ "devDependencies": { "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", - "eslint": "^7.19.0", + "@types/node": "^10.17.52", + "eslint": "^7.20.0", "jest": "^26.6.3", "prettier": "^2.2.1", "typescript": "~3.9.9" diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 0eac78f4e1..5f0b3a5924 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -50,8 +50,8 @@ "@scope/jsii-calc-lib": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.51", - "eslint": "^7.19.0", + "@types/node": "^10.17.52", + "eslint": "^7.20.0", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index a8e6227a51..1427ecc973 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -22,9 +22,9 @@ "@types/inquirer": "^7.3.1", "@types/jest": "^26.0.20", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/yargs": "^16.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "prettier": "^2.2.1", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index bc103909ea..b7af4faee9 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -44,10 +44,10 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/tar-fs": "^2.0.0", "@types/yargs": "^16.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii": "^0.0.0", diff --git a/packages/jsii-pacmak/lib/targets/go.ts b/packages/jsii-pacmak/lib/targets/go.ts index 55eb3a812c..5101daf9c7 100644 --- a/packages/jsii-pacmak/lib/targets/go.ts +++ b/packages/jsii-pacmak/lib/targets/go.ts @@ -84,6 +84,9 @@ export class Golang extends Target { const moduleDir = tryFindLocalModule(baseDir, dep); if (moduleDir) { replace[dep.goModuleName] = moduleDir; + + // we found a replacement for this dep, we can stop searching + break; } } diff --git a/packages/jsii-pacmak/lib/targets/go/package.ts b/packages/jsii-pacmak/lib/targets/go/package.ts index 1f3fb5b736..98155b2025 100644 --- a/packages/jsii-pacmak/lib/targets/go/package.ts +++ b/packages/jsii-pacmak/lib/targets/go/package.ts @@ -1,6 +1,6 @@ import { CodeMaker } from 'codemaker'; import { Assembly, Type, Submodule as JsiiSubmodule } from 'jsii-reflect'; -import { join } from 'path'; +import { basename, dirname, join } from 'path'; import * as semver from 'semver'; import { EmitContext } from './emit-context'; @@ -107,6 +107,8 @@ export abstract class Package { this.emitTypes(context); code.closeFile(this.file); + this.emitGoInitFunction(context); + this.emitInternalPackages(context); } @@ -135,37 +137,58 @@ export abstract class Package { ); } - protected get usesReflectionPackage(): boolean { - return ( - this.types.some((type) => type.usesReflectionPackage) || - this.submodules.some((sub) => sub.usesReflectionPackage) - ); + /** + * Emits a `func init() { ... }` in a dedicated file (so we don't have to + * worry about what needs to be imported and whatnot). This function is + * responsible for correctly initializing the module, including registering + * the declared types with the jsii runtime for go. + */ + private emitGoInitFunction({ code }: EmitContext): void { + // We don't emit anything if there are not types in this (sub)module. This + // avoids registering an `init` function that does nothing, which is poor + // form. It also saves us from "imported but unused" errors that would arise + // as a consequence. + if (this.types.length > 0) { + const initFile = join( + dirname(this.file), + `${basename(this.file, '.go')}.init.go`, + ); + code.openFile(initFile); + code.line(`package ${this.packageName}`); + code.line(); + importGoModules(code, [GO_REFLECT, JSII_RT_MODULE]); + code.line(); + code.openBlock('func init()'); + for (const type of this.types) { + type.emitRegistration(code); + } + code.closeBlock(); + code.closeFile(initFile); + } } private emitImports(code: CodeMaker) { - code.open('import ('); + const toImport = new Array(); + if (this.usesRuntimePackage) { - code.line(`${JSII_RT_ALIAS} "${JSII_RT_MODULE_NAME}"`); + toImport.push(JSII_RT_MODULE); } if (this.usesInitPackage) { - code.line( - `${JSII_INIT_ALIAS} "${this.root.goModuleName}/${JSII_INIT_PACKAGE}"`, - ); - } - - if (this.usesReflectionPackage) { - code.line(`"reflect"`); + toImport.push({ + alias: JSII_INIT_ALIAS, + module: `${this.root.goModuleName}/${JSII_INIT_PACKAGE}`, + }); } for (const packageName of this.dependencyImports) { // If the module is the same as the current one being written, don't emit an import statement if (packageName !== this.packageName) { - code.line(`"${packageName}"`); + toImport.push({ module: packageName }); } } - code.close(')'); + importGoModules(code, toImport); code.line(); } @@ -286,19 +309,18 @@ export class RootPackage extends Package { code.openFile(file); code.line('package jsii'); code.line(); - code.open('import ('); - code.line(`rt "${JSII_RT_MODULE_NAME}"`); - code.line('"sync"'); + + const toImport: ImportedModule[] = [JSII_RT_MODULE, { module: 'sync' }]; if (dependencies.length > 0) { - code.line('// Initialization endpoints of dependencies'); for (const pkg of dependencies) { - code.line( - `${pkg.packageName} "${pkg.root.goModuleName}/${JSII_INIT_PACKAGE}"`, - ); + toImport.push({ + alias: pkg.packageName, + module: `${pkg.root.goModuleName}/${JSII_INIT_PACKAGE}`, + }); } } + importGoModules(code, toImport); - code.close(')'); code.line(); code.line('var once sync.Once'); code.line(); @@ -318,7 +340,7 @@ export class RootPackage extends Package { } code.line('// Load this library into the kernel'); code.line( - `rt.Load("${this.assembly.name}", "${this.assembly.version}", tarball)`, + `${JSII_RT_ALIAS}.Load("${this.assembly.name}", "${this.assembly.version}", tarball)`, ); code.close('})'); code.close('}'); @@ -381,3 +403,79 @@ function determineMajorVersionSuffix(version: string) { return `/v${sv.major}`; } + +interface ImportedModule { + readonly alias?: string; + readonly module: string; +} + +const JSII_RT_MODULE: ImportedModule = { + alias: JSII_RT_ALIAS, + module: JSII_RT_MODULE_NAME, +}; +const GO_REFLECT: ImportedModule = { module: 'reflect' }; + +function importGoModules(code: CodeMaker, modules: readonly ImportedModule[]) { + if (modules.length === 0) { + return; + } + + const aliasSize = Math.max(...modules.map((mod) => mod.alias?.length ?? 0)); + code.open('import ('); + const sortedModules = Array.from(modules).sort(compareImportedModules); + for (let i = 0; i < sortedModules.length; i++) { + const mod = sortedModules[i]; + // Separate module categories from each other modules with a blank line. + if ( + i > 0 && + (isBuiltIn(mod) !== isBuiltIn(sortedModules[i - 1]) || + isSpecial(mod) !== isSpecial(sortedModules[i - 1])) + ) { + code.line(); + } + if (mod.alias) { + code.line(`${mod.alias.padEnd(aliasSize, ' ')} "${mod.module}"`); + } else { + code.line(`"${mod.module}"`); + } + } + code.close(')'); + + /** + * A comparator for `ImportedModule` instances such that built-in modules + * always appear first, followed by the rest. Then within these two groups, + * aliased imports appear first, followed by the rest. + */ + function compareImportedModules( + l: ImportedModule, + r: ImportedModule, + ): number { + const lBuiltIn = isBuiltIn(l); + const rBuiltIn = isBuiltIn(r); + if (lBuiltIn && !rBuiltIn) { + return -1; + } + if (!lBuiltIn && rBuiltIn) { + return 1; + } + + const lSpecial = isSpecial(l); + const rSpecial = isSpecial(r); + if (lSpecial && !rSpecial) { + return -1; + } + if (!lSpecial && rSpecial) { + return 1; + } + + return l.module.localeCompare(r.module); + } + + function isBuiltIn(mod: ImportedModule): boolean { + return !mod.module.includes('/'); + } + + function isSpecial(mod: ImportedModule): boolean { + return mod.alias === JSII_RT_ALIAS || mod.alias === JSII_INIT_ALIAS; + } +} diff --git a/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts b/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts index 0285d73a3d..dfedb9145d 100644 --- a/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts +++ b/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts @@ -8,15 +8,13 @@ export const JSII_INIT_PACKAGE = 'jsii'; export const JSII_INIT_FUNC = 'Initialize'; // Alias used for the jsii init export const JSII_INIT_ALIAS = '_init_'; -// Type of global implementation map -export const JSII_IMPL_MAP_TYPE = `map[reflect.Type]reflect.Type`; // Function to make create request export const JSII_CREATE_FUNC = `${JSII_RT_ALIAS}.Create`; // JSII invoke request export const JSII_INVOKE_FUNC = `${JSII_RT_ALIAS}.Invoke`; // JSII static invoke -export const JSII_SINVOKE_FUNC = `${JSII_RT_ALIAS}.InvokeStatic`; +export const JSII_SINVOKE_FUNC = `${JSII_RT_ALIAS}.StaticInvoke`; // JSII get request export const JSII_GET_FUNC = `${JSII_RT_ALIAS}.Get`; diff --git a/packages/jsii-pacmak/lib/targets/go/runtime/function-call.ts b/packages/jsii-pacmak/lib/targets/go/runtime/function-call.ts index 61f42b7efe..b5a8c6178b 100644 --- a/packages/jsii-pacmak/lib/targets/go/runtime/function-call.ts +++ b/packages/jsii-pacmak/lib/targets/go/runtime/function-call.ts @@ -1,37 +1,8 @@ -import { CodeMaker } from 'codemaker'; - -import { GoTypeMember, ImplementationMap } from '../types'; -import { JSII_IMPL_MAP_TYPE } from './constants'; +import { GoTypeMember } from '../types'; export abstract class FunctionCall { public constructor(public readonly parent: GoTypeMember) {} - protected get implMap(): ImplementationMap | void { - return this.parent.reference?.scopedImplMap(this.parent.parent.pkg); - } - - /** - * Emits map of interface type to concrete struct type for use in runtime to - * cast data to expected return type. - */ - protected emitImplMapVal(code: CodeMaker) { - if (this.implMap) { - const { interfaceName, structName } = this.implMap; - code.open(`${JSII_IMPL_MAP_TYPE}{`); - - // `reflect.TypeOf((*SomeType)(nil)).Elem()` is a reliable way to create - // an instance of reflect.Type for any type. `(*SomeInterface)(nil)` - // creates a "zero value" with the type `SomeInterface` which otherwise - // has no way to instantiate. - code.line( - `reflect.TypeOf((*${interfaceName})(nil)).Elem(): reflect.TypeOf((*${structName})(nil)).Elem(),`, - ); - code.close('},'); - } else { - code.line(`${JSII_IMPL_MAP_TYPE}{},`); - } - } - protected get returnsVal(): boolean { return Boolean(this.parent.reference && !this.parent.reference.void); } diff --git a/packages/jsii-pacmak/lib/targets/go/runtime/method-call.ts b/packages/jsii-pacmak/lib/targets/go/runtime/method-call.ts index 08f269c50e..3eaf264f4f 100644 --- a/packages/jsii-pacmak/lib/targets/go/runtime/method-call.ts +++ b/packages/jsii-pacmak/lib/targets/go/runtime/method-call.ts @@ -28,7 +28,6 @@ export class MethodCall extends FunctionCall { code.line(`${this.argsString},`); code.line(`${this.returnsVal ? 'true' : 'false'},`); code.line(`&${this.returnVarName},`); - this.emitImplMapVal(code); code.close(`)`); @@ -48,7 +47,6 @@ export class MethodCall extends FunctionCall { code.line(`${this.argsString},`); code.line(`${this.returnsVal ? 'true' : 'false'},`); code.line(`&${this.returnVarName},`); - this.emitImplMapVal(code); code.close(`)`); diff --git a/packages/jsii-pacmak/lib/targets/go/runtime/property-access.ts b/packages/jsii-pacmak/lib/targets/go/runtime/property-access.ts index 5f12203032..f322008e7c 100644 --- a/packages/jsii-pacmak/lib/targets/go/runtime/property-access.ts +++ b/packages/jsii-pacmak/lib/targets/go/runtime/property-access.ts @@ -23,7 +23,6 @@ export class GetProperty extends FunctionCall { code.line(`${this.parent.instanceArg},`); code.line(`"${this.parent.property.name}",`); code.line(`&${resultVar},`); - this.emitImplMapVal(code); code.close(`)`); code.line(`return ${resultVar}`); @@ -56,7 +55,6 @@ export class StaticGetProperty extends FunctionCall { code.line(`"${this.parent.parent.fqn}",`); code.line(`"${this.parent.property.name}",`); code.line(`&${resultVar},`); - this.emitImplMapVal(code); code.close(`)`); code.line(`return ${resultVar}`); diff --git a/packages/jsii-pacmak/lib/targets/go/types/class.ts b/packages/jsii-pacmak/lib/targets/go/types/class.ts index 66acad6c21..e96fd62408 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/class.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/class.ts @@ -1,10 +1,11 @@ -import { toPascalCase } from 'codemaker'; +import { CodeMaker, toPascalCase } from 'codemaker'; import { Method, ClassType, Initializer } from 'jsii-reflect'; import { EmitContext } from '../emit-context'; import { Package } from '../package'; import { ClassConstructor, + JSII_RT_ALIAS, MethodCall, StaticGetProperty, StaticSetProperty, @@ -68,6 +69,14 @@ export class GoClass extends GoStruct { } } + public emitRegistration(code: CodeMaker): void { + code.open(`${JSII_RT_ALIAS}.RegisterClass(`); + code.line(`"${this.fqn}",`); + code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`); + code.line(`reflect.TypeOf((*${this.interfaceName})(nil)).Elem(),`); + code.close(')'); + } + public get usesInitPackage() { return ( this.initializer != null || @@ -84,10 +93,6 @@ export class GoClass extends GoStruct { ); } - public get usesReflectionPackage(): boolean { - return this.properties.length > 0 || this.methods.length > 0; - } - protected emitInterface(context: EmitContext): void { const { code } = context; code.line('// Class interface'); // FIXME for debugging diff --git a/packages/jsii-pacmak/lib/targets/go/types/enum.ts b/packages/jsii-pacmak/lib/targets/go/types/enum.ts index 9ae4949156..d10d1a37ec 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/enum.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/enum.ts @@ -1,16 +1,21 @@ -import { EnumType } from 'jsii-reflect'; +import { CodeMaker, toPascalCase } from 'codemaker'; +import { EnumType, EnumMember } from 'jsii-reflect'; import { EmitContext } from '../emit-context'; import { Package } from '../package'; +import { JSII_RT_ALIAS } from '../runtime'; import { GoType } from './go-type'; export class Enum extends GoType { public readonly usesInitPackage = false; public readonly usesRuntimePackage = false; - public readonly usesReflectionPackage = false; + + private readonly members: readonly GoEnumMember[]; public constructor(pkg: Package, public type: EnumType) { super(pkg, type); + + this.members = type.members.map((mem) => new GoEnumMember(this, mem)); } public emit(context: EmitContext) { @@ -24,17 +29,41 @@ export class Enum extends GoType { code.open(`const (`); // Const values are prefixed by the wrapped value type - for (const member of this.type.members) { - const enumKey = this.name + code.toPascalCase(member.name); - const enumType = this.name; - code.line(`${enumKey} ${enumType} = "${member.name}"`); + for (const member of this.members) { + member.emit(code); } code.close(`)`); code.line(); } + public emitRegistration(code: CodeMaker): void { + code.open(`${JSII_RT_ALIAS}.RegisterEnum(`); + code.line(`"${this.fqn}",`); + code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`); + code.open(`map[string]interface{}{`); + for (const member of this.members) { + code.line(`"${member.rawValue}": ${member.name},`); + } + code.close(`},`); + code.close(')'); + } + public get dependencies(): Package[] { return []; } } + +class GoEnumMember { + public readonly name: string; + public readonly rawValue: string; + + public constructor(private readonly parent: Enum, entry: EnumMember) { + this.name = `${parent.name}${toPascalCase(entry.name)}`; + this.rawValue = entry.name; + } + + public emit(code: CodeMaker) { + code.line(`${this.name} ${this.parent.name} = "${this.rawValue}"`); + } +} diff --git a/packages/jsii-pacmak/lib/targets/go/types/go-type-reference.ts b/packages/jsii-pacmak/lib/targets/go/types/go-type-reference.ts index d09a864889..092fb2c97d 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/go-type-reference.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/go-type-reference.ts @@ -42,14 +42,6 @@ type TypeMap = | { readonly type: 'interface'; readonly value: GoTypeRef } | { readonly type: 'void' }; -/** - * Maps interface to concrete struct for use in implementation maps - */ -export interface ImplementationMap { - interfaceName: string; - structName: string; -} - /* * Accepts a JSII TypeReference and Go Package and can resolve the GoType within the module tree. */ @@ -141,26 +133,6 @@ export class GoTypeRef { return { type: 'interface', value: ref }; } - /** - * Builds a map of interface to concrete types. This is passed to the runtime - * so that return types of interfaces can correctly be constructucted. - */ - public scopedImplMap(scope: Package): ImplementationMap | void { - if ( - this.typeMap.type === 'array' || - this.typeMap.type === 'map' || - this.typeMap.type === 'interface' - ) { - const { value } = this.typeMap; - return { - interfaceName: value.scopedInterfaceName(scope), - structName: value.scopedName(scope), - }; - } - - return undefined; - } - private scopedTypeName( typeMap: TypeMap, scope: Package, diff --git a/packages/jsii-pacmak/lib/targets/go/types/go-type.ts b/packages/jsii-pacmak/lib/targets/go/types/go-type.ts index f037eab811..eb92838251 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/go-type.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/go-type.ts @@ -1,4 +1,4 @@ -import { toPascalCase } from 'codemaker'; +import { CodeMaker, toPascalCase } from 'codemaker'; import { ClassType, InterfaceType, Type } from 'jsii-reflect'; import { EmitContext } from '../emit-context'; @@ -22,10 +22,12 @@ export abstract class GoType { } public abstract emit(context: EmitContext): void; + + public abstract emitRegistration(code: CodeMaker): void; + public abstract get dependencies(): Package[]; public abstract get usesInitPackage(): boolean; public abstract get usesRuntimePackage(): boolean; - public abstract get usesReflectionPackage(): boolean; public get namespace() { return this.pkg.packageName; @@ -70,10 +72,6 @@ export abstract class GoStruct extends GoType { return this.properties.some((p) => p.usesRuntimePackage); } - public get usesReflectionPackage(): boolean { - return this.properties.length > 0; - } - protected emitInterface(context: EmitContext): void { const { code } = context; code.line( diff --git a/packages/jsii-pacmak/lib/targets/go/types/interface.ts b/packages/jsii-pacmak/lib/targets/go/types/interface.ts index 0d854876f1..e02f0fe0fb 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/interface.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/interface.ts @@ -1,8 +1,9 @@ +import { CodeMaker } from 'codemaker'; import { InterfaceType, Method, Property } from 'jsii-reflect'; import { EmitContext } from '../emit-context'; import { Package } from '../package'; -import { MethodCall } from '../runtime'; +import { JSII_RT_ALIAS, MethodCall } from '../runtime'; import { getMemberDependencies, getParamDependencies } from '../util'; import { GoType, INTERFACE_TYPE_SUFFIX } from './go-type'; import { GoTypeRef } from './go-type-reference'; @@ -74,6 +75,14 @@ export class Interface extends GoType { } } + public emitRegistration(code: CodeMaker): void { + code.open(`${JSII_RT_ALIAS}.RegisterInterface(`); + code.line(`"${this.fqn}",`); + code.line(`reflect.TypeOf((*${this.interfaceName})(nil)).Elem(),`); + code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`); + code.close(')'); + } + public get usesInitPackage() { return ( this.properties.some((p) => p.usesInitPackage) || @@ -88,10 +97,6 @@ export class Interface extends GoType { ); } - public get usesReflectionPackage(): boolean { - return this.properties.length > 0 || this.methods.length > 0; - } - public get extends(): GoTypeRef[] { return this.type.getInterfaces(true).map((iface) => { return new GoTypeRef(this.pkg.root, iface.reference); diff --git a/packages/jsii-pacmak/lib/targets/go/types/struct.ts b/packages/jsii-pacmak/lib/targets/go/types/struct.ts index 7928ee6542..de22590a2b 100644 --- a/packages/jsii-pacmak/lib/targets/go/types/struct.ts +++ b/packages/jsii-pacmak/lib/targets/go/types/struct.ts @@ -1,6 +1,8 @@ +import { CodeMaker } from 'codemaker'; import { InterfaceType } from 'jsii-reflect'; import { Package } from '../package'; +import { JSII_RT_ALIAS } from '../runtime'; import { GoStruct } from './go-type'; /* @@ -12,11 +14,15 @@ export class Struct extends GoStruct { // TODO check if datatype? (isDataType() on jsii-reflect seems wrong) } - public get usesRuntimePackage(): boolean { - return this.properties.some((p) => p.usesRuntimePackage); + public emitRegistration(code: CodeMaker): void { + code.open(`${JSII_RT_ALIAS}.RegisterStruct(`); + code.line(`"${this.fqn}",`); + code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`); + code.line(`reflect.TypeOf((*${this.interfaceName})(nil)).Elem(),`); + code.close(')'); } - public get usesReflectionPackage() { - return this.properties.length > 0; + public get usesRuntimePackage(): boolean { + return this.properties.some((p) => p.usesRuntimePackage); } } diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index e9928f8fd5..54539bd3bd 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -59,10 +59,10 @@ "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/semver": "^7.3.4", "@types/yargs": "^16.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", diff --git a/packages/jsii-pacmak/test/build-test.sh b/packages/jsii-pacmak/test/build-test.sh index bbe51633ed..2c2bef47be 100755 --- a/packages/jsii-pacmak/test/build-test.sh +++ b/packages/jsii-pacmak/test/build-test.sh @@ -41,16 +41,16 @@ OPTS="--dotnet-nuget-global-packages-folder=${NUGET_CACHE}" # Single target, recursive build to a certain location clean_dists echo "Testing SINGLE TARGET, RECURSIVE build." -../bin/jsii-pacmak ${OPTS} -o ${outdir} --recurse ../../jsii-calc +../bin/jsii-pacmak ${OPTS} -v -o ${outdir} --recurse ../../jsii-calc # Multiple targets, build one-by-one into own directory clean_dists echo "Testing ONE-BY-ONE build." for dir in $packagedirs; do - ../bin/jsii-pacmak ${OPTS} $dir + ../bin/jsii-pacmak ${OPTS} -v $dir done # Multiple targets, build all at once into own directory clean_dists echo "Testing ALL-AT-ONCE build." -../bin/jsii-pacmak ${OPTS} --no-parallel $packagedirs +../bin/jsii-pacmak ${OPTS} -v --no-parallel $packagedirs diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap index d4c8f402be..8f7664a56c 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap @@ -120,8 +120,6 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /go/foo/foo.go 1`] = ` // Test assembly: foo package foo -import ( -) `; @@ -142,10 +140,11 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /go/foo/jsii/jsii.go 1`] package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" - // Initialization endpoints of dependencies - bar "bar/v2/jsii" + + _jsii_ "github.com/aws/jsii-runtime-go" + + bar "bar/v2/jsii" ) var once sync.Once @@ -158,7 +157,7 @@ func Initialize() { bar.Initialize() // Load this library into the kernel - rt.Load("foo", "1.2.3", tarball) + _jsii_.Load("foo", "1.2.3", tarball) }) } @@ -627,8 +626,6 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /go/foo/foo.go 1`] = // Test assembly: foo package foo -import ( -) `; @@ -649,10 +646,11 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /go/foo/jsii/jsii.go package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" - // Initialization endpoints of dependencies - bar "bar/v4/jsii" + + _jsii_ "github.com/aws/jsii-runtime-go" + + bar "bar/v4/jsii" ) var once sync.Once @@ -665,7 +663,7 @@ func Initialize() { bar.Initialize() // Load this library into the kernel - rt.Load("foo", "1.2.3", tarball) + _jsii_.Load("foo", "1.2.3", tarball) }) } @@ -1132,8 +1130,6 @@ exports[`foo@2.0.0-rc.42: /go/foo/foo.go 1`] = ` // Test assembly: foo package foo -import ( -) `; @@ -1153,8 +1149,9 @@ exports[`foo@2.0.0-rc.42: /go/foo/jsii/jsii.go 1`] = ` package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" + + _jsii_ "github.com/aws/jsii-runtime-go" ) var once sync.Once @@ -1164,7 +1161,7 @@ var once sync.Once func Initialize() { once.Do(func(){ // Load this library into the kernel - rt.Load("foo", "2.0.0-rc.42", tarball) + _jsii_.Load("foo", "2.0.0-rc.42", tarball) }) } @@ -1615,8 +1612,6 @@ exports[`foo@4.5.6-pre.1337: /go/foo/foo.go 1`] = ` // Test assembly: foo package foo -import ( -) `; @@ -1636,8 +1631,9 @@ exports[`foo@4.5.6-pre.1337: /go/foo/jsii/jsii.go 1`] = ` package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" + + _jsii_ "github.com/aws/jsii-runtime-go" ) var once sync.Once @@ -1647,7 +1643,7 @@ var once sync.Once func Initialize() { once.Do(func(){ // Load this library into the kernel - rt.Load("foo", "4.5.6-pre.1337", tarball) + _jsii_.Load("foo", "4.5.6-pre.1337", tarball) }) } diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap index 102f224af7..01ff4fcda4 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap @@ -9,6 +9,7 @@ exports[`Generated code for "@scope/jsii-calc-base": / 1`] = ` ┃ ┣━ 📄 jsii.go ┃ ┗━ 📄 tarball.embedded.go ┣━ 📄 scopejsiicalcbase.go + ┣━ 📄 scopejsiicalcbase.init.go ┗━ 📄 version `; @@ -28,9 +29,10 @@ exports[`Generated code for "@scope/jsii-calc-base": /go/scopejsiicalcba package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" - // Initialization endpoints of dependencies + + _jsii_ "github.com/aws/jsii-runtime-go" + scopejsiicalcbaseofbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii" ) @@ -44,7 +46,7 @@ func Initialize() { scopejsiicalcbaseofbase.Initialize() // Load this library into the kernel - rt.Load("@scope/jsii-calc-base", "0.0.0", tarball) + _jsii_.Load("@scope/jsii-calc-base", "0.0.0", tarball) }) } @@ -59,7 +61,7 @@ package scopejsiicalcbase import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase/jsii" - "reflect" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2" ) @@ -94,7 +96,6 @@ func (b *Base) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -117,9 +118,6 @@ func (b *BaseProps) GetFoo() scopejsiicalcbaseofbase.VeryIface { b, "foo", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalcbaseofbase.VeryIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalcbaseofbase.Very)(nil)).Elem(), - }, ) return returns } @@ -130,7 +128,6 @@ func (b *BaseProps) GetBar() string { b, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -151,7 +148,6 @@ func (i *IBaseInterface) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -163,7 +159,6 @@ func (i *IBaseInterface) Bar() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -192,17 +187,50 @@ func NewStaticConsumer() StaticConsumerIface { func StaticConsumer_Consume(args interface{}) { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "@scope/jsii-calc-base.StaticConsumer", "consume", []interface{}{args}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } +`; + +exports[`Generated code for "@scope/jsii-calc-base": /go/scopejsiicalcbase/scopejsiicalcbase.init.go 1`] = ` +package scopejsiicalcbase + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "@scope/jsii-calc-base.Base", + reflect.TypeOf((*Base)(nil)).Elem(), + reflect.TypeOf((*BaseIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-base.BaseProps", + reflect.TypeOf((*BaseProps)(nil)).Elem(), + reflect.TypeOf((*BasePropsIface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "@scope/jsii-calc-base.IBaseInterface", + reflect.TypeOf((*IBaseInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IBaseInterface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-base.StaticConsumer", + reflect.TypeOf((*StaticConsumer)(nil)).Elem(), + reflect.TypeOf((*StaticConsumerIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "@scope/jsii-calc-base": /go/scopejsiicalcbase/version 1`] = ` @@ -219,6 +247,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": / 1`] = ` ┃ ┣━ 📄 jsii.go ┃ ┗━ 📄 tarball.embedded.go ┣━ 📄 scopejsiicalcbaseofbase.go + ┣━ 📄 scopejsiicalcbaseofbase.init.go ┗━ 📄 version `; @@ -237,8 +266,9 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /go/scopejs package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" + + _jsii_ "github.com/aws/jsii-runtime-go" ) var once sync.Once @@ -248,7 +278,7 @@ var once sync.Once func Initialize() { once.Do(func(){ // Load this library into the kernel - rt.Load("@scope/jsii-calc-base-of-base", "2.1.1", tarball) + _jsii_.Load("@scope/jsii-calc-base-of-base", "2.1.1", tarball) }) } @@ -263,7 +293,6 @@ package scopejsiicalcbaseofbase import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii" - "reflect" ) type IVeryBaseInterfaceIface interface { @@ -280,7 +309,6 @@ func (i *IVeryBaseInterface) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -295,13 +323,12 @@ type StaticConsumer struct { func StaticConsumer_Consume(_args interface{}) { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "@scope/jsii-calc-base-of-base.StaticConsumer", "consume", []interface{}{_args}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -337,7 +364,6 @@ func (v *Very) Hey() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -358,15 +384,46 @@ func (v *VeryBaseProps) GetFoo() VeryIface { v, "foo", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*VeryIface)(nil)).Elem(): reflect.TypeOf((*Very)(nil)).Elem(), - }, ) return returns } +`; + +exports[`Generated code for "@scope/jsii-calc-base-of-base": /go/scopejsiicalcbaseofbase/scopejsiicalcbaseofbase.init.go 1`] = ` +package scopejsiicalcbaseofbase + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterInterface( + "@scope/jsii-calc-base-of-base.IVeryBaseInterface", + reflect.TypeOf((*IVeryBaseInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IVeryBaseInterface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-base-of-base.StaticConsumer", + reflect.TypeOf((*StaticConsumer)(nil)).Elem(), + reflect.TypeOf((*StaticConsumerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-base-of-base.Very", + reflect.TypeOf((*Very)(nil)).Elem(), + reflect.TypeOf((*VeryIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-base-of-base.VeryBaseProps", + reflect.TypeOf((*VeryBaseProps)(nil)).Elem(), + reflect.TypeOf((*VeryBasePropsIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "@scope/jsii-calc-base-of-base": /go/scopejsiicalcbaseofbase/version 1`] = ` @@ -383,8 +440,10 @@ exports[`Generated code for "@scope/jsii-calc-lib": / 1`] = ` ┃ ┣━ 📄 jsii.go ┃ ┗━ 📄 tarball.embedded.go ┣━ 📄 scopejsiicalclib.go + ┣━ 📄 scopejsiicalclib.init.go ┣━ 📁 submodule - ┃ ┗━ 📄 submodule.go + ┃ ┣━ 📄 submodule.go + ┃ ┗━ 📄 submodule.init.go ┗━ 📄 version `; @@ -405,10 +464,11 @@ exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" - // Initialization endpoints of dependencies - scopejsiicalcbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase/jsii" + + _jsii_ "github.com/aws/jsii-runtime-go" + + scopejsiicalcbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase/jsii" scopejsiicalcbaseofbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii" ) @@ -423,7 +483,7 @@ func Initialize() { scopejsiicalcbaseofbase.Initialize() // Load this library into the kernel - rt.Load("@scope/jsii-calc-lib", "0.0.0", tarball) + _jsii_.Load("@scope/jsii-calc-lib", "0.0.0", tarball) }) } @@ -438,9 +498,9 @@ package scopejsiicalclib import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii" - "reflect" - "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2" ) // Check that enums from \\@scoped packages can be references. @@ -469,7 +529,6 @@ func (i *IDoublable) GetDoubleValue() float64 { i, "doubleValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -495,7 +554,6 @@ func (i *IFriendly) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -522,7 +580,6 @@ func (i *IThreeLevelsInterface) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -534,7 +591,6 @@ func (i *IThreeLevelsInterface) Bar() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -546,7 +602,6 @@ func (i *IThreeLevelsInterface) Baz() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -578,7 +633,6 @@ func (m *MyFirstStruct) GetAnumber() float64 { m, "anumber", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -589,7 +643,6 @@ func (m *MyFirstStruct) GetAstring() string { m, "astring", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -600,9 +653,6 @@ func (m *MyFirstStruct) GetFirstOptional() []string { m, "firstOptional", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -635,7 +685,6 @@ func (n *Number) GetValue() float64 { n, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -646,7 +695,6 @@ func (n *Number) GetDoubleValue() float64 { n, "doubleValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -674,7 +722,6 @@ func (n *Number) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -687,7 +734,6 @@ func (n *Number) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -714,7 +760,6 @@ func (n *NumericValue) GetValue() float64 { n, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -741,7 +786,6 @@ func (n *NumericValue) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -754,7 +798,6 @@ func (n *NumericValue) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -781,7 +824,6 @@ func (o *Operation) GetValue() float64 { o, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -808,7 +850,6 @@ func (o *Operation) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -821,7 +862,6 @@ func (o *Operation) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -853,7 +893,6 @@ func (s *StructWithOnlyOptionals) GetOptional1() string { s, "optional1", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -864,7 +903,6 @@ func (s *StructWithOnlyOptionals) GetOptional2() float64 { s, "optional2", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -875,13 +913,74 @@ func (s *StructWithOnlyOptionals) GetOptional3() bool { s, "optional3", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/scopejsiicalclib.init.go 1`] = ` +package scopejsiicalclib + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterEnum( + "@scope/jsii-calc-lib.EnumFromScopedModule", + reflect.TypeOf((*EnumFromScopedModule)(nil)).Elem(), + map[string]interface{}{ + "VALUE1": EnumFromScopedModuleValue1, + "VALUE2": EnumFromScopedModuleValue2, + }, + ) + _jsii_.RegisterInterface( + "@scope/jsii-calc-lib.IDoublable", + reflect.TypeOf((*IDoublableIface)(nil)).Elem(), + reflect.TypeOf((*IDoublable)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "@scope/jsii-calc-lib.IFriendly", + reflect.TypeOf((*IFriendlyIface)(nil)).Elem(), + reflect.TypeOf((*IFriendly)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "@scope/jsii-calc-lib.IThreeLevelsInterface", + reflect.TypeOf((*IThreeLevelsInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IThreeLevelsInterface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-lib.MyFirstStruct", + reflect.TypeOf((*MyFirstStruct)(nil)).Elem(), + reflect.TypeOf((*MyFirstStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.Number", + reflect.TypeOf((*Number)(nil)).Elem(), + reflect.TypeOf((*NumberIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.NumericValue", + reflect.TypeOf((*NumericValue)(nil)).Elem(), + reflect.TypeOf((*NumericValueIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.Operation", + reflect.TypeOf((*Operation)(nil)).Elem(), + reflect.TypeOf((*OperationIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-lib.StructWithOnlyOptionals", + reflect.TypeOf((*StructWithOnlyOptionals)(nil)).Elem(), + reflect.TypeOf((*StructWithOnlyOptionalsIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/submodule/submodule.go 1`] = ` @@ -890,7 +989,6 @@ package submodule import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii" - "reflect" ) // Deprecated. @@ -907,9 +1005,6 @@ func (i *IReflectable) GetEntries() []ReflectableEntryIface { i, "entries", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ReflectableEntryIface)(nil)).Elem(): reflect.TypeOf((*ReflectableEntry)(nil)).Elem(), - }, ) return returns } @@ -943,7 +1038,6 @@ func (n *NestedClass) GetProperty() string { n, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -984,7 +1078,6 @@ func (n *NestedStruct) GetName() string { n, "name", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1012,7 +1105,6 @@ func (r *ReflectableEntry) GetKey() string { r, "key", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1023,7 +1115,6 @@ func (r *ReflectableEntry) GetValue() interface{} { r, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1060,14 +1151,55 @@ func (r *Reflector) AsMap(reflectable IReflectableIface) map[string]interface{} []interface{}{reflectable}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } +`; + +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/submodule/submodule.init.go 1`] = ` +package submodule + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterInterface( + "@scope/jsii-calc-lib.submodule.IReflectable", + reflect.TypeOf((*IReflectableIface)(nil)).Elem(), + reflect.TypeOf((*IReflectable)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.submodule.NestingClass", + reflect.TypeOf((*NestingClass)(nil)).Elem(), + reflect.TypeOf((*NestingClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.submodule.NestingClass.NestedClass", + reflect.TypeOf((*NestedClass)(nil)).Elem(), + reflect.TypeOf((*NestedClassIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-lib.submodule.NestingClass.NestedStruct", + reflect.TypeOf((*NestedStruct)(nil)).Elem(), + reflect.TypeOf((*NestedStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "@scope/jsii-calc-lib.submodule.ReflectableEntry", + reflect.TypeOf((*ReflectableEntry)(nil)).Elem(), + reflect.TypeOf((*ReflectableEntryIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.submodule.Reflector", + reflect.TypeOf((*Reflector)(nil)).Elem(), + reflect.TypeOf((*ReflectorIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/version 1`] = ` @@ -1080,37 +1212,51 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┗━ 📁 go ┗━ 📁 jsiicalc ┣━ 📁 composition - ┃ ┗━ 📄 composition.go + ┃ ┣━ 📄 composition.go + ┃ ┗━ 📄 composition.init.go ┣━ 📁 derivedclasshasnoproperties - ┃ ┗━ 📄 derivedclasshasnoproperties.go + ┃ ┣━ 📄 derivedclasshasnoproperties.go + ┃ ┗━ 📄 derivedclasshasnoproperties.init.go ┣━ 📄 go.mod ┣━ 📁 interfaceinnamespaceincludesclasses - ┃ ┗━ 📄 interfaceinnamespaceincludesclasses.go + ┃ ┣━ 📄 interfaceinnamespaceincludesclasses.go + ┃ ┗━ 📄 interfaceinnamespaceincludesclasses.init.go ┣━ 📁 interfaceinnamespaceonlyinterface - ┃ ┗━ 📄 interfaceinnamespaceonlyinterface.go + ┃ ┣━ 📄 interfaceinnamespaceonlyinterface.go + ┃ ┗━ 📄 interfaceinnamespaceonlyinterface.init.go ┣━ 📁 jsii ┃ ┣━ 📄 jsii.go ┃ ┗━ 📄 tarball.embedded.go ┣━ 📄 jsiicalc.go + ┣━ 📄 jsiicalc.init.go ┣━ 📁 pythonself - ┃ ┗━ 📄 pythonself.go + ┃ ┣━ 📄 pythonself.go + ┃ ┗━ 📄 pythonself.init.go ┣━ 📄 README.md ┣━ 📁 submodule ┃ ┣━ 📁 backreferences - ┃ ┃ ┗━ 📄 backreferences.go + ┃ ┃ ┣━ 📄 backreferences.go + ┃ ┃ ┗━ 📄 backreferences.init.go ┃ ┣━ 📁 child - ┃ ┃ ┗━ 📄 child.go + ┃ ┃ ┣━ 📄 child.go + ┃ ┃ ┗━ 📄 child.init.go ┃ ┣━ 📁 isolated - ┃ ┃ ┗━ 📄 isolated.go + ┃ ┃ ┣━ 📄 isolated.go + ┃ ┃ ┗━ 📄 isolated.init.go ┃ ┣━ 📁 nestedsubmodule ┃ ┃ ┣━ 📁 deeplynested - ┃ ┃ ┃ ┗━ 📄 deeplynested.go - ┃ ┃ ┗━ 📄 nestedsubmodule.go + ┃ ┃ ┃ ┣━ 📄 deeplynested.go + ┃ ┃ ┃ ┗━ 📄 deeplynested.init.go + ┃ ┃ ┣━ 📄 nestedsubmodule.go + ┃ ┃ ┗━ 📄 nestedsubmodule.init.go ┃ ┣━ 📁 param - ┃ ┃ ┗━ 📄 param.go + ┃ ┃ ┣━ 📄 param.go + ┃ ┃ ┗━ 📄 param.init.go ┃ ┣━ 📁 returnsparam - ┃ ┃ ┗━ 📄 returnsparam.go - ┃ ┗━ 📄 submodule.go + ┃ ┃ ┣━ 📄 returnsparam.go + ┃ ┃ ┗━ 📄 returnsparam.init.go + ┃ ┣━ 📄 submodule.go + ┃ ┗━ 📄 submodule.init.go ┗━ 📄 version `; @@ -1150,7 +1296,7 @@ package composition import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib" ) @@ -1191,7 +1337,6 @@ func (c *CompositeOperation) GetValue() float64 { c, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1202,9 +1347,6 @@ func (c *CompositeOperation) GetExpression() scopejsiicalclib.NumericValueIface c, "expression", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -1215,9 +1357,6 @@ func (c *CompositeOperation) GetDecorationPostfixes() []string { c, "decorationPostfixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -1228,9 +1367,6 @@ func (c *CompositeOperation) GetDecorationPrefixes() []string { c, "decorationPrefixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -1241,9 +1377,6 @@ func (c *CompositeOperation) GetStringStyle() CompositionStringStyle { c, "stringStyle", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*CompositionStringStyle)(nil)).Elem(): reflect.TypeOf((*CompositionStringStyle)(nil)).Elem(), - }, ) return returns } @@ -1294,7 +1427,6 @@ func (c *CompositeOperation) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1307,7 +1439,6 @@ func (c *CompositeOperation) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1321,6 +1452,33 @@ const ( ) +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/composition/composition.init.go 1`] = ` +package composition + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.composition.CompositeOperation", + reflect.TypeOf((*CompositeOperation)(nil)).Elem(), + reflect.TypeOf((*CompositeOperationIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.composition.CompositeOperation.CompositionStringStyle", + reflect.TypeOf((*CompositionStringStyle)(nil)).Elem(), + map[string]interface{}{ + "NORMAL": CompositionStringStyleNormal, + "DECORATED": CompositionStringStyleDecorated, + }, + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/derivedclasshasnoproperties/derivedclasshasnoproperties.go 1`] = ` @@ -1329,7 +1487,6 @@ package derivedclasshasnoproperties import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" ) // Class interface @@ -1349,7 +1506,6 @@ func (b *Base) GetProp() string { b, "prop", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1393,7 +1549,6 @@ func (d *Derived) GetProp() string { d, "prop", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1421,6 +1576,30 @@ func (d *Derived) SetProp(val string) { } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/derivedclasshasnoproperties/derivedclasshasnoproperties.init.go 1`] = ` +package derivedclasshasnoproperties + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.DerivedClassHasNoProperties.Base", + reflect.TypeOf((*Base)(nil)).Elem(), + reflect.TypeOf((*BaseIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DerivedClassHasNoProperties.Derived", + reflect.TypeOf((*Derived)(nil)).Elem(), + reflect.TypeOf((*DerivedIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/go.mod 1`] = ` @@ -1442,7 +1621,6 @@ package interfaceinnamespaceincludesclasses import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" ) // Class interface @@ -1462,7 +1640,6 @@ func (f *Foo) GetBar() string { f, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1505,13 +1682,36 @@ func (h *Hello) GetFoo() float64 { h, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/interfaceinnamespaceincludesclasses/interfaceinnamespaceincludesclasses.init.go 1`] = ` +package interfaceinnamespaceincludesclasses + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.InterfaceInNamespaceIncludesClasses.Foo", + reflect.TypeOf((*Foo)(nil)).Elem(), + reflect.TypeOf((*FooIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.InterfaceInNamespaceIncludesClasses.Hello", + reflect.TypeOf((*Hello)(nil)).Elem(), + reflect.TypeOf((*HelloIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/interfaceinnamespaceonlyinterface/interfaceinnamespaceonlyinterface.go 1`] = ` @@ -1519,7 +1719,6 @@ package interfaceinnamespaceonlyinterface import ( _jsii_ "github.com/aws/jsii-runtime-go" - "reflect" ) // HelloIface is the public interface for the custom type Hello @@ -1538,24 +1737,43 @@ func (h *Hello) GetFoo() float64 { h, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/interfaceinnamespaceonlyinterface/interfaceinnamespaceonlyinterface.init.go 1`] = ` +package interfaceinnamespaceonlyinterface + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterStruct( + "jsii-calc.InterfaceInNamespaceOnlyInterface.Hello", + reflect.TypeOf((*Hello)(nil)).Elem(), + reflect.TypeOf((*HelloIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/jsii/jsii.go 1`] = ` package jsii import ( - rt "github.com/aws/jsii-runtime-go" "sync" - // Initialization endpoints of dependencies + + _jsii_ "github.com/aws/jsii-runtime-go" + scopejsiicalcbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase/jsii" - scopejsiicalclib "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii" + scopejsiicalclib "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii" ) var once sync.Once @@ -1569,7 +1787,7 @@ func Initialize() { scopejsiicalclib.Initialize() // Load this library into the kernel - rt.Load("jsii-calc", "3.20.120", tarball) + _jsii_.Load("jsii-calc", "3.20.120", tarball) }) } @@ -1584,11 +1802,11 @@ package jsiicalc import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" - "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/composition" - "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2" "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbase" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2" + "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib" "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/submodule" ) @@ -1613,7 +1831,6 @@ func (a *AbstractClass) GetAbstractProperty() string { a, "abstractProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1624,7 +1841,6 @@ func (a *AbstractClass) GetPropFromInterface() string { a, "propFromInterface", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1651,7 +1867,6 @@ func (a *AbstractClass) AbstractMethod(name string) string { []interface{}{name}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1664,7 +1879,6 @@ func (a *AbstractClass) NonAbstractMethod() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1685,7 +1899,6 @@ func (a *AbstractClassBase) GetAbstractProperty() string { a, "abstractProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1722,9 +1935,6 @@ func (a *AbstractClassReturner) GetReturnAbstractFromProperty() AbstractClassBas a, "returnAbstractFromProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*AbstractClassBaseIface)(nil)).Elem(): reflect.TypeOf((*AbstractClassBase)(nil)).Elem(), - }, ) return returns } @@ -1751,9 +1961,6 @@ func (a *AbstractClassReturner) GiveMeAbstract() AbstractClassIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*AbstractClassIface)(nil)).Elem(): reflect.TypeOf((*AbstractClass)(nil)).Elem(), - }, ) return returns } @@ -1766,9 +1973,6 @@ func (a *AbstractClassReturner) GiveMeInterface() IInterfaceImplementedByAbstrac []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IInterfaceImplementedByAbstractClassIface)(nil)).Elem(): reflect.TypeOf((*IInterfaceImplementedByAbstractClass)(nil)).Elem(), - }, ) return returns } @@ -1792,7 +1996,6 @@ func (a *AbstractSuite) GetProperty() string { a, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1827,7 +2030,6 @@ func (a *AbstractSuite) SomeMethod(str string) string { []interface{}{str}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1840,7 +2042,6 @@ func (a *AbstractSuite) WorkItAll(seed string) string { []interface{}{seed}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1873,7 +2074,6 @@ func (a *Add) GetValue() float64 { a, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1884,9 +2084,6 @@ func (a *Add) GetLhs() scopejsiicalclib.NumericValueIface { a, "lhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -1897,9 +2094,6 @@ func (a *Add) GetRhs() scopejsiicalclib.NumericValueIface { a, "rhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -1927,7 +2121,6 @@ func (a *Add) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1940,7 +2133,6 @@ func (a *Add) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -1953,7 +2145,6 @@ func (a *Add) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2035,7 +2226,6 @@ func (a *AllTypes) GetEnumPropertyValue() float64 { a, "enumPropertyValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2046,9 +2236,6 @@ func (a *AllTypes) GetAnyArrayProperty() []interface{} { a, "anyArrayProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2059,9 +2246,6 @@ func (a *AllTypes) GetAnyMapProperty() map[string]interface{} { a, "anyMapProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2072,7 +2256,6 @@ func (a *AllTypes) GetAnyProperty() interface{} { a, "anyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2083,9 +2266,6 @@ func (a *AllTypes) GetArrayProperty() []string { a, "arrayProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -2096,7 +2276,6 @@ func (a *AllTypes) GetBooleanProperty() bool { a, "booleanProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2107,7 +2286,6 @@ func (a *AllTypes) GetDateProperty() string { a, "dateProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2118,9 +2296,6 @@ func (a *AllTypes) GetEnumProperty() AllTypesEnum { a, "enumProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*AllTypesEnum)(nil)).Elem(): reflect.TypeOf((*AllTypesEnum)(nil)).Elem(), - }, ) return returns } @@ -2131,7 +2306,6 @@ func (a *AllTypes) GetJsonProperty() map[string]interface{} { a, "jsonProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2142,9 +2316,6 @@ func (a *AllTypes) GetMapProperty() map[string]scopejsiicalclib.NumberIface { a, "mapProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumberIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.Number)(nil)).Elem(), - }, ) return returns } @@ -2155,7 +2326,6 @@ func (a *AllTypes) GetNumberProperty() float64 { a, "numberProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2166,7 +2336,6 @@ func (a *AllTypes) GetStringProperty() string { a, "stringProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2177,9 +2346,6 @@ func (a *AllTypes) GetUnionArrayProperty() []interface{} { a, "unionArrayProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2190,9 +2356,6 @@ func (a *AllTypes) GetUnionMapProperty() map[string]interface{} { a, "unionMapProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2203,7 +2366,6 @@ func (a *AllTypes) GetUnionProperty() interface{} { a, "unionProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2214,9 +2376,6 @@ func (a *AllTypes) GetUnknownArrayProperty() []interface{} { a, "unknownArrayProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2227,9 +2386,6 @@ func (a *AllTypes) GetUnknownMapProperty() map[string]interface{} { a, "unknownMapProperty", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -2240,7 +2396,6 @@ func (a *AllTypes) GetUnknownProperty() interface{} { a, "unknownProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2251,9 +2406,6 @@ func (a *AllTypes) GetOptionalEnumValue() StringEnum { a, "optionalEnumValue", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StringEnum)(nil)).Elem(): reflect.TypeOf((*StringEnum)(nil)).Elem(), - }, ) return returns } @@ -2424,7 +2576,6 @@ func (a *AllTypes) AnyIn(inp interface{}) { []interface{}{inp}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2436,7 +2587,6 @@ func (a *AllTypes) AnyOut() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2449,9 +2599,6 @@ func (a *AllTypes) EnumMethod(value StringEnum) StringEnum { []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StringEnum)(nil)).Elem(): reflect.TypeOf((*StringEnum)(nil)).Elem(), - }, ) return returns } @@ -2497,7 +2644,6 @@ func (a *AllowedMethodNames) GetBar(_p1 string, _p2 float64) { []interface{}{_p1, _p2}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2509,7 +2655,6 @@ func (a *AllowedMethodNames) GetFoo(withParam string) string { []interface{}{withParam}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2522,7 +2667,6 @@ func (a *AllowedMethodNames) SetBar(_x string, _y float64, _z bool) { []interface{}{_x, _y, _z}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2534,7 +2678,6 @@ func (a *AllowedMethodNames) SetFoo(_x string, _y float64) { []interface{}{_x, _y}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2556,9 +2699,6 @@ func (a *AmbiguousParameters) GetProps() StructParameterTypeIface { a, "props", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructParameterTypeIface)(nil)).Elem(): reflect.TypeOf((*StructParameterType)(nil)).Elem(), - }, ) return returns } @@ -2569,9 +2709,6 @@ func (a *AmbiguousParameters) GetScope() BellIface { a, "scope", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*BellIface)(nil)).Elem(): reflect.TypeOf((*Bell)(nil)).Elem(), - }, ) return returns } @@ -2622,9 +2759,6 @@ func (a *AnonymousImplementationProvider) ProvideAsClass() ImplementationIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ImplementationIface)(nil)).Elem(): reflect.TypeOf((*Implementation)(nil)).Elem(), - }, ) return returns } @@ -2637,9 +2771,6 @@ func (a *AnonymousImplementationProvider) ProvideAsInterface() IAnonymouslyImple []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IAnonymouslyImplementMeIface)(nil)).Elem(): reflect.TypeOf((*IAnonymouslyImplementMe)(nil)).Elem(), - }, ) return returns } @@ -2679,7 +2810,6 @@ func (a *AsyncVirtualMethods) CallMe() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2692,7 +2822,6 @@ func (a *AsyncVirtualMethods) CallMe2() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2705,7 +2834,6 @@ func (a *AsyncVirtualMethods) CallMeDoublePromise() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2718,7 +2846,6 @@ func (a *AsyncVirtualMethods) DontOverrideMe() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2731,7 +2858,6 @@ func (a *AsyncVirtualMethods) OverrideMe(mult float64) float64 { []interface{}{mult}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2744,7 +2870,6 @@ func (a *AsyncVirtualMethods) OverrideMeToo() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2780,7 +2905,6 @@ func (a *AugmentableClass) MethodOne() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2792,7 +2916,6 @@ func (a *AugmentableClass) MethodTwo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2836,7 +2959,6 @@ func (b *Bell) GetRung() bool { b, "rung", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2871,7 +2993,6 @@ func (b *Bell) Ring() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -2904,7 +3025,6 @@ func (b *BinaryOperation) GetValue() float64 { b, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2915,9 +3035,6 @@ func (b *BinaryOperation) GetLhs() scopejsiicalclib.NumericValueIface { b, "lhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -2928,9 +3045,6 @@ func (b *BinaryOperation) GetRhs() scopejsiicalclib.NumericValueIface { b, "rhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -2958,7 +3072,6 @@ func (b *BinaryOperation) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2971,7 +3084,6 @@ func (b *BinaryOperation) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -2984,7 +3096,6 @@ func (b *BinaryOperation) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3021,7 +3132,6 @@ func (b *BurriedAnonymousObject) Check() bool { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3034,7 +3144,6 @@ func (b *BurriedAnonymousObject) GiveItBack(value interface{}) interface{} { []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3111,7 +3220,6 @@ func (c *Calculator) GetValue() float64 { c, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3122,9 +3230,6 @@ func (c *Calculator) GetExpression() scopejsiicalclib.NumericValueIface { c, "expression", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -3135,9 +3240,6 @@ func (c *Calculator) GetDecorationPostfixes() []string { c, "decorationPostfixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3148,9 +3250,6 @@ func (c *Calculator) GetDecorationPrefixes() []string { c, "decorationPrefixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3161,9 +3260,6 @@ func (c *Calculator) GetStringStyle() composition.CompositionStringStyle { c, "stringStyle", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(): reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(), - }, ) return returns } @@ -3174,9 +3270,6 @@ func (c *Calculator) GetOperationsLog() []scopejsiicalclib.NumericValueIface { c, "operationsLog", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -3187,9 +3280,6 @@ func (c *Calculator) GetOperationsMap() map[string][]scopejsiicalclib.NumericVal c, "operationsMap", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*[]scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*[]scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -3200,9 +3290,6 @@ func (c *Calculator) GetCurr() scopejsiicalclib.NumericValueIface { c, "curr", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -3213,7 +3300,6 @@ func (c *Calculator) GetMaxValue() float64 { c, "maxValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3224,7 +3310,6 @@ func (c *Calculator) GetUnionProperty() interface{} { c, "unionProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3300,7 +3385,6 @@ func (c *Calculator) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3313,7 +3397,6 @@ func (c *Calculator) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3326,7 +3409,6 @@ func (c *Calculator) Add(value float64) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -3338,7 +3420,6 @@ func (c *Calculator) Mul(value float64) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -3350,7 +3431,6 @@ func (c *Calculator) Neg() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -3362,7 +3442,6 @@ func (c *Calculator) Pow(value float64) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -3374,7 +3453,6 @@ func (c *Calculator) ReadUnionValue() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3402,7 +3480,6 @@ func (c *CalculatorProps) GetInitialValue() float64 { c, "initialValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3413,7 +3490,6 @@ func (c *CalculatorProps) GetMaximumValue() float64 { c, "maximumValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3437,7 +3513,6 @@ func (c *ChildStruct982) GetFoo() string { c, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3448,7 +3523,6 @@ func (c *ChildStruct982) GetBar() float64 { c, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3482,7 +3556,6 @@ func (c *ClassThatImplementsTheInternalInterface) GetA() string { c, "a", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3493,7 +3566,6 @@ func (c *ClassThatImplementsTheInternalInterface) GetB() string { c, "b", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3504,7 +3576,6 @@ func (c *ClassThatImplementsTheInternalInterface) GetC() string { c, "c", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3515,7 +3586,6 @@ func (c *ClassThatImplementsTheInternalInterface) GetD() string { c, "d", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3594,7 +3664,6 @@ func (c *ClassThatImplementsThePrivateInterface) GetA() string { c, "a", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3605,7 +3674,6 @@ func (c *ClassThatImplementsThePrivateInterface) GetB() string { c, "b", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3616,7 +3684,6 @@ func (c *ClassThatImplementsThePrivateInterface) GetC() string { c, "c", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3627,7 +3694,6 @@ func (c *ClassThatImplementsThePrivateInterface) GetE() string { c, "e", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3698,9 +3764,6 @@ func (c *ClassWithCollections) GetArray() []string { c, "array", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3711,9 +3774,6 @@ func (c *ClassWithCollections) GetMap() map[string]string { c, "map", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3751,15 +3811,12 @@ func (c *ClassWithCollections) SetMap(val map[string]string) { func ClassWithCollections_CreateAList() []string { _init_.Initialize() var returns []string - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ClassWithCollections", "createAList", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3767,15 +3824,12 @@ func ClassWithCollections_CreateAList() []string { func ClassWithCollections_CreateAMap() map[string]string { _init_.Initialize() var returns map[string]string - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ClassWithCollections", "createAMap", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3787,9 +3841,6 @@ func ClassWithCollections_StaticArray() []string { "jsii-calc.ClassWithCollections", "staticArray", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3810,9 +3861,6 @@ func ClassWithCollections_StaticMap() map[string]string { "jsii-calc.ClassWithCollections", "staticMap", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -3872,7 +3920,6 @@ func (c *ClassWithJavaReservedWords) GetInt() string { c, "int", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3899,7 +3946,6 @@ func (c *ClassWithJavaReservedWords) Import(assert string) string { []interface{}{assert}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3921,9 +3967,6 @@ func (c *ClassWithMutableObjectLiteralProperty) GetMutableObject() IMutableObjec c, "mutableObject", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IMutableObjectLiteralIface)(nil)).Elem(): reflect.TypeOf((*IMutableObjectLiteral)(nil)).Elem(), - }, ) return returns } @@ -3971,7 +4014,6 @@ func (c *ClassWithPrivateConstructorAndAutomaticProperties) GetReadOnlyString() c, "readOnlyString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3982,7 +4024,6 @@ func (c *ClassWithPrivateConstructorAndAutomaticProperties) GetReadWriteString() c, "readWriteString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -3999,15 +4040,12 @@ func (c *ClassWithPrivateConstructorAndAutomaticProperties) SetReadWriteString(v func ClassWithPrivateConstructorAndAutomaticProperties_Create(readOnlyString string, readWriteString string) ClassWithPrivateConstructorAndAutomaticPropertiesIface { _init_.Initialize() var returns ClassWithPrivateConstructorAndAutomaticPropertiesIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties", "create", []interface{}{readOnlyString, readWriteString}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ClassWithPrivateConstructorAndAutomaticPropertiesIface)(nil)).Elem(): reflect.TypeOf((*ClassWithPrivateConstructorAndAutomaticProperties)(nil)).Elem(), - }, ) return returns } @@ -4032,7 +4070,6 @@ func (c *ConfusingToJackson) GetUnionProperty() interface{} { c, "unionProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4049,15 +4086,12 @@ func (c *ConfusingToJackson) SetUnionProperty(val interface{}) { func ConfusingToJackson_MakeInstance() ConfusingToJacksonIface { _init_.Initialize() var returns ConfusingToJacksonIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConfusingToJackson", "makeInstance", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ConfusingToJacksonIface)(nil)).Elem(): reflect.TypeOf((*ConfusingToJackson)(nil)).Elem(), - }, ) return returns } @@ -4065,15 +4099,12 @@ func ConfusingToJackson_MakeInstance() ConfusingToJacksonIface { func ConfusingToJackson_MakeStructInstance() ConfusingToJacksonStructIface { _init_.Initialize() var returns ConfusingToJacksonStructIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConfusingToJackson", "makeStructInstance", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ConfusingToJacksonStructIface)(nil)).Elem(): reflect.TypeOf((*ConfusingToJacksonStruct)(nil)).Elem(), - }, ) return returns } @@ -4094,7 +4125,6 @@ func (c *ConfusingToJacksonStruct) GetUnionProperty() interface{} { c, "unionProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4145,15 +4175,12 @@ func NewConstructors() ConstructorsIface { func Constructors_HiddenInterface() IPublicInterfaceIface { _init_.Initialize() var returns IPublicInterfaceIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "hiddenInterface", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -4161,15 +4188,12 @@ func Constructors_HiddenInterface() IPublicInterfaceIface { func Constructors_HiddenInterfaces() []IPublicInterfaceIface { _init_.Initialize() var returns []IPublicInterfaceIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "hiddenInterfaces", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -4177,15 +4201,12 @@ func Constructors_HiddenInterfaces() []IPublicInterfaceIface { func Constructors_HiddenSubInterfaces() []IPublicInterfaceIface { _init_.Initialize() var returns []IPublicInterfaceIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "hiddenSubInterfaces", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -4193,15 +4214,12 @@ func Constructors_HiddenSubInterfaces() []IPublicInterfaceIface { func Constructors_MakeClass() PublicClassIface { _init_.Initialize() var returns PublicClassIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "makeClass", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*PublicClassIface)(nil)).Elem(): reflect.TypeOf((*PublicClass)(nil)).Elem(), - }, ) return returns } @@ -4209,15 +4227,12 @@ func Constructors_MakeClass() PublicClassIface { func Constructors_MakeInterface() IPublicInterfaceIface { _init_.Initialize() var returns IPublicInterfaceIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "makeInterface", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -4225,15 +4240,12 @@ func Constructors_MakeInterface() IPublicInterfaceIface { func Constructors_MakeInterface2() IPublicInterface2Iface { _init_.Initialize() var returns IPublicInterface2Iface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "makeInterface2", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterface2Iface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface2)(nil)).Elem(), - }, ) return returns } @@ -4241,15 +4253,12 @@ func Constructors_MakeInterface2() IPublicInterface2Iface { func Constructors_MakeInterfaces() []IPublicInterfaceIface { _init_.Initialize() var returns []IPublicInterfaceIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Constructors", "makeInterfaces", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -4284,9 +4293,6 @@ func (c *ConsumePureInterface) WorkItBaby() StructBIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructBIface)(nil)).Elem(): reflect.TypeOf((*StructB)(nil)).Elem(), - }, ) return returns } @@ -4323,13 +4329,12 @@ func NewConsumerCanRingBell() ConsumerCanRingBellIface { func ConsumerCanRingBell_StaticImplementedByObjectLiteral(ringer IBellRingerIface) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConsumerCanRingBell", "staticImplementedByObjectLiteral", []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4337,13 +4342,12 @@ func ConsumerCanRingBell_StaticImplementedByObjectLiteral(ringer IBellRingerIfac func ConsumerCanRingBell_StaticImplementedByPrivateClass(ringer IBellRingerIface) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConsumerCanRingBell", "staticImplementedByPrivateClass", []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4351,13 +4355,12 @@ func ConsumerCanRingBell_StaticImplementedByPrivateClass(ringer IBellRingerIface func ConsumerCanRingBell_StaticImplementedByPublicClass(ringer IBellRingerIface) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConsumerCanRingBell", "staticImplementedByPublicClass", []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4365,13 +4368,12 @@ func ConsumerCanRingBell_StaticImplementedByPublicClass(ringer IBellRingerIface) func ConsumerCanRingBell_StaticWhenTypedAsClass(ringer IConcreteBellRingerIface) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ConsumerCanRingBell", "staticWhenTypedAsClass", []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4384,7 +4386,6 @@ func (c *ConsumerCanRingBell) ImplementedByObjectLiteral(ringer IBellRingerIface []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4397,7 +4398,6 @@ func (c *ConsumerCanRingBell) ImplementedByPrivateClass(ringer IBellRingerIface) []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4410,7 +4410,6 @@ func (c *ConsumerCanRingBell) ImplementedByPublicClass(ringer IBellRingerIface) []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4423,7 +4422,6 @@ func (c *ConsumerCanRingBell) WhenTypedAsClass(ringer IConcreteBellRingerIface) []interface{}{ringer}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4459,7 +4457,6 @@ func (c *ConsumersOfThisCrazyTypeSystem) ConsumeAnotherPublicInterface(obj IAnot []interface{}{obj}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4472,7 +4469,6 @@ func (c *ConsumersOfThisCrazyTypeSystem) ConsumeNonInternalInterface(obj INonInt []interface{}{obj}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4510,7 +4506,6 @@ func (d *DataRenderer) Render(data scopejsiicalclib.MyFirstStructIface) string { []interface{}{data}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4523,7 +4518,6 @@ func (d *DataRenderer) RenderArbitrary(data map[string]interface{}) string { []interface{}{data}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4536,7 +4530,6 @@ func (d *DataRenderer) RenderMap(map_ map[string]interface{}) string { []interface{}{map_}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4561,7 +4554,6 @@ func (d *DefaultedConstructorArgument) GetArg1() float64 { d, "arg1", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4572,7 +4564,6 @@ func (d *DefaultedConstructorArgument) GetArg3() string { d, "arg3", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4583,7 +4574,6 @@ func (d *DefaultedConstructorArgument) GetArg2() string { d, "arg2", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4630,15 +4620,12 @@ func NewDemonstrate982() Demonstrate982Iface { func Demonstrate982_TakeThis() ChildStruct982Iface { _init_.Initialize() var returns ChildStruct982Iface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Demonstrate982", "takeThis", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ChildStruct982Iface)(nil)).Elem(): reflect.TypeOf((*ChildStruct982)(nil)).Elem(), - }, ) return returns } @@ -4646,15 +4633,12 @@ func Demonstrate982_TakeThis() ChildStruct982Iface { func Demonstrate982_TakeThisToo() ParentStruct982Iface { _init_.Initialize() var returns ParentStruct982Iface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Demonstrate982", "takeThisToo", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ParentStruct982Iface)(nil)).Elem(): reflect.TypeOf((*ParentStruct982)(nil)).Elem(), - }, ) return returns } @@ -4682,7 +4666,6 @@ func (d *DeprecatedClass) GetReadonlyProperty() string { d, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4693,7 +4676,6 @@ func (d *DeprecatedClass) GetMutableProperty() float64 { d, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4728,7 +4710,6 @@ func (d *DeprecatedClass) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -4759,7 +4740,6 @@ func (d *DeprecatedStruct) GetReadonlyProperty() string { d, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4805,7 +4785,6 @@ func (d *DerivedStruct) GetAnumber() float64 { d, "anumber", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4816,7 +4795,6 @@ func (d *DerivedStruct) GetAstring() string { d, "astring", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4827,9 +4805,6 @@ func (d *DerivedStruct) GetFirstOptional() []string { d, "firstOptional", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -4840,7 +4815,6 @@ func (d *DerivedStruct) GetAnotherRequired() string { d, "anotherRequired", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4851,7 +4825,6 @@ func (d *DerivedStruct) GetBool() bool { d, "bool", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4862,9 +4835,6 @@ func (d *DerivedStruct) GetNonPrimitive() DoubleTroubleIface { d, "nonPrimitive", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*DoubleTroubleIface)(nil)).Elem(): reflect.TypeOf((*DoubleTrouble)(nil)).Elem(), - }, ) return returns } @@ -4875,9 +4845,6 @@ func (d *DerivedStruct) GetAnotherOptional() map[string]scopejsiicalclib.Numeric d, "anotherOptional", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -4888,7 +4855,6 @@ func (d *DerivedStruct) GetOptionalAny() interface{} { d, "optionalAny", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4899,9 +4865,6 @@ func (d *DerivedStruct) GetOptionalArray() []string { d, "optionalArray", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -4923,7 +4886,6 @@ func (d *DiamondInheritanceBaseLevelStruct) GetBaseLevelProperty() string { d, "baseLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4947,7 +4909,6 @@ func (d *DiamondInheritanceFirstMidLevelStruct) GetBaseLevelProperty() string { d, "baseLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4958,7 +4919,6 @@ func (d *DiamondInheritanceFirstMidLevelStruct) GetFirstMidLevelProperty() strin d, "firstMidLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4982,7 +4942,6 @@ func (d *DiamondInheritanceSecondMidLevelStruct) GetBaseLevelProperty() string { d, "baseLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -4993,7 +4952,6 @@ func (d *DiamondInheritanceSecondMidLevelStruct) GetSecondMidLevelProperty() str d, "secondMidLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5021,7 +4979,6 @@ func (d *DiamondInheritanceTopLevelStruct) GetBaseLevelProperty() string { d, "baseLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5032,7 +4989,6 @@ func (d *DiamondInheritanceTopLevelStruct) GetFirstMidLevelProperty() string { d, "firstMidLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5043,7 +4999,6 @@ func (d *DiamondInheritanceTopLevelStruct) GetSecondMidLevelProperty() string { d, "secondMidLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5054,7 +5009,6 @@ func (d *DiamondInheritanceTopLevelStruct) GetTopLevelProperty() string { d, "topLevelProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5078,9 +5032,6 @@ func DisappointingCollectionSource_MaybeList() []string { "jsii-calc.DisappointingCollectionSource", "maybeList", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -5092,9 +5043,6 @@ func DisappointingCollectionSource_MaybeMap() map[string]float64 { "jsii-calc.DisappointingCollectionSource", "maybeMap", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*float64)(nil)).Elem(): reflect.TypeOf((*float64)(nil)).Elem(), - }, ) return returns } @@ -5131,7 +5079,6 @@ func (d *DoNotOverridePrivates) ChangePrivatePropertyValue(newValue string) { []interface{}{newValue}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -5143,7 +5090,6 @@ func (d *DoNotOverridePrivates) PrivateMethodValue() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5156,7 +5102,6 @@ func (d *DoNotOverridePrivates) PrivatePropertyValue() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5192,7 +5137,6 @@ func (d *DoNotRecognizeAnyAsOptional) Method(_requiredAny interface{}, _optional []interface{}{_requiredAny, _optionalAny, _optionalString}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -5236,7 +5180,6 @@ func (d *DocumentedClass) Greet(greetee GreeteeIface) float64 { []interface{}{greetee}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5249,7 +5192,6 @@ func (d *DocumentedClass) Hola() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -5283,7 +5225,6 @@ func (d *DontComplainAboutVariadicAfterOptional) OptionalAndVariadic(optional st []interface{}{optional, things}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5322,7 +5263,6 @@ func (d *DoubleTrouble) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5335,7 +5275,6 @@ func (d *DoubleTrouble) Next() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5361,7 +5300,6 @@ func (d *DynamicPropertyBearer) GetDynamicProperty() string { d, "dynamicProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5372,7 +5310,6 @@ func (d *DynamicPropertyBearer) GetValueStore() string { d, "valueStore", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5430,7 +5367,6 @@ func (d *DynamicPropertyBearerChild) GetDynamicProperty() string { d, "dynamicProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5441,7 +5377,6 @@ func (d *DynamicPropertyBearerChild) GetValueStore() string { d, "valueStore", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5452,7 +5387,6 @@ func (d *DynamicPropertyBearerChild) GetOriginalValue() string { d, "originalValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5495,7 +5429,6 @@ func (d *DynamicPropertyBearerChild) OverrideValue(newValue string) string { []interface{}{newValue}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5533,7 +5466,6 @@ func (e *Entropy) Increase() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5546,7 +5478,6 @@ func (e *Entropy) Repeat(word string) string { []interface{}{word}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5562,15 +5493,12 @@ type EnumDispenser struct { func EnumDispenser_RandomIntegerLikeEnum() AllTypesEnum { _init_.Initialize() var returns AllTypesEnum - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.EnumDispenser", "randomIntegerLikeEnum", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*AllTypesEnum)(nil)).Elem(): reflect.TypeOf((*AllTypesEnum)(nil)).Elem(), - }, ) return returns } @@ -5578,15 +5506,12 @@ func EnumDispenser_RandomIntegerLikeEnum() AllTypesEnum { func EnumDispenser_RandomStringLikeEnum() StringEnum { _init_.Initialize() var returns StringEnum - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.EnumDispenser", "randomStringLikeEnum", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StringEnum)(nil)).Elem(): reflect.TypeOf((*StringEnum)(nil)).Elem(), - }, ) return returns } @@ -5615,13 +5540,12 @@ func NewEraseUndefinedHashValues() EraseUndefinedHashValuesIface { func EraseUndefinedHashValues_DoesKeyExist(opts EraseUndefinedHashValuesOptionsIface, key string) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.EraseUndefinedHashValues", "doesKeyExist", []interface{}{opts, key}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5629,15 +5553,12 @@ func EraseUndefinedHashValues_DoesKeyExist(opts EraseUndefinedHashValuesOptionsI func EraseUndefinedHashValues_Prop1IsNull() map[string]interface{} { _init_.Initialize() var returns map[string]interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.EraseUndefinedHashValues", "prop1IsNull", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -5645,15 +5566,12 @@ func EraseUndefinedHashValues_Prop1IsNull() map[string]interface{} { func EraseUndefinedHashValues_Prop2IsUndefined() map[string]interface{} { _init_.Initialize() var returns map[string]interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.EraseUndefinedHashValues", "prop2IsUndefined", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -5676,7 +5594,6 @@ func (e *EraseUndefinedHashValuesOptions) GetOption1() string { e, "option1", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5687,7 +5604,6 @@ func (e *EraseUndefinedHashValuesOptions) GetOption2() string { e, "option2", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5716,7 +5632,6 @@ func (e *ExperimentalClass) GetReadonlyProperty() string { e, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5727,7 +5642,6 @@ func (e *ExperimentalClass) GetMutableProperty() float64 { e, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5762,7 +5676,6 @@ func (e *ExperimentalClass) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -5793,7 +5706,6 @@ func (e *ExperimentalStruct) GetReadonlyProperty() string { e, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5815,7 +5727,6 @@ func (e *ExportedBaseClass) GetSuccess() bool { e, "success", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5852,7 +5763,6 @@ func (e *ExtendsInternalInterface) GetBoom() bool { e, "boom", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5863,7 +5773,6 @@ func (e *ExtendsInternalInterface) GetProp() string { e, "prop", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5889,7 +5798,6 @@ func (e *ExternalClass) GetReadonlyProperty() string { e, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5900,7 +5808,6 @@ func (e *ExternalClass) GetMutableProperty() float64 { e, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5935,7 +5842,6 @@ func (e *ExternalClass) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -5962,7 +5868,6 @@ func (e *ExternalStruct) GetReadonlyProperty() string { e, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -5987,9 +5892,6 @@ func (g *GiveMeStructs) GetStructLiteral() scopejsiicalclib.StructWithOnlyOption g, "structLiteral", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.StructWithOnlyOptionalsIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.StructWithOnlyOptionals)(nil)).Elem(), - }, ) return returns } @@ -6016,9 +5918,6 @@ func (g *GiveMeStructs) DerivedToFirst(derived DerivedStructIface) scopejsiicalc []interface{}{derived}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.MyFirstStructIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.MyFirstStruct)(nil)).Elem(), - }, ) return returns } @@ -6031,9 +5930,6 @@ func (g *GiveMeStructs) ReadDerivedNonPrimitive(derived DerivedStructIface) Doub []interface{}{derived}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*DoubleTroubleIface)(nil)).Elem(): reflect.TypeOf((*DoubleTrouble)(nil)).Elem(), - }, ) return returns } @@ -6046,7 +5942,6 @@ func (g *GiveMeStructs) ReadFirstNumber(first scopejsiicalclib.MyFirstStructIfac []interface{}{first}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6069,7 +5964,6 @@ func (g *Greetee) GetName() string { g, "name", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6105,7 +5999,6 @@ func (g *GreetingAugmenter) BetterGreeting(friendly scopejsiicalclib.IFriendlyIf []interface{}{friendly}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6126,9 +6019,6 @@ func (i *IAnonymousImplementationProvider) ProvideAsClass() ImplementationIface []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*ImplementationIface)(nil)).Elem(): reflect.TypeOf((*Implementation)(nil)).Elem(), - }, ) return returns } @@ -6141,9 +6031,6 @@ func (i *IAnonymousImplementationProvider) ProvideAsInterface() IAnonymouslyImpl []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IAnonymouslyImplementMeIface)(nil)).Elem(): reflect.TypeOf((*IAnonymouslyImplementMe)(nil)).Elem(), - }, ) return returns } @@ -6163,7 +6050,6 @@ func (i *IAnonymouslyImplementMe) Verb() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6174,7 +6060,6 @@ func (i *IAnonymouslyImplementMe) GetValue() float64 { i, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6191,7 +6076,6 @@ func (i *IAnotherPublicInterface) GetA() string { i, "a", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6218,7 +6102,6 @@ func (i *IBell) Ring() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6237,7 +6120,6 @@ func (i *IBellRinger) YourTurn(bell IBellIface) { []interface{}{bell}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6256,7 +6138,6 @@ func (i *IConcreteBellRinger) YourTurn(bell BellIface) { []interface{}{bell}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6278,7 +6159,6 @@ func (i *IDeprecatedInterface) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6288,7 +6168,6 @@ func (i *IDeprecatedInterface) GetMutableProperty() float64 { i, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6319,7 +6198,6 @@ func (i *IExperimentalInterface) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6329,7 +6207,6 @@ func (i *IExperimentalInterface) GetMutableProperty() float64 { i, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6355,9 +6232,6 @@ func (i *IExtendsPrivateInterface) GetMoreThings() []string { i, "moreThings", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -6368,7 +6242,6 @@ func (i *IExtendsPrivateInterface) GetPrivate() string { i, "private", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6396,7 +6269,6 @@ func (i *IExternalInterface) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6406,7 +6278,6 @@ func (i *IExternalInterface) GetMutableProperty() float64 { i, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6440,7 +6311,6 @@ func (i *IFriendlier) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6453,7 +6323,6 @@ func (i *IFriendlier) Farewell() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6466,7 +6335,6 @@ func (i *IFriendlier) Goodbye() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6486,7 +6354,6 @@ func (i *IFriendlyRandomGenerator) Next() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6499,7 +6366,6 @@ func (i *IFriendlyRandomGenerator) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6517,7 +6383,6 @@ func (i *IInterfaceImplementedByAbstractClass) GetPropFromInterface() string { i, "propFromInterface", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6538,7 +6403,6 @@ func (i *IInterfaceThatShouldNotBeADataType) DoThings() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6548,7 +6412,6 @@ func (i *IInterfaceThatShouldNotBeADataType) GetValue() string { i, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6559,7 +6422,6 @@ func (i *IInterfaceThatShouldNotBeADataType) GetOtherValue() string { i, "otherValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6578,7 +6440,6 @@ func (i *IInterfaceWithInternal) Visible() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6597,7 +6458,6 @@ func (i *IInterfaceWithMethods) DoThings() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6607,7 +6467,6 @@ func (i *IInterfaceWithMethods) GetValue() string { i, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6627,7 +6486,6 @@ func (i *IInterfaceWithOptionalMethodArguments) Hello(arg1 string, arg2 float64) []interface{}{arg1, arg2}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6644,7 +6502,6 @@ func (i *IInterfaceWithProperties) GetReadOnlyString() string { i, "readOnlyString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6655,7 +6512,6 @@ func (i *IInterfaceWithProperties) GetReadWriteString() string { i, "readWriteString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6681,7 +6537,6 @@ func (i *IInterfaceWithPropertiesExtension) GetReadOnlyString() string { i, "readOnlyString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6692,7 +6547,6 @@ func (i *IInterfaceWithPropertiesExtension) GetReadWriteString() string { i, "readWriteString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6711,7 +6565,6 @@ func (i *IInterfaceWithPropertiesExtension) GetFoo() float64 { i, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6741,7 +6594,6 @@ func (i *Ijsii417Derived) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6753,7 +6605,6 @@ func (i *Ijsii417Derived) Bar() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6765,7 +6616,6 @@ func (i *Ijsii417Derived) Baz() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6775,7 +6625,6 @@ func (i *Ijsii417Derived) GetHasRoot() bool { i, "hasRoot", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6786,7 +6635,6 @@ func (i *Ijsii417Derived) GetProperty() string { i, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6806,7 +6654,6 @@ func (i *Ijsii417PublicBaseOfBase) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -6816,7 +6663,6 @@ func (i *Ijsii417PublicBaseOfBase) GetHasRoot() bool { i, "hasRoot", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6848,7 +6694,6 @@ func (i *IMutableObjectLiteral) GetValue() string { i, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6875,7 +6720,6 @@ func (i *INonInternalInterface) GetA() string { i, "a", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6894,7 +6738,6 @@ func (i *INonInternalInterface) GetB() string { i, "b", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6913,7 +6756,6 @@ func (i *INonInternalInterface) GetC() string { i, "c", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6942,7 +6784,6 @@ func (i *IObjectWithProperty) WasSet() bool { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6953,7 +6794,6 @@ func (i *IObjectWithProperty) GetProperty() string { i, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6981,7 +6821,6 @@ func (i *IOptionalMethod) Optional() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -6998,7 +6837,6 @@ func (i *IPrivatelyImplemented) GetSuccess() bool { i, "success", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7017,7 +6855,6 @@ func (i *IPublicInterface) Bye() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7036,7 +6873,6 @@ func (i *IPublicInterface2) Ciao() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7059,7 +6895,6 @@ func (i *IRandomNumberGenerator) Next() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7077,7 +6912,6 @@ func (i *IReturnJsii976) GetFoo() float64 { i, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7097,9 +6931,6 @@ func (i *IReturnsNumber) ObtainNumber() scopejsiicalclib.IDoublableIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.IDoublableIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.IDoublable)(nil)).Elem(), - }, ) return returns } @@ -7110,9 +6941,6 @@ func (i *IReturnsNumber) GetNumberProp() scopejsiicalclib.NumberIface { i, "numberProp", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumberIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.Number)(nil)).Elem(), - }, ) return returns } @@ -7132,7 +6960,6 @@ func (i *IStableInterface) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7142,7 +6969,6 @@ func (i *IStableInterface) GetMutableProperty() float64 { i, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7170,9 +6996,6 @@ func (i *IStructReturningDelegate) ReturnStruct() StructBIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructBIface)(nil)).Elem(): reflect.TypeOf((*StructB)(nil)).Elem(), - }, ) return returns } @@ -7193,7 +7016,6 @@ func (i *IWallClock) Iso8601Now() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7215,7 +7037,6 @@ func (i *ImplementInternalInterface) GetProp() string { i, "prop", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7258,7 +7079,6 @@ func (i *Implementation) GetValue() float64 { i, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7308,7 +7128,6 @@ func (i *ImplementsInterfaceWithInternal) Visible() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7343,7 +7162,6 @@ func (i *ImplementsInterfaceWithInternalSubclass) Visible() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7364,7 +7182,6 @@ func (i *ImplementsPrivateInterface) GetPrivate() string { i, "private", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7411,9 +7228,6 @@ func (i *ImplictBaseOfBase) GetFoo() scopejsiicalcbaseofbase.VeryIface { i, "foo", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalcbaseofbase.VeryIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalcbaseofbase.Very)(nil)).Elem(), - }, ) return returns } @@ -7424,7 +7238,6 @@ func (i *ImplictBaseOfBase) GetBar() string { i, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7435,7 +7248,6 @@ func (i *ImplictBaseOfBase) GetGoo() string { i, "goo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7473,7 +7285,6 @@ func (i *InbetweenClass) Hello() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7485,7 +7296,6 @@ func (i *InbetweenClass) Ciao() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7504,15 +7314,12 @@ type InterfaceCollections struct { func InterfaceCollections_ListOfInterfaces() []IBellIface { _init_.Initialize() var returns []IBellIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.InterfaceCollections", "listOfInterfaces", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IBellIface)(nil)).Elem(): reflect.TypeOf((*IBell)(nil)).Elem(), - }, ) return returns } @@ -7520,15 +7327,12 @@ func InterfaceCollections_ListOfInterfaces() []IBellIface { func InterfaceCollections_ListOfStructs() []StructAIface { _init_.Initialize() var returns []StructAIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.InterfaceCollections", "listOfStructs", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructAIface)(nil)).Elem(): reflect.TypeOf((*StructA)(nil)).Elem(), - }, ) return returns } @@ -7536,15 +7340,12 @@ func InterfaceCollections_ListOfStructs() []StructAIface { func InterfaceCollections_MapOfInterfaces() map[string]IBellIface { _init_.Initialize() var returns map[string]IBellIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.InterfaceCollections", "mapOfInterfaces", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IBellIface)(nil)).Elem(): reflect.TypeOf((*IBell)(nil)).Elem(), - }, ) return returns } @@ -7552,15 +7353,12 @@ func InterfaceCollections_MapOfInterfaces() map[string]IBellIface { func InterfaceCollections_MapOfStructs() map[string]StructAIface { _init_.Initialize() var returns map[string]StructAIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.InterfaceCollections", "mapOfStructs", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructAIface)(nil)).Elem(): reflect.TypeOf((*StructA)(nil)).Elem(), - }, ) return returns } @@ -7577,15 +7375,12 @@ type InterfacesMaker struct { func InterfacesMaker_MakeInterfaces(count float64) []scopejsiicalclib.IDoublableIface { _init_.Initialize() var returns []scopejsiicalclib.IDoublableIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.InterfacesMaker", "makeInterfaces", []interface{}{count}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.IDoublableIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.IDoublable)(nil)).Elem(), - }, ) return returns } @@ -7624,9 +7419,6 @@ func (i *Isomorphism) Myself() IsomorphismIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IsomorphismIface)(nil)).Elem(): reflect.TypeOf((*Isomorphism)(nil)).Elem(), - }, ) return returns } @@ -7652,7 +7444,6 @@ func (j *Jsii417Derived) GetHasRoot() bool { j, "hasRoot", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7663,7 +7454,6 @@ func (j *Jsii417Derived) GetProperty() string { j, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7685,15 +7475,12 @@ func NewJsii417Derived(property string) Jsii417DerivedIface { func Jsii417Derived_MakeInstance() Jsii417PublicBaseOfBaseIface { _init_.Initialize() var returns Jsii417PublicBaseOfBaseIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JSII417Derived", "makeInstance", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*Jsii417PublicBaseOfBaseIface)(nil)).Elem(): reflect.TypeOf((*Jsii417PublicBaseOfBase)(nil)).Elem(), - }, ) return returns } @@ -7706,7 +7493,6 @@ func (j *Jsii417Derived) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7718,7 +7504,6 @@ func (j *Jsii417Derived) Bar() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7730,7 +7515,6 @@ func (j *Jsii417Derived) Baz() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7751,7 +7535,6 @@ func (j *Jsii417PublicBaseOfBase) GetHasRoot() bool { j, "hasRoot", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7773,15 +7556,12 @@ func NewJsii417PublicBaseOfBase() Jsii417PublicBaseOfBaseIface { func Jsii417PublicBaseOfBase_MakeInstance() Jsii417PublicBaseOfBaseIface { _init_.Initialize() var returns Jsii417PublicBaseOfBaseIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JSII417PublicBaseOfBase", "makeInstance", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*Jsii417PublicBaseOfBaseIface)(nil)).Elem(): reflect.TypeOf((*Jsii417PublicBaseOfBase)(nil)).Elem(), - }, ) return returns } @@ -7794,7 +7574,6 @@ func (j *Jsii417PublicBaseOfBase) Foo() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -7829,9 +7608,6 @@ func (j *JsObjectLiteralForInterface) GiveMeFriendly() scopejsiicalclib.IFriendl []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.IFriendlyIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.IFriendly)(nil)).Elem(), - }, ) return returns } @@ -7844,9 +7620,6 @@ func (j *JsObjectLiteralForInterface) GiveMeFriendlyGenerator() IFriendlyRandomG []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IFriendlyRandomGeneratorIface)(nil)).Elem(): reflect.TypeOf((*IFriendlyRandomGenerator)(nil)).Elem(), - }, ) return returns } @@ -7881,9 +7654,6 @@ func (j *JsObjectLiteralToNative) ReturnLiteral() JsObjectLiteralToNativeClassIf []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*JsObjectLiteralToNativeClassIface)(nil)).Elem(): reflect.TypeOf((*JsObjectLiteralToNativeClass)(nil)).Elem(), - }, ) return returns } @@ -7908,7 +7678,6 @@ func (j *JsObjectLiteralToNativeClass) GetPropA() string { j, "propA", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -7919,7 +7688,6 @@ func (j *JsObjectLiteralToNativeClass) GetPropB() float64 { j, "propB", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8023,7 +7791,6 @@ func (j *JavaReservedWords) GetWhile() string { j, "while", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8058,7 +7825,6 @@ func (j *JavaReservedWords) Abstract() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8070,7 +7836,6 @@ func (j *JavaReservedWords) Assert() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8082,7 +7847,6 @@ func (j *JavaReservedWords) Boolean() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8094,7 +7858,6 @@ func (j *JavaReservedWords) Break() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8106,7 +7869,6 @@ func (j *JavaReservedWords) Byte() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8118,7 +7880,6 @@ func (j *JavaReservedWords) Case() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8130,7 +7891,6 @@ func (j *JavaReservedWords) Catch() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8142,7 +7902,6 @@ func (j *JavaReservedWords) Char() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8154,7 +7913,6 @@ func (j *JavaReservedWords) Class() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8166,7 +7924,6 @@ func (j *JavaReservedWords) Const() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8178,7 +7935,6 @@ func (j *JavaReservedWords) Continue() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8190,7 +7946,6 @@ func (j *JavaReservedWords) Default() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8202,7 +7957,6 @@ func (j *JavaReservedWords) Do() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8214,7 +7968,6 @@ func (j *JavaReservedWords) Double() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8226,7 +7979,6 @@ func (j *JavaReservedWords) Else() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8238,7 +7990,6 @@ func (j *JavaReservedWords) Enum() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8250,7 +8001,6 @@ func (j *JavaReservedWords) Extends() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8262,7 +8012,6 @@ func (j *JavaReservedWords) False() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8274,7 +8023,6 @@ func (j *JavaReservedWords) Final() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8286,7 +8034,6 @@ func (j *JavaReservedWords) Finally() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8298,7 +8045,6 @@ func (j *JavaReservedWords) Float() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8310,7 +8056,6 @@ func (j *JavaReservedWords) For() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8322,7 +8067,6 @@ func (j *JavaReservedWords) Goto() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8334,7 +8078,6 @@ func (j *JavaReservedWords) If() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8346,7 +8089,6 @@ func (j *JavaReservedWords) Implements() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8358,7 +8100,6 @@ func (j *JavaReservedWords) Import() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8370,7 +8111,6 @@ func (j *JavaReservedWords) Instanceof() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8382,7 +8122,6 @@ func (j *JavaReservedWords) Int() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8394,7 +8133,6 @@ func (j *JavaReservedWords) Interface() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8406,7 +8144,6 @@ func (j *JavaReservedWords) Long() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8418,7 +8155,6 @@ func (j *JavaReservedWords) Native() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8430,7 +8166,6 @@ func (j *JavaReservedWords) New() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8442,7 +8177,6 @@ func (j *JavaReservedWords) Null() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8454,7 +8188,6 @@ func (j *JavaReservedWords) Package() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8466,7 +8199,6 @@ func (j *JavaReservedWords) Private() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8478,7 +8210,6 @@ func (j *JavaReservedWords) Protected() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8490,7 +8221,6 @@ func (j *JavaReservedWords) Public() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8502,7 +8232,6 @@ func (j *JavaReservedWords) Return() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8514,7 +8243,6 @@ func (j *JavaReservedWords) Short() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8526,7 +8254,6 @@ func (j *JavaReservedWords) Static() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8538,7 +8265,6 @@ func (j *JavaReservedWords) Strictfp() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8550,7 +8276,6 @@ func (j *JavaReservedWords) Super() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8562,7 +8287,6 @@ func (j *JavaReservedWords) Switch() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8574,7 +8298,6 @@ func (j *JavaReservedWords) Synchronized() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8586,7 +8309,6 @@ func (j *JavaReservedWords) This() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8598,7 +8320,6 @@ func (j *JavaReservedWords) Throw() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8610,7 +8331,6 @@ func (j *JavaReservedWords) Throws() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8622,7 +8342,6 @@ func (j *JavaReservedWords) Transient() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8634,7 +8353,6 @@ func (j *JavaReservedWords) True() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8646,7 +8364,6 @@ func (j *JavaReservedWords) Try() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8658,7 +8375,6 @@ func (j *JavaReservedWords) Void() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8670,7 +8386,6 @@ func (j *JavaReservedWords) Volatile() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -8748,7 +8463,6 @@ func JsiiAgent_Value() string { "jsii-calc.JsiiAgent", "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8767,13 +8481,12 @@ type JsonFormatter struct { func JsonFormatter_AnyArray() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyArray", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8781,13 +8494,12 @@ func JsonFormatter_AnyArray() interface{} { func JsonFormatter_AnyBooleanFalse() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyBooleanFalse", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8795,13 +8507,12 @@ func JsonFormatter_AnyBooleanFalse() interface{} { func JsonFormatter_AnyBooleanTrue() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyBooleanTrue", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8809,13 +8520,12 @@ func JsonFormatter_AnyBooleanTrue() interface{} { func JsonFormatter_AnyDate() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyDate", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8823,13 +8533,12 @@ func JsonFormatter_AnyDate() interface{} { func JsonFormatter_AnyEmptyString() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyEmptyString", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8837,13 +8546,12 @@ func JsonFormatter_AnyEmptyString() interface{} { func JsonFormatter_AnyFunction() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyFunction", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8851,13 +8559,12 @@ func JsonFormatter_AnyFunction() interface{} { func JsonFormatter_AnyHash() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyHash", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8865,13 +8572,12 @@ func JsonFormatter_AnyHash() interface{} { func JsonFormatter_AnyNull() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyNull", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8879,13 +8585,12 @@ func JsonFormatter_AnyNull() interface{} { func JsonFormatter_AnyNumber() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyNumber", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8893,13 +8598,12 @@ func JsonFormatter_AnyNumber() interface{} { func JsonFormatter_AnyRef() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyRef", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8907,13 +8611,12 @@ func JsonFormatter_AnyRef() interface{} { func JsonFormatter_AnyString() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyString", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8921,13 +8624,12 @@ func JsonFormatter_AnyString() interface{} { func JsonFormatter_AnyUndefined() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyUndefined", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8935,13 +8637,12 @@ func JsonFormatter_AnyUndefined() interface{} { func JsonFormatter_AnyZero() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "anyZero", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8949,13 +8650,12 @@ func JsonFormatter_AnyZero() interface{} { func JsonFormatter_Stringify(value interface{}) string { _init_.Initialize() var returns string - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.JsonFormatter", "stringify", []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -8977,9 +8677,6 @@ func (l *LevelOne) GetProps() LevelOnePropsIface { l, "props", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*LevelOnePropsIface)(nil)).Elem(): reflect.TypeOf((*LevelOneProps)(nil)).Elem(), - }, ) return returns } @@ -9014,7 +8711,6 @@ func (p *PropBooleanValue) GetValue() bool { p, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9036,9 +8732,6 @@ func (p *PropProperty) GetProp() PropBooleanValueIface { p, "prop", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*PropBooleanValueIface)(nil)).Elem(): reflect.TypeOf((*PropBooleanValue)(nil)).Elem(), - }, ) return returns } @@ -9060,9 +8753,6 @@ func (l *LevelOneProps) GetProp() PropPropertyIface { l, "prop", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*PropPropertyIface)(nil)).Elem(): reflect.TypeOf((*PropProperty)(nil)).Elem(), - }, ) return returns } @@ -9124,7 +8814,6 @@ func (l *LoadBalancedFargateServiceProps) GetContainerPort() float64 { l, "containerPort", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9135,7 +8824,6 @@ func (l *LoadBalancedFargateServiceProps) GetCpu() string { l, "cpu", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9146,7 +8834,6 @@ func (l *LoadBalancedFargateServiceProps) GetMemoryMiB() string { l, "memoryMiB", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9157,7 +8844,6 @@ func (l *LoadBalancedFargateServiceProps) GetPublicLoadBalancer() bool { l, "publicLoadBalancer", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9168,7 +8854,6 @@ func (l *LoadBalancedFargateServiceProps) GetPublicTasks() bool { l, "publicTasks", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9191,7 +8876,6 @@ func (m *MethodNamedProperty) GetElite() float64 { m, "elite", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9218,7 +8902,6 @@ func (m *MethodNamedProperty) Property() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9257,7 +8940,6 @@ func (m *Multiply) GetValue() float64 { m, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9268,9 +8950,6 @@ func (m *Multiply) GetLhs() scopejsiicalclib.NumericValueIface { m, "lhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -9281,9 +8960,6 @@ func (m *Multiply) GetRhs() scopejsiicalclib.NumericValueIface { m, "rhs", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -9311,7 +8987,6 @@ func (m *Multiply) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9324,7 +8999,6 @@ func (m *Multiply) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9337,7 +9011,6 @@ func (m *Multiply) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9350,7 +9023,6 @@ func (m *Multiply) Farewell() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9363,7 +9035,6 @@ func (m *Multiply) Goodbye() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9376,7 +9047,6 @@ func (m *Multiply) Next() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9408,7 +9078,6 @@ func (n *Negate) GetValue() float64 { n, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9419,9 +9088,6 @@ func (n *Negate) GetOperand() scopejsiicalclib.NumericValueIface { n, "operand", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -9448,7 +9114,6 @@ func (n *Negate) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9461,7 +9126,6 @@ func (n *Negate) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9474,7 +9138,6 @@ func (n *Negate) Farewell() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9487,7 +9150,6 @@ func (n *Negate) Goodbye() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9500,7 +9162,6 @@ func (n *Negate) Hello() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9516,15 +9177,12 @@ type NestedClassInstance struct { func NestedClassInstance_MakeInstance() submodule.NestedClassIface { _init_.Initialize() var returns submodule.NestedClassIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.NestedClassInstance", "makeInstance", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*submodule.NestedClassIface)(nil)).Elem(): reflect.TypeOf((*submodule.NestedClass)(nil)).Elem(), - }, ) return returns } @@ -9546,7 +9204,6 @@ func (n *NestedStruct) GetNumberProp() float64 { n, "numberProp", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9573,7 +9230,6 @@ func (n *NodeStandardLibrary) GetOsPlatform() string { n, "osPlatform", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9600,7 +9256,6 @@ func (n *NodeStandardLibrary) CryptoSha256() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9613,7 +9268,6 @@ func (n *NodeStandardLibrary) FsReadFile() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9626,7 +9280,6 @@ func (n *NodeStandardLibrary) FsReadFileSync() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9652,7 +9305,6 @@ func (n *NullShouldBeTreatedAsUndefined) GetChangeMeToUndefined() string { n, "changeMeToUndefined", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9687,7 +9339,6 @@ func (n *NullShouldBeTreatedAsUndefined) GiveMeUndefined(value interface{}) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -9699,7 +9350,6 @@ func (n *NullShouldBeTreatedAsUndefined) GiveMeUndefinedInsideAnObject(input Nul []interface{}{input}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -9711,7 +9361,6 @@ func (n *NullShouldBeTreatedAsUndefined) VerifyPropertyIsUndefined() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -9733,9 +9382,6 @@ func (n *NullShouldBeTreatedAsUndefinedData) GetArrayWithThreeElementsAndUndefin n, "arrayWithThreeElementsAndUndefinedAsSecondArgument", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*interface{})(nil)).Elem(): reflect.TypeOf((*interface{})(nil)).Elem(), - }, ) return returns } @@ -9746,7 +9392,6 @@ func (n *NullShouldBeTreatedAsUndefinedData) GetThisShouldBeUndefined() interfac n, "thisShouldBeUndefined", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9772,9 +9417,6 @@ func (n *NumberGenerator) GetGenerator() IRandomNumberGeneratorIface { n, "generator", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IRandomNumberGeneratorIface)(nil)).Elem(): reflect.TypeOf((*IRandomNumberGenerator)(nil)).Elem(), - }, ) return returns } @@ -9809,7 +9451,6 @@ func (n *NumberGenerator) IsSameGenerator(gen IRandomNumberGeneratorIface) bool []interface{}{gen}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9822,7 +9463,6 @@ func (n *NumberGenerator) NextTimes100() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9859,7 +9499,6 @@ func (o *ObjectRefsInCollections) SumFromArray(values []scopejsiicalclib.Numeric []interface{}{values}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9872,7 +9511,6 @@ func (o *ObjectRefsInCollections) SumFromMap(values map[string]scopejsiicalclib. []interface{}{values}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -9888,15 +9526,12 @@ type ObjectWithPropertyProvider struct { func ObjectWithPropertyProvider_Provide() IObjectWithPropertyIface { _init_.Initialize() var returns IObjectWithPropertyIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.ObjectWithPropertyProvider", "provide", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IObjectWithPropertyIface)(nil)).Elem(): reflect.TypeOf((*IObjectWithProperty)(nil)).Elem(), - }, ) return returns } @@ -9934,7 +9569,6 @@ func (o *Old) DoAThing() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -9969,7 +9603,6 @@ func (o *OptionalArgumentInvoker) InvokeWithOptional() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -9981,7 +9614,6 @@ func (o *OptionalArgumentInvoker) InvokeWithoutOptional() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10005,7 +9637,6 @@ func (o *OptionalConstructorArgument) GetArg1() float64 { o, "arg1", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10016,7 +9647,6 @@ func (o *OptionalConstructorArgument) GetArg2() string { o, "arg2", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10027,7 +9657,6 @@ func (o *OptionalConstructorArgument) GetArg3() string { o, "arg3", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10062,7 +9691,6 @@ func (o *OptionalStruct) GetField() string { o, "field", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10086,7 +9714,6 @@ func (o *OptionalStructConsumer) GetParameterWasUndefined() bool { o, "parameterWasUndefined", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10097,7 +9724,6 @@ func (o *OptionalStructConsumer) GetFieldValue() string { o, "fieldValue", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10139,7 +9765,6 @@ func (o *OverridableProtectedMember) GetOverrideReadOnly() string { o, "overrideReadOnly", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10150,7 +9775,6 @@ func (o *OverridableProtectedMember) GetOverrideReadWrite() string { o, "overrideReadWrite", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10185,7 +9809,6 @@ func (o *OverridableProtectedMember) OverrideMe() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10198,7 +9821,6 @@ func (o *OverridableProtectedMember) SwitchModes() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10210,7 +9832,6 @@ func (o *OverridableProtectedMember) ValueFromProtected() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10245,7 +9866,6 @@ func (o *OverrideReturnsObject) Test(obj IReturnsNumberIface) float64 { []interface{}{obj}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10267,7 +9887,6 @@ func (p *ParentStruct982) GetFoo() string { p, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10303,7 +9922,6 @@ func (p *PartiallyInitializedThisConsumer) ConsumePartiallyInitializedThis(obj C []interface{}{obj, dt, ev}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10338,7 +9956,6 @@ func (p *Polymorphism) SayHello(friendly scopejsiicalclib.IFriendlyIface) string []interface{}{friendly}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10386,7 +10003,6 @@ func (p *Power) GetValue() float64 { p, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10397,9 +10013,6 @@ func (p *Power) GetExpression() scopejsiicalclib.NumericValueIface { p, "expression", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -10410,9 +10023,6 @@ func (p *Power) GetDecorationPostfixes() []string { p, "decorationPostfixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -10423,9 +10033,6 @@ func (p *Power) GetDecorationPrefixes() []string { p, "decorationPrefixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -10436,9 +10043,6 @@ func (p *Power) GetStringStyle() composition.CompositionStringStyle { p, "stringStyle", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(): reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(), - }, ) return returns } @@ -10449,9 +10053,6 @@ func (p *Power) GetBase() scopejsiicalclib.NumericValueIface { p, "base", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -10462,9 +10063,6 @@ func (p *Power) GetPow() scopejsiicalclib.NumericValueIface { p, "pow", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -10516,7 +10114,6 @@ func (p *Power) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10529,7 +10126,6 @@ func (p *Power) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10553,7 +10149,6 @@ func (p *PropertyNamedProperty) GetProperty() string { p, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10564,7 +10159,6 @@ func (p *PropertyNamedProperty) GetYetAnoterOne() bool { p, "yetAnoterOne", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -10613,7 +10207,6 @@ func (p *PublicClass) Hello() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10678,7 +10271,6 @@ func (p *PythonReservedWords) And() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10690,7 +10282,6 @@ func (p *PythonReservedWords) As() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10702,7 +10293,6 @@ func (p *PythonReservedWords) Assert() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10714,7 +10304,6 @@ func (p *PythonReservedWords) Async() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10726,7 +10315,6 @@ func (p *PythonReservedWords) Await() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10738,7 +10326,6 @@ func (p *PythonReservedWords) Break() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10750,7 +10337,6 @@ func (p *PythonReservedWords) Class() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10762,7 +10348,6 @@ func (p *PythonReservedWords) Continue() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10774,7 +10359,6 @@ func (p *PythonReservedWords) Def() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10786,7 +10370,6 @@ func (p *PythonReservedWords) Del() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10798,7 +10381,6 @@ func (p *PythonReservedWords) Elif() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10810,7 +10392,6 @@ func (p *PythonReservedWords) Else() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10822,7 +10403,6 @@ func (p *PythonReservedWords) Except() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10834,7 +10414,6 @@ func (p *PythonReservedWords) Finally() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10846,7 +10425,6 @@ func (p *PythonReservedWords) For() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10858,7 +10436,6 @@ func (p *PythonReservedWords) From() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10870,7 +10447,6 @@ func (p *PythonReservedWords) Global() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10882,7 +10458,6 @@ func (p *PythonReservedWords) If() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10894,7 +10469,6 @@ func (p *PythonReservedWords) Import() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10906,7 +10480,6 @@ func (p *PythonReservedWords) In() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10918,7 +10491,6 @@ func (p *PythonReservedWords) Is() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10930,7 +10502,6 @@ func (p *PythonReservedWords) Lambda() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10942,7 +10513,6 @@ func (p *PythonReservedWords) Nonlocal() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10954,7 +10524,6 @@ func (p *PythonReservedWords) Not() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10966,7 +10535,6 @@ func (p *PythonReservedWords) Or() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10978,7 +10546,6 @@ func (p *PythonReservedWords) Pass() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -10990,7 +10557,6 @@ func (p *PythonReservedWords) Raise() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11002,7 +10568,6 @@ func (p *PythonReservedWords) Return() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11014,7 +10579,6 @@ func (p *PythonReservedWords) Try() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11026,7 +10590,6 @@ func (p *PythonReservedWords) While() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11038,7 +10601,6 @@ func (p *PythonReservedWords) With() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11050,7 +10612,6 @@ func (p *PythonReservedWords) Yield() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11074,9 +10635,6 @@ func (r *ReferenceEnumFromScopedPackage) GetFoo() scopejsiicalclib.EnumFromScope r, "foo", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.EnumFromScopedModule)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.EnumFromScopedModule)(nil)).Elem(), - }, ) return returns } @@ -11111,9 +10669,6 @@ func (r *ReferenceEnumFromScopedPackage) LoadFoo() scopejsiicalclib.EnumFromScop []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.EnumFromScopedModule)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.EnumFromScopedModule)(nil)).Elem(), - }, ) return returns } @@ -11126,7 +10681,6 @@ func (r *ReferenceEnumFromScopedPackage) SaveFoo(value scopejsiicalclib.EnumFrom []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11151,9 +10705,6 @@ func (r *ReturnsPrivateImplementationOfInterface) GetPrivateImplementation() IPr r, "privateImplementation", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPrivatelyImplementedIface)(nil)).Elem(): reflect.TypeOf((*IPrivatelyImplemented)(nil)).Elem(), - }, ) return returns } @@ -11195,7 +10746,6 @@ func (r *RootStruct) GetStringProp() string { r, "stringProp", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11206,9 +10756,6 @@ func (r *RootStruct) GetNestedStruct() NestedStructIface { r, "nestedStruct", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*NestedStructIface)(nil)).Elem(): reflect.TypeOf((*NestedStruct)(nil)).Elem(), - }, ) return returns } @@ -11225,13 +10772,12 @@ type RootStructValidator struct { func RootStructValidator_Validate(struct_ RootStructIface) { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.RootStructValidator", "validate", []interface{}{struct_}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11267,7 +10813,6 @@ func (r *RuntimeTypeChecking) MethodWithDefaultedArguments(arg1 float64, arg2 st []interface{}{arg1, arg2, arg3}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11279,7 +10824,6 @@ func (r *RuntimeTypeChecking) MethodWithOptionalAnyArgument(arg interface{}) { []interface{}{arg}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11291,7 +10835,6 @@ func (r *RuntimeTypeChecking) MethodWithOptionalArguments(arg1 float64, arg2 str []interface{}{arg1, arg2, arg3}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11315,7 +10858,6 @@ func (s *SecondLevelStruct) GetDeeperRequiredProp() string { s, "deeperRequiredProp", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11326,7 +10868,6 @@ func (s *SecondLevelStruct) GetDeeperOptionalProp() string { s, "deeperOptionalProp", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11368,9 +10909,6 @@ func (s *SingleInstanceTwoTypes) Interface1() InbetweenClassIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*InbetweenClassIface)(nil)).Elem(): reflect.TypeOf((*InbetweenClass)(nil)).Elem(), - }, ) return returns } @@ -11383,9 +10921,6 @@ func (s *SingleInstanceTwoTypes) Interface2() IPublicInterfaceIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(): reflect.TypeOf((*IPublicInterface)(nil)).Elem(), - }, ) return returns } @@ -11410,7 +10945,6 @@ func (s *SingletonInt) IsSingletonInt(value float64) bool { []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11442,7 +10976,6 @@ func (s *SingletonString) IsSingletonString(value string) bool { []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11472,7 +11005,6 @@ func (s *SmellyStruct) GetProperty() string { s, "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11483,7 +11015,6 @@ func (s *SmellyStruct) GetYetAnoterOne() bool { s, "yetAnoterOne", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11513,13 +11044,12 @@ func NewSomeTypeJsii976() SomeTypeJsii976Iface { func SomeTypeJsii976_ReturnAnonymous() interface{} { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.SomeTypeJsii976", "returnAnonymous", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11527,15 +11057,12 @@ func SomeTypeJsii976_ReturnAnonymous() interface{} { func SomeTypeJsii976_ReturnReturn() IReturnJsii976Iface { _init_.Initialize() var returns IReturnJsii976Iface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.SomeTypeJsii976", "returnReturn", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IReturnJsii976Iface)(nil)).Elem(): reflect.TypeOf((*IReturnJsii976)(nil)).Elem(), - }, ) return returns } @@ -11560,7 +11087,6 @@ func (s *StableClass) GetReadonlyProperty() string { s, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11571,7 +11097,6 @@ func (s *StableClass) GetMutableProperty() float64 { s, "mutableProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11606,7 +11131,6 @@ func (s *StableClass) Method() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11633,7 +11157,6 @@ func (s *StableStruct) GetReadonlyProperty() string { s, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11653,13 +11176,12 @@ type StaticContext struct { func StaticContext_CanAccessStaticContext() bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StaticContext", "canAccessStaticContext", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11671,7 +11193,6 @@ func StaticContext_StaticVariable() bool { "jsii-calc.StaticContext", "staticVariable", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11696,13 +11217,12 @@ type StaticHelloChild struct { func StaticHelloChild_Method() { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StaticHelloChild", "method", []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11713,7 +11233,6 @@ func StaticHelloChild_Property() float64 { "jsii-calc.StaticHelloChild", "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11747,13 +11266,12 @@ func NewStaticHelloParent() StaticHelloParentIface { func StaticHelloParent_Method() { _init_.Initialize() var returns interface{} - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StaticHelloParent", "method", []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -11764,7 +11282,6 @@ func StaticHelloParent_Property() float64 { "jsii-calc.StaticHelloParent", "property", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11786,7 +11303,6 @@ func (s *Statics) GetValue() string { s, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11808,13 +11324,12 @@ func NewStatics(value string) StaticsIface { func Statics_StaticMethod(name string) string { _init_.Initialize() var returns string - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.Statics", "staticMethod", []interface{}{name}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11826,7 +11341,6 @@ func Statics_Bar() float64 { "jsii-calc.Statics", "BAR", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11838,9 +11352,6 @@ func Statics_ConstObj() DoubleTroubleIface { "jsii-calc.Statics", "ConstObj", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*DoubleTroubleIface)(nil)).Elem(): reflect.TypeOf((*DoubleTrouble)(nil)).Elem(), - }, ) return returns } @@ -11852,7 +11363,6 @@ func Statics_Foo() string { "jsii-calc.Statics", "Foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11864,9 +11374,6 @@ func Statics_ZooBar() map[string]string { "jsii-calc.Statics", "zooBar", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -11878,9 +11385,6 @@ func Statics_Instance() StaticsIface { "jsii-calc.Statics", "instance", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StaticsIface)(nil)).Elem(): reflect.TypeOf((*Statics)(nil)).Elem(), - }, ) return returns } @@ -11901,7 +11405,6 @@ func Statics_NonConstStatic() float64 { "jsii-calc.Statics", "nonConstStatic", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11923,7 +11426,6 @@ func (s *Statics) JustMethod() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -11953,7 +11455,6 @@ func (s *StripInternal) GetYouSeeMe() string { s, "youSeeMe", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12001,7 +11502,6 @@ func (s *StructA) GetRequiredString() string { s, "requiredString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12012,7 +11512,6 @@ func (s *StructA) GetOptionalNumber() float64 { s, "optionalNumber", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12023,7 +11522,6 @@ func (s *StructA) GetOptionalString() string { s, "optionalString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12050,7 +11548,6 @@ func (s *StructB) GetRequiredString() string { s, "requiredString", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12061,7 +11558,6 @@ func (s *StructB) GetOptionalBoolean() bool { s, "optionalBoolean", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12072,9 +11568,6 @@ func (s *StructB) GetOptionalStructA() StructAIface { s, "optionalStructA", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructAIface)(nil)).Elem(): reflect.TypeOf((*StructA)(nil)).Elem(), - }, ) return returns } @@ -12101,7 +11594,6 @@ func (s *StructParameterType) GetScope() string { s, "scope", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12112,7 +11604,6 @@ func (s *StructParameterType) GetProps() bool { s, "props", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12143,13 +11634,12 @@ func NewStructPassing() StructPassingIface { func StructPassing_HowManyVarArgsDidIPass(_positional float64, inputs TopLevelStructIface) float64 { _init_.Initialize() var returns float64 - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StructPassing", "howManyVarArgsDidIPass", []interface{}{_positional, inputs}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12157,15 +11647,12 @@ func StructPassing_HowManyVarArgsDidIPass(_positional float64, inputs TopLevelSt func StructPassing_RoundTrip(_positional float64, input TopLevelStructIface) TopLevelStructIface { _init_.Initialize() var returns TopLevelStructIface - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StructPassing", "roundTrip", []interface{}{_positional, input}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*TopLevelStructIface)(nil)).Elem(): reflect.TypeOf((*TopLevelStruct)(nil)).Elem(), - }, ) return returns } @@ -12181,13 +11668,12 @@ type StructUnionConsumer struct { func StructUnionConsumer_IsStructA(struct_ interface{}) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StructUnionConsumer", "isStructA", []interface{}{struct_}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12195,13 +11681,12 @@ func StructUnionConsumer_IsStructA(struct_ interface{}) bool { func StructUnionConsumer_IsStructB(struct_ interface{}) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.StructUnionConsumer", "isStructB", []interface{}{struct_}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12228,7 +11713,6 @@ func (s *StructWithJavaReservedWords) GetDefault() string { s, "default", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12239,7 +11723,6 @@ func (s *StructWithJavaReservedWords) GetAssert() string { s, "assert", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12250,7 +11733,6 @@ func (s *StructWithJavaReservedWords) GetResult() string { s, "result", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12261,7 +11743,6 @@ func (s *StructWithJavaReservedWords) GetThat() string { s, "that", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12308,7 +11789,6 @@ func (s *Sum) GetValue() float64 { s, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12319,9 +11799,6 @@ func (s *Sum) GetExpression() scopejsiicalclib.NumericValueIface { s, "expression", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -12332,9 +11809,6 @@ func (s *Sum) GetDecorationPostfixes() []string { s, "decorationPostfixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -12345,9 +11819,6 @@ func (s *Sum) GetDecorationPrefixes() []string { s, "decorationPrefixes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -12358,9 +11829,6 @@ func (s *Sum) GetStringStyle() composition.CompositionStringStyle { s, "stringStyle", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(): reflect.TypeOf((*composition.CompositionStringStyle)(nil)).Elem(), - }, ) return returns } @@ -12371,9 +11839,6 @@ func (s *Sum) GetParts() []scopejsiicalclib.NumericValueIface { s, "parts", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -12432,7 +11897,6 @@ func (s *Sum) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12445,7 +11909,6 @@ func (s *Sum) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12473,7 +11936,6 @@ func (s *SupportsNiceJavaBuilder) GetBar() float64 { s, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12484,7 +11946,6 @@ func (s *SupportsNiceJavaBuilder) GetId() float64 { s, "id", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12495,7 +11956,6 @@ func (s *SupportsNiceJavaBuilder) GetPropId() string { s, "propId", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12506,9 +11966,6 @@ func (s *SupportsNiceJavaBuilder) GetRest() []string { s, "rest", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*string)(nil)).Elem(): reflect.TypeOf((*string)(nil)).Elem(), - }, ) return returns } @@ -12549,7 +12006,6 @@ func (s *SupportsNiceJavaBuilderProps) GetBar() float64 { s, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12560,7 +12016,6 @@ func (s *SupportsNiceJavaBuilderProps) GetId() string { s, "id", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12588,7 +12043,6 @@ func (s *SupportsNiceJavaBuilderWithRequiredProps) GetBar() float64 { s, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12599,7 +12053,6 @@ func (s *SupportsNiceJavaBuilderWithRequiredProps) GetId() float64 { s, "id", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12610,7 +12063,6 @@ func (s *SupportsNiceJavaBuilderWithRequiredProps) GetPropId() string { s, "propId", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12670,7 +12122,6 @@ func (s *SyncVirtualMethods) GetReadonlyProperty() string { s, "readonlyProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12681,7 +12132,6 @@ func (s *SyncVirtualMethods) GetA() float64 { s, "a", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12692,7 +12142,6 @@ func (s *SyncVirtualMethods) GetCallerIsProperty() float64 { s, "callerIsProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12703,7 +12152,6 @@ func (s *SyncVirtualMethods) GetOtherProperty() string { s, "otherProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12714,7 +12162,6 @@ func (s *SyncVirtualMethods) GetTheProperty() string { s, "theProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12725,7 +12172,6 @@ func (s *SyncVirtualMethods) GetValueOfOtherProperty() string { s, "valueOfOtherProperty", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12792,7 +12238,6 @@ func (s *SyncVirtualMethods) CallerIsAsync() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12805,7 +12250,6 @@ func (s *SyncVirtualMethods) CallerIsMethod() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12818,7 +12262,6 @@ func (s *SyncVirtualMethods) ModifyOtherProperty(value string) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -12830,7 +12273,6 @@ func (s *SyncVirtualMethods) ModifyValueOfTheProperty(value string) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -12842,7 +12284,6 @@ func (s *SyncVirtualMethods) ReadA() float64 { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12855,7 +12296,6 @@ func (s *SyncVirtualMethods) RetrieveOtherProperty() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12868,7 +12308,6 @@ func (s *SyncVirtualMethods) RetrieveReadOnlyProperty() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12881,7 +12320,6 @@ func (s *SyncVirtualMethods) RetrieveValueOfTheProperty() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12894,7 +12332,6 @@ func (s *SyncVirtualMethods) VirtualMethod(n float64) float64 { []interface{}{n}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12907,7 +12344,6 @@ func (s *SyncVirtualMethods) WriteA(value float64) { []interface{}{value}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -12941,7 +12377,6 @@ func (t *Thrower) ThrowError() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -12968,7 +12403,6 @@ func (t *TopLevelStruct) GetRequired() string { t, "required", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12979,7 +12413,6 @@ func (t *TopLevelStruct) GetSecondLevel() interface{} { t, "secondLevel", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -12990,7 +12423,6 @@ func (t *TopLevelStruct) GetOptional() string { t, "optional", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13010,13 +12442,12 @@ type UmaskCheck struct { func UmaskCheck_Mode() float64 { _init_.Initialize() var returns float64 - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.UmaskCheck", "mode", []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13044,7 +12475,6 @@ func (u *UnaryOperation) GetValue() float64 { u, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13055,9 +12485,6 @@ func (u *UnaryOperation) GetOperand() scopejsiicalclib.NumericValueIface { u, "operand", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalclib.NumericValueIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalclib.NumericValue)(nil)).Elem(), - }, ) return returns } @@ -13084,7 +12511,6 @@ func (u *UnaryOperation) TypeName() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13097,7 +12523,6 @@ func (u *UnaryOperation) ToString() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13120,7 +12545,6 @@ func (u *UnionProperties) GetBar() interface{} { u, "bar", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13131,7 +12555,6 @@ func (u *UnionProperties) GetFoo() interface{} { u, "foo", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13155,9 +12578,6 @@ func (u *UpcasingReflectable) GetEntries() []submodule.ReflectableEntryIface { u, "entries", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*submodule.ReflectableEntryIface)(nil)).Elem(): reflect.TypeOf((*submodule.ReflectableEntry)(nil)).Elem(), - }, ) return returns } @@ -13183,9 +12603,6 @@ func UpcasingReflectable_Reflector() submodule.ReflectorIface { "jsii-calc.UpcasingReflectable", "reflector", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*submodule.ReflectorIface)(nil)).Elem(): reflect.TypeOf((*submodule.Reflector)(nil)).Elem(), - }, ) return returns } @@ -13220,7 +12637,6 @@ func (u *UseBundledDependency) Value() interface{} { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13256,9 +12672,6 @@ func (u *UseCalcBase) Hello() scopejsiicalcbase.BaseIface { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*scopejsiicalcbase.BaseIface)(nil)).Elem(): reflect.TypeOf((*scopejsiicalcbase.Base)(nil)).Elem(), - }, ) return returns } @@ -13282,9 +12695,6 @@ func (u *UsesInterfaceWithProperties) GetObj() IInterfaceWithPropertiesIface { u, "obj", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*IInterfaceWithPropertiesIface)(nil)).Elem(): reflect.TypeOf((*IInterfaceWithProperties)(nil)).Elem(), - }, ) return returns } @@ -13311,7 +12721,6 @@ func (u *UsesInterfaceWithProperties) JustRead() string { []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13324,7 +12733,6 @@ func (u *UsesInterfaceWithProperties) ReadStringAndNumber(ext IInterfaceWithProp []interface{}{ext}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13337,7 +12745,6 @@ func (u *UsesInterfaceWithProperties) WriteAndRead(value string) string { []interface{}{value}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13372,9 +12779,6 @@ func (v *VariadicInvoker) AsArray(values float64) []float64 { []interface{}{values}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*float64)(nil)).Elem(): reflect.TypeOf((*float64)(nil)).Elem(), - }, ) return returns } @@ -13409,9 +12813,6 @@ func (v *VariadicMethod) AsArray(first float64, others float64) []float64 { []interface{}{first, others}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*float64)(nil)).Elem(): reflect.TypeOf((*float64)(nil)).Elem(), - }, ) return returns } @@ -13450,7 +12851,6 @@ func (v *VirtualMethodPlayground) OverrideMeAsync(index float64) float64 { []interface{}{index}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13463,7 +12863,6 @@ func (v *VirtualMethodPlayground) OverrideMeSync(index float64) float64 { []interface{}{index}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13476,7 +12875,6 @@ func (v *VirtualMethodPlayground) ParallelSumAsync(count float64) float64 { []interface{}{count}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13489,7 +12887,6 @@ func (v *VirtualMethodPlayground) SerialSumAsync(count float64) float64 { []interface{}{count}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13502,7 +12899,6 @@ func (v *VirtualMethodPlayground) SumSync(count float64) float64 { []interface{}{count}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13530,7 +12926,6 @@ func (v *VoidCallback) GetMethodWasCalled() bool { v, "methodWasCalled", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13557,7 +12952,6 @@ func (v *VoidCallback) CallMe() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -13569,7 +12963,6 @@ func (v *VoidCallback) OverrideMe() { []interface{}{}, false, &returns, - map[reflect.Type]reflect.Type{}, ) } @@ -13590,7 +12983,6 @@ func (w *WithPrivatePropertyInConstructor) GetSuccess() bool { w, "success", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13610,6 +13002,1049 @@ func NewWithPrivatePropertyInConstructor(privateField string) WithPrivatePropert } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/jsiicalc.init.go 1`] = ` +package jsiicalc + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.AbstractClass", + reflect.TypeOf((*AbstractClass)(nil)).Elem(), + reflect.TypeOf((*AbstractClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AbstractClassBase", + reflect.TypeOf((*AbstractClassBase)(nil)).Elem(), + reflect.TypeOf((*AbstractClassBaseIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AbstractClassReturner", + reflect.TypeOf((*AbstractClassReturner)(nil)).Elem(), + reflect.TypeOf((*AbstractClassReturnerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AbstractSuite", + reflect.TypeOf((*AbstractSuite)(nil)).Elem(), + reflect.TypeOf((*AbstractSuiteIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Add", + reflect.TypeOf((*Add)(nil)).Elem(), + reflect.TypeOf((*AddIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AllTypes", + reflect.TypeOf((*AllTypes)(nil)).Elem(), + reflect.TypeOf((*AllTypesIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.AllTypesEnum", + reflect.TypeOf((*AllTypesEnum)(nil)).Elem(), + map[string]interface{}{ + "MY_ENUM_VALUE": AllTypesEnumMyEnumValue, + "YOUR_ENUM_VALUE": AllTypesEnumYourEnumValue, + "THIS_IS_GREAT": AllTypesEnumThisIsGreat, + }, + ) + _jsii_.RegisterClass( + "jsii-calc.AllowedMethodNames", + reflect.TypeOf((*AllowedMethodNames)(nil)).Elem(), + reflect.TypeOf((*AllowedMethodNamesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AmbiguousParameters", + reflect.TypeOf((*AmbiguousParameters)(nil)).Elem(), + reflect.TypeOf((*AmbiguousParametersIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AnonymousImplementationProvider", + reflect.TypeOf((*AnonymousImplementationProvider)(nil)).Elem(), + reflect.TypeOf((*AnonymousImplementationProviderIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AsyncVirtualMethods", + reflect.TypeOf((*AsyncVirtualMethods)(nil)).Elem(), + reflect.TypeOf((*AsyncVirtualMethodsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.AugmentableClass", + reflect.TypeOf((*AugmentableClass)(nil)).Elem(), + reflect.TypeOf((*AugmentableClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.BaseJsii976", + reflect.TypeOf((*BaseJsii976)(nil)).Elem(), + reflect.TypeOf((*BaseJsii976Iface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Bell", + reflect.TypeOf((*Bell)(nil)).Elem(), + reflect.TypeOf((*BellIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.BinaryOperation", + reflect.TypeOf((*BinaryOperation)(nil)).Elem(), + reflect.TypeOf((*BinaryOperationIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.BurriedAnonymousObject", + reflect.TypeOf((*BurriedAnonymousObject)(nil)).Elem(), + reflect.TypeOf((*BurriedAnonymousObjectIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Calculator", + reflect.TypeOf((*Calculator)(nil)).Elem(), + reflect.TypeOf((*CalculatorIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.CalculatorProps", + reflect.TypeOf((*CalculatorProps)(nil)).Elem(), + reflect.TypeOf((*CalculatorPropsIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.ChildStruct982", + reflect.TypeOf((*ChildStruct982)(nil)).Elem(), + reflect.TypeOf((*ChildStruct982Iface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassThatImplementsTheInternalInterface", + reflect.TypeOf((*ClassThatImplementsTheInternalInterface)(nil)).Elem(), + reflect.TypeOf((*ClassThatImplementsTheInternalInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassThatImplementsThePrivateInterface", + reflect.TypeOf((*ClassThatImplementsThePrivateInterface)(nil)).Elem(), + reflect.TypeOf((*ClassThatImplementsThePrivateInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassWithCollections", + reflect.TypeOf((*ClassWithCollections)(nil)).Elem(), + reflect.TypeOf((*ClassWithCollectionsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassWithDocs", + reflect.TypeOf((*ClassWithDocs)(nil)).Elem(), + reflect.TypeOf((*ClassWithDocsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassWithJavaReservedWords", + reflect.TypeOf((*ClassWithJavaReservedWords)(nil)).Elem(), + reflect.TypeOf((*ClassWithJavaReservedWordsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassWithMutableObjectLiteralProperty", + reflect.TypeOf((*ClassWithMutableObjectLiteralProperty)(nil)).Elem(), + reflect.TypeOf((*ClassWithMutableObjectLiteralPropertyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties", + reflect.TypeOf((*ClassWithPrivateConstructorAndAutomaticProperties)(nil)).Elem(), + reflect.TypeOf((*ClassWithPrivateConstructorAndAutomaticPropertiesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ConfusingToJackson", + reflect.TypeOf((*ConfusingToJackson)(nil)).Elem(), + reflect.TypeOf((*ConfusingToJacksonIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.ConfusingToJacksonStruct", + reflect.TypeOf((*ConfusingToJacksonStruct)(nil)).Elem(), + reflect.TypeOf((*ConfusingToJacksonStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ConstructorPassesThisOut", + reflect.TypeOf((*ConstructorPassesThisOut)(nil)).Elem(), + reflect.TypeOf((*ConstructorPassesThisOutIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Constructors", + reflect.TypeOf((*Constructors)(nil)).Elem(), + reflect.TypeOf((*ConstructorsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ConsumePureInterface", + reflect.TypeOf((*ConsumePureInterface)(nil)).Elem(), + reflect.TypeOf((*ConsumePureInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ConsumerCanRingBell", + reflect.TypeOf((*ConsumerCanRingBell)(nil)).Elem(), + reflect.TypeOf((*ConsumerCanRingBellIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ConsumersOfThisCrazyTypeSystem", + reflect.TypeOf((*ConsumersOfThisCrazyTypeSystem)(nil)).Elem(), + reflect.TypeOf((*ConsumersOfThisCrazyTypeSystemIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DataRenderer", + reflect.TypeOf((*DataRenderer)(nil)).Elem(), + reflect.TypeOf((*DataRendererIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DefaultedConstructorArgument", + reflect.TypeOf((*DefaultedConstructorArgument)(nil)).Elem(), + reflect.TypeOf((*DefaultedConstructorArgumentIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Demonstrate982", + reflect.TypeOf((*Demonstrate982)(nil)).Elem(), + reflect.TypeOf((*Demonstrate982Iface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DeprecatedClass", + reflect.TypeOf((*DeprecatedClass)(nil)).Elem(), + reflect.TypeOf((*DeprecatedClassIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.DeprecatedEnum", + reflect.TypeOf((*DeprecatedEnum)(nil)).Elem(), + map[string]interface{}{ + "OPTION_A": DeprecatedEnumOptionA, + "OPTION_B": DeprecatedEnumOptionB, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.DeprecatedStruct", + reflect.TypeOf((*DeprecatedStruct)(nil)).Elem(), + reflect.TypeOf((*DeprecatedStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.DerivedStruct", + reflect.TypeOf((*DerivedStruct)(nil)).Elem(), + reflect.TypeOf((*DerivedStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.DiamondInheritanceBaseLevelStruct", + reflect.TypeOf((*DiamondInheritanceBaseLevelStruct)(nil)).Elem(), + reflect.TypeOf((*DiamondInheritanceBaseLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.DiamondInheritanceFirstMidLevelStruct", + reflect.TypeOf((*DiamondInheritanceFirstMidLevelStruct)(nil)).Elem(), + reflect.TypeOf((*DiamondInheritanceFirstMidLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.DiamondInheritanceSecondMidLevelStruct", + reflect.TypeOf((*DiamondInheritanceSecondMidLevelStruct)(nil)).Elem(), + reflect.TypeOf((*DiamondInheritanceSecondMidLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.DiamondInheritanceTopLevelStruct", + reflect.TypeOf((*DiamondInheritanceTopLevelStruct)(nil)).Elem(), + reflect.TypeOf((*DiamondInheritanceTopLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DisappointingCollectionSource", + reflect.TypeOf((*DisappointingCollectionSource)(nil)).Elem(), + reflect.TypeOf((*DisappointingCollectionSourceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DoNotOverridePrivates", + reflect.TypeOf((*DoNotOverridePrivates)(nil)).Elem(), + reflect.TypeOf((*DoNotOverridePrivatesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DoNotRecognizeAnyAsOptional", + reflect.TypeOf((*DoNotRecognizeAnyAsOptional)(nil)).Elem(), + reflect.TypeOf((*DoNotRecognizeAnyAsOptionalIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DocumentedClass", + reflect.TypeOf((*DocumentedClass)(nil)).Elem(), + reflect.TypeOf((*DocumentedClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DontComplainAboutVariadicAfterOptional", + reflect.TypeOf((*DontComplainAboutVariadicAfterOptional)(nil)).Elem(), + reflect.TypeOf((*DontComplainAboutVariadicAfterOptionalIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DoubleTrouble", + reflect.TypeOf((*DoubleTrouble)(nil)).Elem(), + reflect.TypeOf((*DoubleTroubleIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DynamicPropertyBearer", + reflect.TypeOf((*DynamicPropertyBearer)(nil)).Elem(), + reflect.TypeOf((*DynamicPropertyBearerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.DynamicPropertyBearerChild", + reflect.TypeOf((*DynamicPropertyBearerChild)(nil)).Elem(), + reflect.TypeOf((*DynamicPropertyBearerChildIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Entropy", + reflect.TypeOf((*Entropy)(nil)).Elem(), + reflect.TypeOf((*EntropyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.EnumDispenser", + reflect.TypeOf((*EnumDispenser)(nil)).Elem(), + reflect.TypeOf((*EnumDispenserIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.EraseUndefinedHashValues", + reflect.TypeOf((*EraseUndefinedHashValues)(nil)).Elem(), + reflect.TypeOf((*EraseUndefinedHashValuesIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.EraseUndefinedHashValuesOptions", + reflect.TypeOf((*EraseUndefinedHashValuesOptions)(nil)).Elem(), + reflect.TypeOf((*EraseUndefinedHashValuesOptionsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ExperimentalClass", + reflect.TypeOf((*ExperimentalClass)(nil)).Elem(), + reflect.TypeOf((*ExperimentalClassIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.ExperimentalEnum", + reflect.TypeOf((*ExperimentalEnum)(nil)).Elem(), + map[string]interface{}{ + "OPTION_A": ExperimentalEnumOptionA, + "OPTION_B": ExperimentalEnumOptionB, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.ExperimentalStruct", + reflect.TypeOf((*ExperimentalStruct)(nil)).Elem(), + reflect.TypeOf((*ExperimentalStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ExportedBaseClass", + reflect.TypeOf((*ExportedBaseClass)(nil)).Elem(), + reflect.TypeOf((*ExportedBaseClassIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.ExtendsInternalInterface", + reflect.TypeOf((*ExtendsInternalInterface)(nil)).Elem(), + reflect.TypeOf((*ExtendsInternalInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ExternalClass", + reflect.TypeOf((*ExternalClass)(nil)).Elem(), + reflect.TypeOf((*ExternalClassIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.ExternalEnum", + reflect.TypeOf((*ExternalEnum)(nil)).Elem(), + map[string]interface{}{ + "OPTION_A": ExternalEnumOptionA, + "OPTION_B": ExternalEnumOptionB, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.ExternalStruct", + reflect.TypeOf((*ExternalStruct)(nil)).Elem(), + reflect.TypeOf((*ExternalStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.GiveMeStructs", + reflect.TypeOf((*GiveMeStructs)(nil)).Elem(), + reflect.TypeOf((*GiveMeStructsIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.Greetee", + reflect.TypeOf((*Greetee)(nil)).Elem(), + reflect.TypeOf((*GreeteeIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.GreetingAugmenter", + reflect.TypeOf((*GreetingAugmenter)(nil)).Elem(), + reflect.TypeOf((*GreetingAugmenterIface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IAnonymousImplementationProvider", + reflect.TypeOf((*IAnonymousImplementationProviderIface)(nil)).Elem(), + reflect.TypeOf((*IAnonymousImplementationProvider)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IAnonymouslyImplementMe", + reflect.TypeOf((*IAnonymouslyImplementMeIface)(nil)).Elem(), + reflect.TypeOf((*IAnonymouslyImplementMe)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IAnotherPublicInterface", + reflect.TypeOf((*IAnotherPublicInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IAnotherPublicInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IBell", + reflect.TypeOf((*IBellIface)(nil)).Elem(), + reflect.TypeOf((*IBell)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IBellRinger", + reflect.TypeOf((*IBellRingerIface)(nil)).Elem(), + reflect.TypeOf((*IBellRinger)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IConcreteBellRinger", + reflect.TypeOf((*IConcreteBellRingerIface)(nil)).Elem(), + reflect.TypeOf((*IConcreteBellRinger)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IDeprecatedInterface", + reflect.TypeOf((*IDeprecatedInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IDeprecatedInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IExperimentalInterface", + reflect.TypeOf((*IExperimentalInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IExperimentalInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IExtendsPrivateInterface", + reflect.TypeOf((*IExtendsPrivateInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IExtendsPrivateInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IExternalInterface", + reflect.TypeOf((*IExternalInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IExternalInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IFriendlier", + reflect.TypeOf((*IFriendlierIface)(nil)).Elem(), + reflect.TypeOf((*IFriendlier)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IFriendlyRandomGenerator", + reflect.TypeOf((*IFriendlyRandomGeneratorIface)(nil)).Elem(), + reflect.TypeOf((*IFriendlyRandomGenerator)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceImplementedByAbstractClass", + reflect.TypeOf((*IInterfaceImplementedByAbstractClassIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceImplementedByAbstractClass)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceThatShouldNotBeADataType", + reflect.TypeOf((*IInterfaceThatShouldNotBeADataTypeIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceThatShouldNotBeADataType)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceWithInternal", + reflect.TypeOf((*IInterfaceWithInternalIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithInternal)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceWithMethods", + reflect.TypeOf((*IInterfaceWithMethodsIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithMethods)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceWithOptionalMethodArguments", + reflect.TypeOf((*IInterfaceWithOptionalMethodArgumentsIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithOptionalMethodArguments)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceWithProperties", + reflect.TypeOf((*IInterfaceWithPropertiesIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithProperties)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IInterfaceWithPropertiesExtension", + reflect.TypeOf((*IInterfaceWithPropertiesExtensionIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithPropertiesExtension)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IJSII417Derived", + reflect.TypeOf((*Ijsii417DerivedIface)(nil)).Elem(), + reflect.TypeOf((*Ijsii417Derived)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IJSII417PublicBaseOfBase", + reflect.TypeOf((*Ijsii417PublicBaseOfBaseIface)(nil)).Elem(), + reflect.TypeOf((*Ijsii417PublicBaseOfBase)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IJsii487External", + reflect.TypeOf((*IJsii487ExternalIface)(nil)).Elem(), + reflect.TypeOf((*IJsii487External)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IJsii487External2", + reflect.TypeOf((*IJsii487External2Iface)(nil)).Elem(), + reflect.TypeOf((*IJsii487External2)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IJsii496", + reflect.TypeOf((*IJsii496Iface)(nil)).Elem(), + reflect.TypeOf((*IJsii496)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IMutableObjectLiteral", + reflect.TypeOf((*IMutableObjectLiteralIface)(nil)).Elem(), + reflect.TypeOf((*IMutableObjectLiteral)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.INonInternalInterface", + reflect.TypeOf((*INonInternalInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*INonInternalInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IObjectWithProperty", + reflect.TypeOf((*IObjectWithPropertyIface)(nil)).Elem(), + reflect.TypeOf((*IObjectWithProperty)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IOptionalMethod", + reflect.TypeOf((*IOptionalMethodIface)(nil)).Elem(), + reflect.TypeOf((*IOptionalMethod)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IPrivatelyImplemented", + reflect.TypeOf((*IPrivatelyImplementedIface)(nil)).Elem(), + reflect.TypeOf((*IPrivatelyImplemented)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IPublicInterface", + reflect.TypeOf((*IPublicInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IPublicInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IPublicInterface2", + reflect.TypeOf((*IPublicInterface2Iface)(nil)).Elem(), + reflect.TypeOf((*IPublicInterface2)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IRandomNumberGenerator", + reflect.TypeOf((*IRandomNumberGeneratorIface)(nil)).Elem(), + reflect.TypeOf((*IRandomNumberGenerator)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IReturnJsii976", + reflect.TypeOf((*IReturnJsii976Iface)(nil)).Elem(), + reflect.TypeOf((*IReturnJsii976)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IReturnsNumber", + reflect.TypeOf((*IReturnsNumberIface)(nil)).Elem(), + reflect.TypeOf((*IReturnsNumber)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IStableInterface", + reflect.TypeOf((*IStableInterfaceIface)(nil)).Elem(), + reflect.TypeOf((*IStableInterface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IStructReturningDelegate", + reflect.TypeOf((*IStructReturningDelegateIface)(nil)).Elem(), + reflect.TypeOf((*IStructReturningDelegate)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.IWallClock", + reflect.TypeOf((*IWallClockIface)(nil)).Elem(), + reflect.TypeOf((*IWallClock)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ImplementInternalInterface", + reflect.TypeOf((*ImplementInternalInterface)(nil)).Elem(), + reflect.TypeOf((*ImplementInternalInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Implementation", + reflect.TypeOf((*Implementation)(nil)).Elem(), + reflect.TypeOf((*ImplementationIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ImplementsInterfaceWithInternal", + reflect.TypeOf((*ImplementsInterfaceWithInternal)(nil)).Elem(), + reflect.TypeOf((*ImplementsInterfaceWithInternalIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ImplementsInterfaceWithInternalSubclass", + reflect.TypeOf((*ImplementsInterfaceWithInternalSubclass)(nil)).Elem(), + reflect.TypeOf((*ImplementsInterfaceWithInternalSubclassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ImplementsPrivateInterface", + reflect.TypeOf((*ImplementsPrivateInterface)(nil)).Elem(), + reflect.TypeOf((*ImplementsPrivateInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.ImplictBaseOfBase", + reflect.TypeOf((*ImplictBaseOfBase)(nil)).Elem(), + reflect.TypeOf((*ImplictBaseOfBaseIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.InbetweenClass", + reflect.TypeOf((*InbetweenClass)(nil)).Elem(), + reflect.TypeOf((*InbetweenClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.InterfaceCollections", + reflect.TypeOf((*InterfaceCollections)(nil)).Elem(), + reflect.TypeOf((*InterfaceCollectionsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.InterfacesMaker", + reflect.TypeOf((*InterfacesMaker)(nil)).Elem(), + reflect.TypeOf((*InterfacesMakerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Isomorphism", + reflect.TypeOf((*Isomorphism)(nil)).Elem(), + reflect.TypeOf((*IsomorphismIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JSII417Derived", + reflect.TypeOf((*Jsii417Derived)(nil)).Elem(), + reflect.TypeOf((*Jsii417DerivedIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JSII417PublicBaseOfBase", + reflect.TypeOf((*Jsii417PublicBaseOfBase)(nil)).Elem(), + reflect.TypeOf((*Jsii417PublicBaseOfBaseIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JSObjectLiteralForInterface", + reflect.TypeOf((*JsObjectLiteralForInterface)(nil)).Elem(), + reflect.TypeOf((*JsObjectLiteralForInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JSObjectLiteralToNative", + reflect.TypeOf((*JsObjectLiteralToNative)(nil)).Elem(), + reflect.TypeOf((*JsObjectLiteralToNativeIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JSObjectLiteralToNativeClass", + reflect.TypeOf((*JsObjectLiteralToNativeClass)(nil)).Elem(), + reflect.TypeOf((*JsObjectLiteralToNativeClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JavaReservedWords", + reflect.TypeOf((*JavaReservedWords)(nil)).Elem(), + reflect.TypeOf((*JavaReservedWordsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Jsii487Derived", + reflect.TypeOf((*Jsii487Derived)(nil)).Elem(), + reflect.TypeOf((*Jsii487DerivedIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Jsii496Derived", + reflect.TypeOf((*Jsii496Derived)(nil)).Elem(), + reflect.TypeOf((*Jsii496DerivedIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JsiiAgent", + reflect.TypeOf((*JsiiAgent)(nil)).Elem(), + reflect.TypeOf((*JsiiAgentIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.JsonFormatter", + reflect.TypeOf((*JsonFormatter)(nil)).Elem(), + reflect.TypeOf((*JsonFormatterIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.LevelOne", + reflect.TypeOf((*LevelOne)(nil)).Elem(), + reflect.TypeOf((*LevelOneIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.LevelOne.PropBooleanValue", + reflect.TypeOf((*PropBooleanValue)(nil)).Elem(), + reflect.TypeOf((*PropBooleanValueIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.LevelOne.PropProperty", + reflect.TypeOf((*PropProperty)(nil)).Elem(), + reflect.TypeOf((*PropPropertyIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.LevelOneProps", + reflect.TypeOf((*LevelOneProps)(nil)).Elem(), + reflect.TypeOf((*LevelOnePropsIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.LoadBalancedFargateServiceProps", + reflect.TypeOf((*LoadBalancedFargateServiceProps)(nil)).Elem(), + reflect.TypeOf((*LoadBalancedFargateServicePropsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.MethodNamedProperty", + reflect.TypeOf((*MethodNamedProperty)(nil)).Elem(), + reflect.TypeOf((*MethodNamedPropertyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Multiply", + reflect.TypeOf((*Multiply)(nil)).Elem(), + reflect.TypeOf((*MultiplyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Negate", + reflect.TypeOf((*Negate)(nil)).Elem(), + reflect.TypeOf((*NegateIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.NestedClassInstance", + reflect.TypeOf((*NestedClassInstance)(nil)).Elem(), + reflect.TypeOf((*NestedClassInstanceIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.NestedStruct", + reflect.TypeOf((*NestedStruct)(nil)).Elem(), + reflect.TypeOf((*NestedStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.NodeStandardLibrary", + reflect.TypeOf((*NodeStandardLibrary)(nil)).Elem(), + reflect.TypeOf((*NodeStandardLibraryIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.NullShouldBeTreatedAsUndefined", + reflect.TypeOf((*NullShouldBeTreatedAsUndefined)(nil)).Elem(), + reflect.TypeOf((*NullShouldBeTreatedAsUndefinedIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.NullShouldBeTreatedAsUndefinedData", + reflect.TypeOf((*NullShouldBeTreatedAsUndefinedData)(nil)).Elem(), + reflect.TypeOf((*NullShouldBeTreatedAsUndefinedDataIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.NumberGenerator", + reflect.TypeOf((*NumberGenerator)(nil)).Elem(), + reflect.TypeOf((*NumberGeneratorIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ObjectRefsInCollections", + reflect.TypeOf((*ObjectRefsInCollections)(nil)).Elem(), + reflect.TypeOf((*ObjectRefsInCollectionsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ObjectWithPropertyProvider", + reflect.TypeOf((*ObjectWithPropertyProvider)(nil)).Elem(), + reflect.TypeOf((*ObjectWithPropertyProviderIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Old", + reflect.TypeOf((*Old)(nil)).Elem(), + reflect.TypeOf((*OldIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.OptionalArgumentInvoker", + reflect.TypeOf((*OptionalArgumentInvoker)(nil)).Elem(), + reflect.TypeOf((*OptionalArgumentInvokerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.OptionalConstructorArgument", + reflect.TypeOf((*OptionalConstructorArgument)(nil)).Elem(), + reflect.TypeOf((*OptionalConstructorArgumentIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.OptionalStruct", + reflect.TypeOf((*OptionalStruct)(nil)).Elem(), + reflect.TypeOf((*OptionalStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.OptionalStructConsumer", + reflect.TypeOf((*OptionalStructConsumer)(nil)).Elem(), + reflect.TypeOf((*OptionalStructConsumerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.OverridableProtectedMember", + reflect.TypeOf((*OverridableProtectedMember)(nil)).Elem(), + reflect.TypeOf((*OverridableProtectedMemberIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.OverrideReturnsObject", + reflect.TypeOf((*OverrideReturnsObject)(nil)).Elem(), + reflect.TypeOf((*OverrideReturnsObjectIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.ParentStruct982", + reflect.TypeOf((*ParentStruct982)(nil)).Elem(), + reflect.TypeOf((*ParentStruct982Iface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.PartiallyInitializedThisConsumer", + reflect.TypeOf((*PartiallyInitializedThisConsumer)(nil)).Elem(), + reflect.TypeOf((*PartiallyInitializedThisConsumerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Polymorphism", + reflect.TypeOf((*Polymorphism)(nil)).Elem(), + reflect.TypeOf((*PolymorphismIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Power", + reflect.TypeOf((*Power)(nil)).Elem(), + reflect.TypeOf((*PowerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.PropertyNamedProperty", + reflect.TypeOf((*PropertyNamedProperty)(nil)).Elem(), + reflect.TypeOf((*PropertyNamedPropertyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.PublicClass", + reflect.TypeOf((*PublicClass)(nil)).Elem(), + reflect.TypeOf((*PublicClassIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.PythonReservedWords", + reflect.TypeOf((*PythonReservedWords)(nil)).Elem(), + reflect.TypeOf((*PythonReservedWordsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ReferenceEnumFromScopedPackage", + reflect.TypeOf((*ReferenceEnumFromScopedPackage)(nil)).Elem(), + reflect.TypeOf((*ReferenceEnumFromScopedPackageIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.ReturnsPrivateImplementationOfInterface", + reflect.TypeOf((*ReturnsPrivateImplementationOfInterface)(nil)).Elem(), + reflect.TypeOf((*ReturnsPrivateImplementationOfInterfaceIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.RootStruct", + reflect.TypeOf((*RootStruct)(nil)).Elem(), + reflect.TypeOf((*RootStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.RootStructValidator", + reflect.TypeOf((*RootStructValidator)(nil)).Elem(), + reflect.TypeOf((*RootStructValidatorIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.RuntimeTypeChecking", + reflect.TypeOf((*RuntimeTypeChecking)(nil)).Elem(), + reflect.TypeOf((*RuntimeTypeCheckingIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.SecondLevelStruct", + reflect.TypeOf((*SecondLevelStruct)(nil)).Elem(), + reflect.TypeOf((*SecondLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SingleInstanceTwoTypes", + reflect.TypeOf((*SingleInstanceTwoTypes)(nil)).Elem(), + reflect.TypeOf((*SingleInstanceTwoTypesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SingletonInt", + reflect.TypeOf((*SingletonInt)(nil)).Elem(), + reflect.TypeOf((*SingletonIntIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.SingletonIntEnum", + reflect.TypeOf((*SingletonIntEnum)(nil)).Elem(), + map[string]interface{}{ + "SINGLETON_INT": SingletonIntEnumSingletonInt, + }, + ) + _jsii_.RegisterClass( + "jsii-calc.SingletonString", + reflect.TypeOf((*SingletonString)(nil)).Elem(), + reflect.TypeOf((*SingletonStringIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.SingletonStringEnum", + reflect.TypeOf((*SingletonStringEnum)(nil)).Elem(), + map[string]interface{}{ + "SINGLETON_STRING": SingletonStringEnumSingletonString, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.SmellyStruct", + reflect.TypeOf((*SmellyStruct)(nil)).Elem(), + reflect.TypeOf((*SmellyStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SomeTypeJsii976", + reflect.TypeOf((*SomeTypeJsii976)(nil)).Elem(), + reflect.TypeOf((*SomeTypeJsii976Iface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StableClass", + reflect.TypeOf((*StableClass)(nil)).Elem(), + reflect.TypeOf((*StableClassIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.StableEnum", + reflect.TypeOf((*StableEnum)(nil)).Elem(), + map[string]interface{}{ + "OPTION_A": StableEnumOptionA, + "OPTION_B": StableEnumOptionB, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.StableStruct", + reflect.TypeOf((*StableStruct)(nil)).Elem(), + reflect.TypeOf((*StableStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StaticContext", + reflect.TypeOf((*StaticContext)(nil)).Elem(), + reflect.TypeOf((*StaticContextIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StaticHelloChild", + reflect.TypeOf((*StaticHelloChild)(nil)).Elem(), + reflect.TypeOf((*StaticHelloChildIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StaticHelloParent", + reflect.TypeOf((*StaticHelloParent)(nil)).Elem(), + reflect.TypeOf((*StaticHelloParentIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Statics", + reflect.TypeOf((*Statics)(nil)).Elem(), + reflect.TypeOf((*StaticsIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.StringEnum", + reflect.TypeOf((*StringEnum)(nil)).Elem(), + map[string]interface{}{ + "A": StringEnumA, + "B": StringEnumB, + "C": StringEnumC, + }, + ) + _jsii_.RegisterClass( + "jsii-calc.StripInternal", + reflect.TypeOf((*StripInternal)(nil)).Elem(), + reflect.TypeOf((*StripInternalIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.StructA", + reflect.TypeOf((*StructA)(nil)).Elem(), + reflect.TypeOf((*StructAIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.StructB", + reflect.TypeOf((*StructB)(nil)).Elem(), + reflect.TypeOf((*StructBIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.StructParameterType", + reflect.TypeOf((*StructParameterType)(nil)).Elem(), + reflect.TypeOf((*StructParameterTypeIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StructPassing", + reflect.TypeOf((*StructPassing)(nil)).Elem(), + reflect.TypeOf((*StructPassingIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.StructUnionConsumer", + reflect.TypeOf((*StructUnionConsumer)(nil)).Elem(), + reflect.TypeOf((*StructUnionConsumerIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.StructWithJavaReservedWords", + reflect.TypeOf((*StructWithJavaReservedWords)(nil)).Elem(), + reflect.TypeOf((*StructWithJavaReservedWordsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Sum", + reflect.TypeOf((*Sum)(nil)).Elem(), + reflect.TypeOf((*SumIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SupportsNiceJavaBuilder", + reflect.TypeOf((*SupportsNiceJavaBuilder)(nil)).Elem(), + reflect.TypeOf((*SupportsNiceJavaBuilderIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.SupportsNiceJavaBuilderProps", + reflect.TypeOf((*SupportsNiceJavaBuilderProps)(nil)).Elem(), + reflect.TypeOf((*SupportsNiceJavaBuilderPropsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps", + reflect.TypeOf((*SupportsNiceJavaBuilderWithRequiredProps)(nil)).Elem(), + reflect.TypeOf((*SupportsNiceJavaBuilderWithRequiredPropsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.SyncVirtualMethods", + reflect.TypeOf((*SyncVirtualMethods)(nil)).Elem(), + reflect.TypeOf((*SyncVirtualMethodsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.Thrower", + reflect.TypeOf((*Thrower)(nil)).Elem(), + reflect.TypeOf((*ThrowerIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.TopLevelStruct", + reflect.TypeOf((*TopLevelStruct)(nil)).Elem(), + reflect.TypeOf((*TopLevelStructIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UmaskCheck", + reflect.TypeOf((*UmaskCheck)(nil)).Elem(), + reflect.TypeOf((*UmaskCheckIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UnaryOperation", + reflect.TypeOf((*UnaryOperation)(nil)).Elem(), + reflect.TypeOf((*UnaryOperationIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.UnionProperties", + reflect.TypeOf((*UnionProperties)(nil)).Elem(), + reflect.TypeOf((*UnionPropertiesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UpcasingReflectable", + reflect.TypeOf((*UpcasingReflectable)(nil)).Elem(), + reflect.TypeOf((*UpcasingReflectableIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UseBundledDependency", + reflect.TypeOf((*UseBundledDependency)(nil)).Elem(), + reflect.TypeOf((*UseBundledDependencyIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UseCalcBase", + reflect.TypeOf((*UseCalcBase)(nil)).Elem(), + reflect.TypeOf((*UseCalcBaseIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.UsesInterfaceWithProperties", + reflect.TypeOf((*UsesInterfaceWithProperties)(nil)).Elem(), + reflect.TypeOf((*UsesInterfaceWithPropertiesIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.VariadicInvoker", + reflect.TypeOf((*VariadicInvoker)(nil)).Elem(), + reflect.TypeOf((*VariadicInvokerIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.VariadicMethod", + reflect.TypeOf((*VariadicMethod)(nil)).Elem(), + reflect.TypeOf((*VariadicMethodIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.VirtualMethodPlayground", + reflect.TypeOf((*VirtualMethodPlayground)(nil)).Elem(), + reflect.TypeOf((*VirtualMethodPlaygroundIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.VoidCallback", + reflect.TypeOf((*VoidCallback)(nil)).Elem(), + reflect.TypeOf((*VoidCallbackIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.WithPrivatePropertyInConstructor", + reflect.TypeOf((*WithPrivatePropertyInConstructor)(nil)).Elem(), + reflect.TypeOf((*WithPrivatePropertyInConstructorIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/pythonself/pythonself.go 1`] = ` @@ -13618,7 +14053,6 @@ package pythonself import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" ) // Class interface @@ -13638,7 +14072,6 @@ func (c *ClassWithSelf) GetSelf() string { c, "self", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13665,7 +14098,6 @@ func (c *ClassWithSelf) Method(self float64) string { []interface{}{self}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13686,9 +14118,6 @@ func (c *ClassWithSelfKwarg) GetProps() StructWithSelfIface { c, "props", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*StructWithSelfIface)(nil)).Elem(): reflect.TypeOf((*StructWithSelf)(nil)).Elem(), - }, ) return returns } @@ -13721,7 +14150,6 @@ func (i *IInterfaceWithSelf) Method(self float64) string { []interface{}{self}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13742,13 +14170,46 @@ func (s *StructWithSelf) GetSelf() string { s, "self", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/pythonself/pythonself.init.go 1`] = ` +package pythonself + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.PythonSelf.ClassWithSelf", + reflect.TypeOf((*ClassWithSelf)(nil)).Elem(), + reflect.TypeOf((*ClassWithSelfIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.PythonSelf.ClassWithSelfKwarg", + reflect.TypeOf((*ClassWithSelfKwarg)(nil)).Elem(), + reflect.TypeOf((*ClassWithSelfKwargIface)(nil)).Elem(), + ) + _jsii_.RegisterInterface( + "jsii-calc.PythonSelf.IInterfaceWithSelf", + reflect.TypeOf((*IInterfaceWithSelfIface)(nil)).Elem(), + reflect.TypeOf((*IInterfaceWithSelf)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.PythonSelf.StructWithSelf", + reflect.TypeOf((*StructWithSelf)(nil)).Elem(), + reflect.TypeOf((*StructWithSelfIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/backreferences/backreferences.go 1`] = ` @@ -13756,7 +14217,7 @@ package backreferences import ( _jsii_ "github.com/aws/jsii-runtime-go" - "reflect" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule" ) @@ -13776,15 +14237,31 @@ func (m *MyClassReference) GetReference() submodule.MyClassIface { m, "reference", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*submodule.MyClassIface)(nil)).Elem(): reflect.TypeOf((*submodule.MyClass)(nil)).Elem(), - }, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/backreferences/backreferences.init.go 1`] = ` +package backreferences + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterStruct( + "jsii-calc.submodule.back_references.MyClassReference", + reflect.TypeOf((*MyClassReference)(nil)).Elem(), + reflect.TypeOf((*MyClassReferenceIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/child/child.go 1`] = ` @@ -13793,7 +14270,6 @@ package child import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" ) type Awesomeness string @@ -13838,9 +14314,6 @@ func InnerClass_StaticProp() SomeStructIface { "jsii-calc.submodule.child.InnerClass", "staticProp", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*SomeStructIface)(nil)).Elem(): reflect.TypeOf((*SomeStruct)(nil)).Elem(), - }, ) return returns } @@ -13863,9 +14336,6 @@ func (k *KwargsProps) GetProp() SomeEnum { k, "prop", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*SomeEnum)(nil)).Elem(): reflect.TypeOf((*SomeEnum)(nil)).Elem(), - }, ) return returns } @@ -13876,7 +14346,6 @@ func (k *KwargsProps) GetExtra() string { k, "extra", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13901,9 +14370,6 @@ func (o *OuterClass) GetInnerClass() InnerClassIface { o, "innerClass", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*InnerClassIface)(nil)).Elem(): reflect.TypeOf((*InnerClass)(nil)).Elem(), - }, ) return returns } @@ -13944,9 +14410,6 @@ func (s *SomeStruct) GetProp() SomeEnum { s, "prop", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*SomeEnum)(nil)).Elem(): reflect.TypeOf((*SomeEnum)(nil)).Elem(), - }, ) return returns } @@ -13968,7 +14431,6 @@ func (s *Structure) GetBool() bool { s, "bool", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -13977,12 +14439,72 @@ func (s *Structure) GetBool() bool { `; -exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/isolated/isolated.go 1`] = ` -package isolated +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/child/child.init.go 1`] = ` +package child import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" ) +func init() { + _jsii_.RegisterEnum( + "jsii-calc.submodule.child.Awesomeness", + reflect.TypeOf((*Awesomeness)(nil)).Elem(), + map[string]interface{}{ + "AWESOME": AwesomenessAwesome, + }, + ) + _jsii_.RegisterEnum( + "jsii-calc.submodule.child.Goodness", + reflect.TypeOf((*Goodness)(nil)).Elem(), + map[string]interface{}{ + "PRETTY_GOOD": GoodnessPrettyGood, + "REALLY_GOOD": GoodnessReallyGood, + "AMAZINGLY_GOOD": GoodnessAmazinglyGood, + }, + ) + _jsii_.RegisterClass( + "jsii-calc.submodule.child.InnerClass", + reflect.TypeOf((*InnerClass)(nil)).Elem(), + reflect.TypeOf((*InnerClassIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.submodule.child.KwargsProps", + reflect.TypeOf((*KwargsProps)(nil)).Elem(), + reflect.TypeOf((*KwargsPropsIface)(nil)).Elem(), + ) + _jsii_.RegisterClass( + "jsii-calc.submodule.child.OuterClass", + reflect.TypeOf((*OuterClass)(nil)).Elem(), + reflect.TypeOf((*OuterClassIface)(nil)).Elem(), + ) + _jsii_.RegisterEnum( + "jsii-calc.submodule.child.SomeEnum", + reflect.TypeOf((*SomeEnum)(nil)).Elem(), + map[string]interface{}{ + "SOME": SomeEnumSome, + }, + ) + _jsii_.RegisterStruct( + "jsii-calc.submodule.child.SomeStruct", + reflect.TypeOf((*SomeStruct)(nil)).Elem(), + reflect.TypeOf((*SomeStructIface)(nil)).Elem(), + ) + _jsii_.RegisterStruct( + "jsii-calc.submodule.child.Structure", + reflect.TypeOf((*Structure)(nil)).Elem(), + reflect.TypeOf((*StructureIface)(nil)).Elem(), + ) +} + +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/isolated/isolated.go 1`] = ` +package isolated + + // Class interface type KwargsIface interface { } @@ -13995,18 +14517,36 @@ type Kwargs struct { func Kwargs_Method(props child.KwargsPropsIface) bool { _init_.Initialize() var returns bool - _jsii_.InvokeStatic( + _jsii_.StaticInvoke( "jsii-calc.submodule.isolated.Kwargs", "method", []interface{}{props}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/isolated/isolated.init.go 1`] = ` +package isolated + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.submodule.isolated.Kwargs", + reflect.TypeOf((*Kwargs)(nil)).Elem(), + reflect.TypeOf((*KwargsIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/nestedsubmodule/deeplynested/deeplynested.go 1`] = ` @@ -14014,7 +14554,6 @@ package deeplynested import ( _jsii_ "github.com/aws/jsii-runtime-go" - "reflect" ) type INamespacedIface interface { @@ -14029,12 +14568,30 @@ func (i *INamespaced) GetDefinedAt() string { i, "definedAt", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/nestedsubmodule/deeplynested/deeplynested.init.go 1`] = ` +package deeplynested + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterInterface( + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + reflect.TypeOf((*INamespacedIface)(nil)).Elem(), + reflect.TypeOf((*INamespaced)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/nestedsubmodule/nestedsubmodule.go 1`] = ` @@ -14042,9 +14599,9 @@ package nestedsubmodule import ( _jsii_ "github.com/aws/jsii-runtime-go" - "reflect" - "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/nestedsubmodule/deeplynested" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/child" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/nestedsubmodule/deeplynested" ) // Class interface @@ -14066,7 +14623,6 @@ func (n *Namespaced) GetDefinedAt() string { n, "definedAt", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -14077,15 +14633,31 @@ func (n *Namespaced) GetGoodness() child.Goodness { n, "goodness", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*child.Goodness)(nil)).Elem(): reflect.TypeOf((*child.Goodness)(nil)).Elem(), - }, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/nestedsubmodule/nestedsubmodule.init.go 1`] = ` +package nestedsubmodule + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.submodule.nested_submodule.Namespaced", + reflect.TypeOf((*Namespaced)(nil)).Elem(), + reflect.TypeOf((*NamespacedIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/param/param.go 1`] = ` @@ -14093,7 +14665,6 @@ package param import ( _jsii_ "github.com/aws/jsii-runtime-go" - "reflect" ) // SpecialParameterIface is the public interface for the custom type SpecialParameter @@ -14112,13 +14683,31 @@ func (s *SpecialParameter) GetValue() string { s, "value", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/param/param.init.go 1`] = ` +package param + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterStruct( + "jsii-calc.submodule.param.SpecialParameter", + reflect.TypeOf((*SpecialParameter)(nil)).Elem(), + reflect.TypeOf((*SpecialParameterIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/returnsparam/returnsparam.go 1`] = ` @@ -14127,7 +14716,7 @@ package returnsparam import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/param" ) @@ -14161,14 +14750,30 @@ func (r *ReturnsSpecialParameter) ReturnsSpecialParam() param.SpecialParameterIf []interface{}{}, true, &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*param.SpecialParameterIface)(nil)).Elem(): reflect.TypeOf((*param.SpecialParameter)(nil)).Elem(), - }, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/returnsparam/returnsparam.init.go 1`] = ` +package returnsparam + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.submodule.returnsparam.ReturnsSpecialParameter", + reflect.TypeOf((*ReturnsSpecialParameter)(nil)).Elem(), + reflect.TypeOf((*ReturnsSpecialParameterIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/submodule.go 1`] = ` @@ -14177,10 +14782,10 @@ package submodule import ( _jsii_ "github.com/aws/jsii-runtime-go" _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" - "reflect" - "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/nestedsubmodule/deeplynested" - "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/child" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/child" + "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/nestedsubmodule/deeplynested" "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/param" ) @@ -14211,9 +14816,6 @@ func (m *MyClass) GetAwesomeness() child.Awesomeness { m, "awesomeness", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*child.Awesomeness)(nil)).Elem(): reflect.TypeOf((*child.Awesomeness)(nil)).Elem(), - }, ) return returns } @@ -14224,7 +14826,6 @@ func (m *MyClass) GetDefinedAt() string { m, "definedAt", &returns, - map[reflect.Type]reflect.Type{}, ) return returns } @@ -14235,9 +14836,6 @@ func (m *MyClass) GetGoodness() child.Goodness { m, "goodness", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*child.Goodness)(nil)).Elem(): reflect.TypeOf((*child.Goodness)(nil)).Elem(), - }, ) return returns } @@ -14248,9 +14846,6 @@ func (m *MyClass) GetProps() child.SomeStructIface { m, "props", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*child.SomeStructIface)(nil)).Elem(): reflect.TypeOf((*child.SomeStruct)(nil)).Elem(), - }, ) return returns } @@ -14261,9 +14856,6 @@ func (m *MyClass) GetAllTypes() jsiicalc.AllTypesIface { m, "allTypes", &returns, - map[reflect.Type]reflect.Type{ - reflect.TypeOf((*jsiicalc.AllTypesIface)(nil)).Elem(): reflect.TypeOf((*jsiicalc.AllTypes)(nil)).Elem(), - }, ) return returns } @@ -14298,12 +14890,30 @@ func (m *MyClass) MethodWithSpecialParam(param param.SpecialParameterIface) stri []interface{}{param}, true, &returns, - map[reflect.Type]reflect.Type{}, ) return returns } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/submodule/submodule.init.go 1`] = ` +package submodule + +import ( + "reflect" + + _jsii_ "github.com/aws/jsii-runtime-go" +) + +func init() { + _jsii_.RegisterClass( + "jsii-calc.submodule.MyClass", + reflect.TypeOf((*MyClass)(nil)).Elem(), + reflect.TypeOf((*MyClassIface)(nil)).Elem(), + ) +} + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/version 1`] = ` diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 9627a6ae2e..79ff08e28a 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -44,9 +44,9 @@ "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/yargs": "^16.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index d26cce3f5f..ae9602bc2b 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -20,9 +20,9 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", "@types/mock-fs": "^4.13.0", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/yargs": "^16.0.0", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii/lib/compiler.ts b/packages/jsii/lib/compiler.ts index 0aa0c96bef..49b1162927 100644 --- a/packages/jsii/lib/compiler.ts +++ b/packages/jsii/lib/compiler.ts @@ -318,8 +318,12 @@ export class Compiler implements Emitter { ], exclude: [ 'node_modules', - ...pi.excludeTypescript, - ...(pi.tsc?.outDir != null + ...(pi.excludeTypescript ?? []), + ...(pi.tsc?.outDir != null && + (pi.tsc?.rootDir == null || + path + .resolve(pi.tsc.outDir) + .startsWith(path.resolve(pi.tsc.rootDir) + path.sep)) ? [path.join(pi.tsc.outDir, '**', '*.ts')] : []), ], diff --git a/packages/jsii/package.json b/packages/jsii/package.json index a69d66cd9f..f28b940eb6 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -53,11 +53,11 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.20", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.51", + "@types/node": "^10.17.52", "@types/semver": "^7.3.4", "@types/yargs": "^16.0.0", "clone": "^2.1.2", - "eslint": "^7.19.0", + "eslint": "^7.20.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 6531a7e58f..d5c90fd3e2 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -32,8 +32,8 @@ }, "devDependencies": { "@types/jest": "^26.0.20", - "@types/node": "^10.17.51", - "eslint": "^7.19.0", + "@types/node": "^10.17.52", + "eslint": "^7.20.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "prettier": "^2.2.1", diff --git a/yarn.lock b/yarn.lock index 32115d5882..9c8b1ef3d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" @@ -10,15 +17,15 @@ "@babel/highlight" "^7.12.13" "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.13.tgz#b73a87a3a3e7d142a66248bf6ad88b9ceb093425" - integrity sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw== + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" + integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.13" + "@babel/generator" "^7.12.15" "@babel/helper-module-transforms" "^7.12.13" "@babel/helpers" "^7.12.13" - "@babel/parser" "^7.12.13" + "@babel/parser" "^7.12.16" "@babel/template" "^7.12.13" "@babel/traverse" "^7.12.13" "@babel/types" "^7.12.13" @@ -30,7 +37,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.13": +"@babel/generator@^7.12.13", "@babel/generator@^7.12.15": version "7.12.15" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== @@ -56,9 +63,9 @@ "@babel/types" "^7.12.13" "@babel/helper-member-expression-to-functions@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz#c5715695b4f8bab32660dbdcdc2341dec7e3df40" - integrity sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ== + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" + integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== dependencies: "@babel/types" "^7.12.13" @@ -134,7 +141,7 @@ "@babel/traverse" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/highlight@^7.12.13": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== @@ -143,10 +150,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13": - version "7.12.15" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.15.tgz#2b20de7f0b4b332d9b119dd9c33409c538b8aacf" - integrity sha512-AQBOU2Z9kWwSZMd6lNjCX0GUgFonL1wAM1db8L8PMk9UDaGsRCArBkU4Sc+UCM3AE4hjbXx+h58Lb3QT4oRmrA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" + integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -395,9 +402,9 @@ resolve-from "^5.0.0" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/console@^26.6.2": version "26.6.2" @@ -1326,11 +1333,6 @@ "@octokit/types" "^6.0.3" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-4.0.1.tgz#bafd3d173974827ba0b733fcca7f1860cb71a9aa" - integrity sha512-k2hRcfcLRyPJjtYfJLzg404n7HZ6sUpAWAR/uNI8tf96NgatWOpw1ocdF+WFfx/trO1ivBh7ckynO1rn+xAw/Q== - "@octokit/openapi-types@^4.0.3": version "4.0.4" resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-4.0.4.tgz#96fcce11e929802898646205ac567e5df592f82b" @@ -1447,15 +1449,7 @@ dependencies: "@types/node" ">= 8" -"@octokit/types@^6.0.3", "@octokit/types@^6.7.1", "@octokit/types@^6.8.0": - version "6.8.2" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.8.2.tgz#ce4872e038d6df38b2d3c21bc12329af0b10facb" - integrity sha512-RpG0NJd7OKSkWptiFhy1xCLkThs5YoDIKM21lEtDmUvSpbaIEfrxzckWLUGDFfF8RydSyngo44gDv8m2hHruUg== - dependencies: - "@octokit/openapi-types" "^4.0.0" - "@types/node" ">= 8" - -"@octokit/types@^6.8.3": +"@octokit/types@^6.0.3", "@octokit/types@^6.7.1", "@octokit/types@^6.8.0", "@octokit/types@^6.8.3": version "6.8.5" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.8.5.tgz#797dfdad8c75718e97dc687d4c9fc49200ca8d17" integrity sha512-ZsQawftZoi0kSF2pCsdgLURbOjtVcHnBOXiSxBKSNF56CRjARt5rb/g8WJgqB8vv4lgUEHrv06EdDKYQ22vA9Q== @@ -1568,9 +1562,9 @@ "@types/node" "*" "@types/graceful-fs@^4.1.2": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" - integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== dependencies: "@types/node" "*" @@ -1651,14 +1645,14 @@ "@types/node" "*" "@types/node@*", "@types/node@>= 8": - version "14.14.25" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93" - integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ== + version "14.14.28" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b" + integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g== -"@types/node@^10.17.51": - version "10.17.51" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.51.tgz#639538575befbcf3d3861f95c41de8e47124d674" - integrity sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg== +"@types/node@^10.17.52": + version "10.17.52" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.52.tgz#dc960d4e256331b3c697b7a573ee98b882febee5" + integrity sha512-bKnO8Rcj03i6JTzweabq96k29uVNcXGB0bkwjVQTFagDgxxNged18281AZ0nTMHl+aFpPPWyPrk4Z3+NtW/z5w== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -1666,9 +1660,9 @@ integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== "@types/prettier@^2.0.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.0.tgz#a4e8205a4955690eef712a6d0394a1d2e121e721" - integrity sha512-O3SQC6+6AySHwrspYn2UvC6tjo6jCTMMmylxZUFhE1CulVu5l3AxU6ca9lrJDTQDVllF62LIxVSx5fuYL6LiZg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" + integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== "@types/semver@^7.3.4": version "7.3.4" @@ -1729,13 +1723,13 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.0.tgz#13a5a07cf30d0d5781e43480aa2a8d38d308b084" - integrity sha512-DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ== +"@typescript-eslint/eslint-plugin@^4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz#835f64aa0a403e5e9e64c10ceaf8d05c3f015180" + integrity sha512-yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw== dependencies: - "@typescript-eslint/experimental-utils" "4.15.0" - "@typescript-eslint/scope-manager" "4.15.0" + "@typescript-eslint/experimental-utils" "4.15.1" + "@typescript-eslint/scope-manager" "4.15.1" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -1743,60 +1737,60 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.0.tgz#b87c36410a9b23f637689427be85007a2ec1a9c6" - integrity sha512-V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg== +"@typescript-eslint/experimental-utils@4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz#d744d1ac40570a84b447f7aa1b526368afd17eec" + integrity sha512-9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.15.0" - "@typescript-eslint/types" "4.15.0" - "@typescript-eslint/typescript-estree" "4.15.0" + "@typescript-eslint/scope-manager" "4.15.1" + "@typescript-eslint/types" "4.15.1" + "@typescript-eslint/typescript-estree" "4.15.1" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.15.0.tgz#8df94365b4b7161f9e8514fe28aef19954810b6b" - integrity sha512-L6Dtbq8Bc7g2aZwnIBETpmUa9XDKCMzKVwAArnGp5Mn7PRNFjf3mUzq8UeBjL3K8t311hvevnyqXAMSmxO8Gpg== +"@typescript-eslint/parser@^4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.15.1.tgz#4c91a0602733db63507e1dbf13187d6c71a153c4" + integrity sha512-V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA== dependencies: - "@typescript-eslint/scope-manager" "4.15.0" - "@typescript-eslint/types" "4.15.0" - "@typescript-eslint/typescript-estree" "4.15.0" + "@typescript-eslint/scope-manager" "4.15.1" + "@typescript-eslint/types" "4.15.1" + "@typescript-eslint/typescript-estree" "4.15.1" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.0.tgz#c42703558ea6daaaba51a9c3a86f2902dbab9432" - integrity sha512-CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g== +"@typescript-eslint/scope-manager@4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz#f6511eb38def2a8a6be600c530c243bbb56ac135" + integrity sha512-ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA== dependencies: - "@typescript-eslint/types" "4.15.0" - "@typescript-eslint/visitor-keys" "4.15.0" + "@typescript-eslint/types" "4.15.1" + "@typescript-eslint/visitor-keys" "4.15.1" -"@typescript-eslint/types@4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.0.tgz#3011ae1ac3299bb9a5ac56bdd297cccf679d3662" - integrity sha512-su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg== +"@typescript-eslint/types@4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.1.tgz#da702f544ef1afae4bc98da699eaecd49cf31c8c" + integrity sha512-iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw== -"@typescript-eslint/typescript-estree@4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.0.tgz#402c86a7d2111c1f7a2513022f22a38a395b7f93" - integrity sha512-jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA== +"@typescript-eslint/typescript-estree@4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz#fa9a9ff88b4a04d901ddbe5b248bc0a00cd610be" + integrity sha512-z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw== dependencies: - "@typescript-eslint/types" "4.15.0" - "@typescript-eslint/visitor-keys" "4.15.0" + "@typescript-eslint/types" "4.15.1" + "@typescript-eslint/visitor-keys" "4.15.1" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.15.0": - version "4.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.0.tgz#2a07768df30c8a5673f1bce406338a07fdec38ca" - integrity sha512-RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA== +"@typescript-eslint/visitor-keys@4.15.1": + version "4.15.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz#c76abbf2a3be8a70ed760f0e5756bf62de5865dd" + integrity sha512-tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww== dependencies: - "@typescript-eslint/types" "4.15.0" + "@typescript-eslint/types" "4.15.1" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.11.0": @@ -2044,9 +2038,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz#827e5f5ae32f5e5c1637db61f253a112229b5e2f" - integrity sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw== + version "7.1.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" + integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2624,9 +2618,9 @@ camelcase@^6.0.0, camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001181: - version "1.0.30001185" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz#3482a407d261da04393e2f0d61eefbc53be43b95" - integrity sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg== + version "1.0.30001187" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438" + integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA== capture-exit@^2.0.0: version "2.0.0" @@ -2857,9 +2851,9 @@ commander@^2.20.0: integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2" - integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== + version "7.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" + integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== commonmark@^0.29.3: version "0.29.3" @@ -3086,15 +3080,15 @@ conventional-commits-filter@^2.0.2, conventional-commits-filter@^2.0.7: modify-values "^1.0.0" conventional-commits-parser@^3.0.3, conventional-commits-parser@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca" - integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz#ba44f0b3b6588da2ee9fd8da508ebff50d116ce2" + integrity sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA== dependencies: JSONStream "^1.0.4" is-text-path "^1.0.1" lodash "^4.17.15" meow "^8.0.0" - split2 "^2.0.0" + split2 "^3.0.0" through2 "^4.0.0" trim-off-newlines "^1.0.0" @@ -3545,9 +3539,9 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" electron-to-chromium@^1.3.649: - version "1.3.661" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.661.tgz#8603ec971b3e3b3d83389ac2bb64b9b07d7bb40a" - integrity sha512-INNzKoL9ceOpPCpF5J+Fp9AOHY1RegwKViohAyTzV3XbkuRUx04r4v8edsDbevsog8UuL0GvD/Qerr2HwVTlSA== + version "1.3.666" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.666.tgz#59f3ce1e45b860a0ebe439b72664354efbb8bc62" + integrity sha512-/mP4HFQ0fKIX4sXltG6kfcoGrfNDZwCIyWbH2SIcVaa9u7Rm0HKjambiHNg5OEruicTl9s1EwbERLwxZwk19aw== emittery@^0.7.1: version "0.7.2" @@ -3620,7 +3614,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.0-next.1: +es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: version "1.18.0-next.2" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== @@ -3725,10 +3719,10 @@ eslint-import-resolver-node@^0.3.4: debug "^2.6.9" resolve "^1.13.1" -eslint-import-resolver-typescript@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.3.0.tgz#0870988098bc6c6419c87705e6b42bee89425445" - integrity sha512-MHSXvmj5e0SGOOBhBbt7C+fWj1bJbtSYFAD85Xeg8nvUtuooTod2HQb8bfhE9f5QyyNxEfgzqOYFCvmdDIcCuw== +eslint-import-resolver-typescript@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.4.0.tgz#ec1e7063ebe807f0362a7320543aaed6fe1100e1" + integrity sha512-useJKURidCcldRLCNKWemr1fFQL1SzB3G4a0li6lFGvlc5xGe1hY343bvG07cbpCzPuM/lK19FIJB3XGFSkplA== dependencies: debug "^4.1.1" glob "^7.1.6" @@ -3795,12 +3789,12 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.19.0: - version "7.19.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" - integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== +eslint@^7.20.0: + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" + integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== dependencies: - "@babel/code-frame" "^7.0.0" + "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.3.0" ajv "^6.10.0" chalk "^4.0.0" @@ -3812,7 +3806,7 @@ eslint@^7.19.0: eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" file-entry-cache "^6.0.0" functional-red-black-tree "^1.0.1" @@ -3852,7 +3846,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: +esquery@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== @@ -4555,9 +4549,9 @@ growly@^1.3.0: integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= handlebars@^4.7.6: - version "4.7.6" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e" - integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA== + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== dependencies: minimist "^1.2.5" neo-async "^2.6.0" @@ -4953,7 +4947,7 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.1.0: +is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== @@ -5174,13 +5168,13 @@ is-text-path@^1.0.1: text-extensions "^1.0.0" is-typed-array@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.4.tgz#1f66f34a283a3c94a4335434661ca53fff801120" - integrity sha512-ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA== + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e" + integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug== dependencies: available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" + call-bind "^1.0.2" + es-abstract "^1.18.0-next.2" foreach "^2.0.5" has-symbols "^1.0.1" @@ -7691,11 +7685,11 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.9.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" - integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: - is-core-module "^2.1.0" + is-core-module "^2.2.0" path-parse "^1.0.6" restore-cursor@^2.0.0: @@ -8531,9 +8525,9 @@ terser-webpack-plugin@^5.1.1: terser "^5.5.1" terser@^5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== + version "5.6.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" + integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -8837,9 +8831,9 @@ typescript-json-schema@^0.49.0: yargs "^16.2.0" typescript@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.4.tgz#f058636e2f4f83f94ddaae07b20fd5e14598432f" - integrity sha512-+Uru0t8qIRgjuCpiSPpfGuhHecMllk5Zsazj5LZvVsEStEjmIRRBZe+jHjGQvsgS7M1wONy2PQXd67EMyV6acg== + version "4.1.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" + integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA== typescript@~3.9.9: version "3.9.9" @@ -8847,9 +8841,9 @@ typescript@~3.9.9: integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== uglify-js@^3.1.4: - version "3.12.7" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.7.tgz#be4f06142a67bd91ef868b4e111dc241e151bff3" - integrity sha512-SIZhkoh+U/wjW+BHGhVwE9nt8tWJspncloBcFapkpGRwNPqcH8pzX36BXe3TPBjzHWPMUZotpCigak/udWNr1Q== + version "3.12.8" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.8.tgz#a82e6e53c9be14f7382de3d068ef1e26e7d4aaf8" + integrity sha512-fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w== uid-number@0.0.6: version "0.0.6" @@ -9084,10 +9078,10 @@ webpack-sources@^2.1.1: source-list-map "^2.0.1" source-map "^0.6.1" -webpack@^5.21.2: - version "5.21.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.21.2.tgz#647507e50d3637695be28af58a6a8246050394e7" - integrity sha512-xHflCenx+AM4uWKX71SWHhxml5aMXdy2tu/vdi4lClm7PADKxlyDAFFN1rEFzNV0MAoPpHtBeJnl/+K6F4QBPg== +webpack@^5.22.0: + version "5.22.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.22.0.tgz#8505158bc52dcbbdb01ac94796a8aed61badf11a" + integrity sha512-xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.46" @@ -9359,9 +9353,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.5" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.5.tgz#5d37729146d3f894f39fc94b6796f5b239513186" + integrity sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg== yargs-parser@^15.0.1: version "15.0.1"