jsii-pacmak 1.65.1 → 1.66.0

package/lib/targets/go/types/struct.js

@@ -1,8 +1,21 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _Struct_structValidator, _Struct_validators;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Struct = void 0;
 const assert = require("assert");
 const runtime_1 = require("../runtime");
+const runtime_type_checking_1 = require("../runtime/runtime-type-checking");
 const util_1 = require("../util");
 const go_type_1 = require("./go-type");
 const type_member_1 = require("./type-member");
@@ -12,17 +25,34 @@ const type_member_1 = require("./type-member");
 class Struct extends go_type_1.GoType {
     constructor(parent, type) {
         super(parent, type);
+        _Struct_structValidator.set(this, void 0);
+        _Struct_validators.set(this, void 0);
         assert(type.isDataType(), `The provided interface ${type.fqn} is not a struct!`);
         this.properties = type.allProperties.map((prop) => new type_member_1.GoProperty(this, prop));
     }
+    get parameterValidators() {
+        if (__classPrivateFieldGet(this, _Struct_validators, "f") == null) {
+            __classPrivateFieldSet(this, _Struct_validators, this.properties
+                .map((p) => p.validator)
+                .filter((v) => v != null), "f");
+        }
+        return __classPrivateFieldGet(this, _Struct_validators, "f");
+    }
+    get structValidator() {
+        if (__classPrivateFieldGet(this, _Struct_structValidator, "f") === null) {
+            __classPrivateFieldSet(this, _Struct_structValidator, runtime_type_checking_1.StructValidator.for(this), "f");
+        }
+        return __classPrivateFieldGet(this, _Struct_structValidator, "f");
+    }
     get dependencies() {
         return (0, util_1.getMemberDependencies)(this.properties);
     }
     get specialDependencies() {
         return {
-            runtime: false,
+            fmt: false,
             init: false,
             internal: false,
+            runtime: false,
             time: this.properties.some((prop) => prop.specialDependencies.time),
         };
     }
@@ -36,12 +66,21 @@ class Struct extends go_type_1.GoType {
         code.closeBlock();
         code.line();
     }
-    emitRegistration(code) {
+    emitRegistration({ code, runtimeTypeChecking }) {
         code.open(`${runtime_1.JSII_RT_ALIAS}.RegisterStruct(`);
         code.line(`"${this.fqn}",`);
         code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`);
         code.close(')');
+        if (runtimeTypeChecking && this.structValidator) {
+            code.open(`${runtime_1.JSII_RT_ALIAS}.RegisterStructValidator(`);
+            code.line(`reflect.TypeOf((*${this.name})(nil)).Elem(),`);
+            code.open('func (i interface{}, d func() string) error {');
+            code.line(`return (i.(*${this.name})).validate(d)`);
+            code.close('},');
+            code.close(')');
+        }
     }
 }
 exports.Struct = Struct;
+_Struct_structValidator = new WeakMap(), _Struct_validators = new WeakMap();
 //# sourceMappingURL=struct.js.map

package/lib/targets/go/types/type-member.d.ts

@@ -2,6 +2,7 @@ import { Callable, Parameter, Property } from 'jsii-reflect';
 import { ApiLocation } from 'jsii-rosetta';
 import { SpecialDependencies } from '../dependencies';
 import { EmitContext } from '../emit-context';
+import { ParameterValidator } from '../runtime/runtime-type-checking';
 import { GoClass, GoType, GoInterface, GoTypeRef } from './index';
 export interface GoTypeMember {
     name: string;
@@ -11,12 +12,15 @@ export interface GoTypeMember {
     specialDependencies: SpecialDependencies;
 }
 export declare class GoProperty implements GoTypeMember {
+    #private;
     parent: GoType;
     readonly property: Property;
     readonly name: string;
+    readonly setterName: string;
     readonly immutable: boolean;
     protected readonly apiLocation: ApiLocation;
     constructor(parent: GoType, property: Property);
+    get validator(): ParameterValidator | undefined;
     get reference(): GoTypeRef;
     get specialDependencies(): SpecialDependencies;
     get static(): boolean;
@@ -25,18 +29,19 @@ export declare class GoProperty implements GoTypeMember {
     get override(): string;
     emitStructMember({ code, documenter }: EmitContext): void;
     emitGetterDecl({ code, documenter }: EmitContext): void;
-    emitGetter({ code }: EmitContext): void;
     emitSetterDecl({ code, documenter }: EmitContext): void;
     emitGetterProxy(context: EmitContext): void;
     emitSetterProxy(context: EmitContext): void;
 }
 export declare abstract class GoMethod implements GoTypeMember {
+    #private;
     readonly parent: GoClass | GoInterface;
     readonly method: Callable;
     readonly name: string;
     readonly parameters: GoParameter[];
     protected readonly apiLocation: ApiLocation;
     constructor(parent: GoClass | GoInterface, method: Callable);
+    get validator(): ParameterValidator | undefined;
     abstract emit(context: EmitContext): void;
     abstract get specialDependencies(): SpecialDependencies;
     get reference(): GoTypeRef | undefined;
@@ -44,10 +49,12 @@ export declare abstract class GoMethod implements GoTypeMember {
     get returnType(): string;
     get instanceArg(): string;
     get override(): string;
+    get static(): boolean;
     paramString(): string;
 }
 export declare class GoParameter {
     readonly name: string;
+    readonly isOptional: boolean;
     readonly isVariadic: boolean;
     private readonly type;
     private readonly pkg;

package/lib/targets/go/types/type-member.js

@@ -1,9 +1,22 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _GoProperty_validator, _GoMethod_validator;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoParameter = exports.GoMethod = exports.GoProperty = void 0;
 const jsii_reflect_1 = require("jsii-reflect");
 const naming_util_1 = require("../../../naming-util");
 const runtime_1 = require("../runtime");
+const runtime_type_checking_1 = require("../runtime/runtime-type-checking");
 const util_1 = require("../util");
 const index_1 = require("./index");
 /*
@@ -14,7 +27,14 @@ class GoProperty {
     constructor(parent, property) {
         this.parent = parent;
         this.property = property;
-        this.name = (0, naming_util_1.jsiiToPascalCase)(this.property.name);
+        _GoProperty_validator.set(this, null);
+        const localName = (0, naming_util_1.jsiiToPascalCase)(this.property.name);
+        this.name = property.spec.static
+            ? `${parent.name}_${localName}`
+            : localName;
+        this.setterName = property.spec.static
+            ? `${parent.name}_Set${localName}`
+            : `Set${this.name}`;
         this.immutable = property.immutable;
         this.apiLocation = {
             api: 'member',
@@ -22,14 +42,21 @@ class GoProperty {
             memberName: this.property.name,
         };
     }
+    get validator() {
+        if (__classPrivateFieldGet(this, _GoProperty_validator, "f") === null) {
+            __classPrivateFieldSet(this, _GoProperty_validator, runtime_type_checking_1.ParameterValidator.forProperty(this), "f");
+        }
+        return __classPrivateFieldGet(this, _GoProperty_validator, "f");
+    }
     get reference() {
         return new index_1.GoTypeRef(this.parent.pkg.root, this.property.type);
     }
     get specialDependencies() {
         return {
-            runtime: true,
+            fmt: false,
             init: this.static,
             internal: false,
+            runtime: true,
             time: !!this.reference?.specialDependencies.time,
         };
     }
@@ -60,49 +87,56 @@ class GoProperty {
         documenter.emit(this.property.docs, this.apiLocation);
         code.line(`${this.name}() ${this.returnType}`);
     }
-    emitGetter({ code }) {
-        const receiver = this.parent.name;
-        const instanceArg = receiver.substring(0, 1).toLowerCase();
-        code.openBlock(`func (${instanceArg} *${receiver}) Get${this.name}() ${this.returnType}`);
-        code.line(`return ${instanceArg}.${this.name}`);
-        code.closeBlock();
-    }
     emitSetterDecl({ code, documenter }) {
         if (!this.immutable) {
             // For setters, only emit the stability. Copying the documentation from
             // the getter might result in confusing documentation. This is an "okay"
             // middle-ground.
             documenter.emitStability(this.property.docs);
-            code.line(`Set${this.name}(val ${this.returnType})`);
+            code.line(`${this.setterName}(val ${this.returnType})`);
         }
     }
     // Emits getter methods on the struct for each property
     emitGetterProxy(context) {
         const { code } = context;
-        const receiver = this.parent.proxyName;
-        const instanceArg = receiver.substring(0, 1).toLowerCase();
-        code.openBlock(`func (${instanceArg} *${receiver}) ${this.name}() ${this.returnType}`);
-        new runtime_1.GetProperty(this).emit(code);
+        if (!this.static) {
+            const receiver = this.parent.proxyName;
+            const instanceArg = receiver.substring(0, 1).toLowerCase();
+            code.openBlock(`func (${instanceArg} *${receiver}) ${this.name}() ${this.returnType}`);
+            new runtime_1.GetProperty(this).emit(code);
+        }
+        else {
+            code.openBlock(`func ${this.name}() ${this.returnType}`);
+            new runtime_1.StaticGetProperty(this).emit(code);
+        }
         code.closeBlock();
         code.line();
     }
     emitSetterProxy(context) {
         if (!this.immutable) {
             const { code } = context;
-            const receiver = this.parent.proxyName;
-            const instanceArg = receiver.substring(0, 1).toLowerCase();
-            code.openBlock(`func (${instanceArg} *${receiver}) Set${this.name}(val ${this.returnType})`);
-            new runtime_1.SetProperty(this).emit(code);
+            if (!this.static) {
+                const receiver = this.parent.proxyName;
+                const instanceArg = receiver.substring(0, 1).toLowerCase();
+                code.openBlock(`func (${instanceArg} *${receiver})${this.setterName}(val ${this.returnType})`);
+                new runtime_1.SetProperty(this).emit(context);
+            }
+            else {
+                code.openBlock(`func ${this.setterName}(val ${this.returnType})`);
+                new runtime_1.StaticSetProperty(this).emit(context);
+            }
             code.closeBlock();
             code.line();
         }
     }
 }
 exports.GoProperty = GoProperty;
+_GoProperty_validator = new WeakMap();
 class GoMethod {
     constructor(parent, method) {
         this.parent = parent;
         this.method = method;
+        _GoMethod_validator.set(this, null);
         this.name = (0, naming_util_1.jsiiToPascalCase)(method.name);
         this.parameters = this.method.parameters.map((param) => new GoParameter(parent, param));
         this.apiLocation =
@@ -110,6 +144,12 @@ class GoMethod {
                 ? { api: 'initializer', fqn: parent.fqn }
                 : { api: 'member', fqn: parent.fqn, memberName: method.name };
     }
+    get validator() {
+        if (__classPrivateFieldGet(this, _GoMethod_validator, "f") === null) {
+            __classPrivateFieldSet(this, _GoMethod_validator, runtime_type_checking_1.ParameterValidator.forMethod(this), "f");
+        }
+        return __classPrivateFieldGet(this, _GoMethod_validator, "f");
+    }
     get reference() {
         if (jsii_reflect_1.Method.isMethod(this.method) && this.method.returns.type) {
             return new index_1.GoTypeRef(this.parent.pkg.root, this.method.returns.type);
@@ -132,6 +172,9 @@ class GoMethod {
     get override() {
         return `${runtime_1.JSII_RT_ALIAS}.MemberMethod{JsiiMethod: "${this.method.name}", GoMethod: "${this.name}"}`;
     }
+    get static() {
+        return false;
+    }
     paramString() {
         return this.parameters.length === 0
             ? ''
@@ -139,9 +182,11 @@ class GoMethod {
     }
 }
 exports.GoMethod = GoMethod;
+_GoMethod_validator = new WeakMap();
 class GoParameter {
     constructor(parent, parameter) {
         this.name = (0, util_1.substituteReservedWords)(parameter.name);
+        this.isOptional = parameter.optional;
         this.isVariadic = parameter.variadic;
         this.type = parameter.type;
         this.pkg = parent.pkg;

package/lib/targets/go.d.ts

@@ -24,12 +24,16 @@ export declare class Golang extends Target {
     private writeLocalGoMod;
 }
 declare class GoGenerator implements IGenerator {
-    private readonly rosetta;
     private assembly;
     rootPackage: RootPackage;
     private readonly code;
     private readonly documenter;
-    constructor(rosetta: Rosetta);
+    private readonly rosetta;
+    private readonly runtimeTypeChecking;
+    constructor(options: {
+        readonly rosetta: Rosetta;
+        readonly runtimeTypeChecking: boolean;
+    });
     load(_: string, assembly: Assembly): Promise<void>;
     upToDate(_outDir: string): Promise<boolean>;
     generate(): void;

package/lib/targets/go.js

@@ -14,7 +14,7 @@ const util_2 = require("./go/util");
 class Golang extends target_1.Target {
     constructor(options) {
         super(options);
-        this.goGenerator = new GoGenerator(options.rosetta);
+        this.goGenerator = new GoGenerator(options);
     }
     get generator() {
         return this.goGenerator;
@@ -32,7 +32,7 @@ class Golang extends target_1.Target {
         // write `local.go.mod` with "replace" directives for local modules
         const localGoMod = await this.writeLocalGoMod(pkgDir);
         try {
-            // run `go build` with local.go.mod, go 1.16 requires that we download
+            // run `go build` with local.go.mod, go 1.16+ requires that we download
             // modules explicit so go.sum is updated. We'd normally want to use
             // `go mod download`, but because of a bug in go 1.16, we have to use
             // `go mod tidy` instead.
@@ -114,13 +114,14 @@ class Golang extends target_1.Target {
 }
 exports.Golang = Golang;
 class GoGenerator {
-    constructor(rosetta) {
-        this.rosetta = rosetta;
+    constructor(options) {
         this.code = new codemaker_1.CodeMaker({
             indentCharacter: '\t',
             indentationLevel: 1,
         });
+        this.rosetta = options.rosetta;
         this.documenter = new documentation_1.Documentation(this.code, this.rosetta);
+        this.runtimeTypeChecking = options.runtimeTypeChecking;
     }
     async load(_, assembly) {
         this.assembly = assembly;
@@ -134,6 +135,7 @@ class GoGenerator {
         return this.rootPackage.emit({
             code: this.code,
             documenter: this.documenter,
+            runtimeTypeChecking: this.runtimeTypeChecking,
         });
     }
     async save(outDir, tarball, { license, notice }) {

package/lib/version.d.ts

@@ -1,5 +1,5 @@
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
-export declare const VERSION = "1.65.1";
+export declare const VERSION = "1.66.0";
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.65.1 (build b0947e4)";
+export declare const VERSION_DESC = "1.66.0 (build 3c9512b)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,9 +1,9 @@
 "use strict";
-// Generated at 2022-08-29T17:36:17Z by generate.sh
+// Generated at 2022-08-29T23:52:00Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
-exports.VERSION = '1.65.1';
+exports.VERSION = '1.66.0';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.65.1 (build b0947e4)';
+exports.VERSION_DESC = '1.66.0 (build 3c9512b)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.65.1",
+  "version": "1.66.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,35 +37,35 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.65.1",
-    "@jsii/spec": "^1.65.1",
+    "@jsii/check-node": "1.66.0",
+    "@jsii/spec": "^1.66.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.65.1",
+    "codemaker": "^1.66.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.65.1",
-    "jsii-rosetta": "^1.65.1",
+    "jsii-reflect": "^1.66.0",
+    "jsii-rosetta": "^1.66.0",
     "semver": "^7.3.7",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.65.1",
-    "@jsii/java-runtime": "^1.65.1",
-    "@jsii/go-runtime": "^1.65.1",
-    "@scope/jsii-calc-lib": "^1.65.1",
+    "@jsii/dotnet-runtime": "^1.66.0",
+    "@jsii/java-runtime": "^1.66.0",
+    "@jsii/go-runtime": "^1.66.0",
+    "@scope/jsii-calc-lib": "^1.66.0",
     "@types/clone": "^2.1.1",
     "@types/diff": "^5.0.2",
     "@types/commonmark": "^0.27.5",
     "@types/fs-extra": "^9.0.13",
-    "@types/semver": "^7.3.10",
+    "@types/semver": "^7.3.12",
     "diff": "^5.1.0",
-    "jsii": "^1.65.1",
-    "jsii-build-tools": "^1.65.1",
+    "jsii": "^1.66.0",
+    "jsii-build-tools": "^1.66.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.266"
+    "pyright": "^1.1.267"
   },
   "keywords": [
     "jsii",