jsii-pacmak 1.69.0 → 1.71.0

package/lib/targets/go/package.d.ts

@@ -3,7 +3,7 @@ import { Assembly, ModuleLike as JsiiModuleLike, Submodule as JsiiSubmodule } fr
 import { EmitContext } from './emit-context';
 import { GoClass, GoType, GoInterface, GoTypeRef } from './types';
 export declare const GOMOD_FILENAME = "go.mod";
-export declare const GO_VERSION = "1.16";
+export declare const GO_VERSION = "1.18";
 export declare abstract class Package {
     private readonly jsiiModule;
     readonly packageName: string;

package/lib/targets/go/package.js

@@ -11,7 +11,7 @@ const types_1 = require("./types");
 const util_1 = require("./util");
 const version_file_1 = require("./version-file");
 exports.GOMOD_FILENAME = 'go.mod';
-exports.GO_VERSION = '1.16';
+exports.GO_VERSION = '1.18';
 /*
  * Package represents a single `.go` source file within a package. This can be the root package file or a submodule
  */
@@ -191,8 +191,6 @@ class Package {
             code.openFile(filePath);
             // Conditional compilation tag...
             code.line(`//go:build ${forNoOp ? '' : '!'}no_runtime_type_checking`);
-            // For go1.16 compatibility
-            code.line(`// +build ${forNoOp ? '' : '!'}no_runtime_type_checking`);
             code.line();
             this.emitHeader(code);
             if (!forNoOp) {

package/lib/targets/go.js

@@ -33,11 +33,9 @@ class Golang extends target_1.Target {
         const localGoMod = await this.writeLocalGoMod(pkgDir);
         try {
             // 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.
-            //
-            // See: https://github.com/golang/go/issues/44129
+            // modules explicit so go.sum is updated. We'd want to use
+            // `go mod download`, but it does not add missing entries in the `go.sum`
+            // file while `go mod tidy` does.
             await go('mod', ['tidy', '-modfile', localGoMod.path], {
                 cwd: pkgDir,
             });

package/lib/targets/python/type-name.d.ts

@@ -70,14 +70,4 @@ export declare function toPythonFqn(fqn: string, rootAssm: Assembly): {
     packageName: string;
     pythonFqn: string;
 };
-/**
- * Computes the nesting-qualified name of a type.
- *
- * @param fqn      the fully qualified jsii name of the type.
- * @param rootAssm the root assembly for the project.
- *
- * @returns the nesting-qualified python type name (the name of the class,
- *          qualified with all nesting parent classes).
- */
-export declare function toPythonFullName(fqn: string, rootAssm: Assembly): string;
 //# sourceMappingURL=type-name.d.ts.map

package/lib/targets/python/type-name.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _Dict_element, _List_element, _Optional_wrapped, _Primitive_pythonType, _Union_options, _UserType_fqn;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPythonFullName = exports.toPythonFqn = exports.mergePythonImports = exports.toPackageName = exports.toTypeName = void 0;
+exports.toPythonFqn = exports.mergePythonImports = exports.toPackageName = exports.toTypeName = void 0;
 const spec_1 = require("@jsii/spec");
 const codemaker_1 = require("codemaker");
 const crypto_1 = require("crypto");
@@ -269,20 +269,6 @@ function toPythonFqn(fqn, rootAssm) {
     return { assemblyName, packageName, pythonFqn: fqnParts.join('.') };
 }
 exports.toPythonFqn = toPythonFqn;
-/**
- * Computes the nesting-qualified name of a type.
- *
- * @param fqn      the fully qualified jsii name of the type.
- * @param rootAssm the root assembly for the project.
- *
- * @returns the nesting-qualified python type name (the name of the class,
- *          qualified with all nesting parent classes).
- */
-function toPythonFullName(fqn, rootAssm) {
-    const { packageName, pythonFqn } = toPythonFqn(fqn, rootAssm);
-    return pythonFqn.slice(packageName.length + 1);
-}
-exports.toPythonFullName = toPythonFullName;
 /**
  * Computes the python relative import path from `fromModule` to `toModule`.
  *

package/lib/targets/python.d.ts

@@ -15,6 +15,8 @@ interface EmitContext extends NamingContext {
     readonly resolver: TypeResolver;
     /** Whether to emit runtime type checking code */
     readonly runtimeTypeChecking: boolean;
+    /** Whether to runtime type check keyword arguments (i.e: struct constructors) */
+    readonly runtimeTypeCheckKwargs?: boolean;
 }
 interface PythonBase {
     readonly pythonName: string;

package/lib/targets/python.js

@@ -441,7 +441,7 @@ class BaseMethod {
         });
         if ((this.shouldEmitBody || forceEmitBody) &&
             (!renderAbstract || !this.abstract)) {
-            emitParameterTypeChecks(code, context, pythonParams.slice(1), `${(0, type_name_1.toPythonFullName)(this.parent.fqn, context.assembly)}.${this.pythonName}`);
+            emitParameterTypeChecks(code, context, pythonParams.slice(1));
         }
         this.emitBody(code, context, renderAbstract, forceEmitBody, liftedPropNames, pythonParams[0], returnType);
         code.closeBlock();
@@ -598,11 +598,7 @@ class BaseProperty {
             openSignature(code, 'def', this.pythonName, [this.implicitParameter, `value: ${pythonType}`], 'None');
             if ((this.shouldEmitBody || forceEmitBody) &&
                 (!renderAbstract || !this.abstract)) {
-                emitParameterTypeChecks(code, context, [`value: ${pythonType}`], 
-                // In order to get a property accessor, we must resort to getting the
-                // attribute on the type, instead of the value (where the getter would
-                // be implicitly invoked for us...)
-                `getattr(${(0, type_name_1.toPythonFullName)(this.parent.fqn, context.assembly)}, ${JSON.stringify(this.pythonName)}).fset`);
+                emitParameterTypeChecks(code, context, [`value: ${pythonType}`]);
                 code.line(`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value)`);
             }
             else {
@@ -748,7 +744,11 @@ class Struct extends BasePythonClassType {
             code.line(`${member.pythonName} = ${typeName}(**${member.pythonName})`);
             code.closeBlock();
         }
-        emitParameterTypeChecks(code, context, kwargs, `${(0, type_name_1.toPythonFullName)(this.spec.fqn, context.assembly)}.__init__`);
+        if (kwargs.length > 0) {
+            emitParameterTypeChecks(code, 
+            // Runtime type check keyword args as this is a struct __init__ function.
+            { ...context, runtimeTypeCheckKwargs: true }, ['*', ...kwargs]);
+        }
         // Required properties, those will always be put into the dict
         assignDictionary(code, `${implicitParameter}._values: typing.Dict[str, typing.Any]`, members
             .filter((m) => !m.optional)
@@ -2015,10 +2015,10 @@ function openSignature(code, keyword, name, params, returnType, lineComment) {
  * Emits runtime type checking code for parameters.
  *
  * @param code        the CodeMaker to use for emitting code.
+ * @param context     the emit context used when emitting this code.
  * @param params      the parameter signatures to be type-checked.
- * @param typedEntity the type-annotated entity.
  */
-function emitParameterTypeChecks(code, context, params, typedEntity) {
+function emitParameterTypeChecks(code, context, params) {
     if (!context.runtimeTypeChecking) {
         return;
     }
@@ -2032,19 +2032,38 @@ function emitParameterTypeChecks(code, context, params, typedEntity) {
         }
         return { name };
     });
-    const typesVar = slugifyAsNeeded('type_hints', paramInfo
+    const paramNames = paramInfo
         .filter((param) => param.name != null)
-        .map((param) => param.name.split(/\s*:\s*/)[0]));
+        .map((param) => param.name.split(/\s*:\s*/)[0]);
+    const typesVar = slugifyAsNeeded('type_hints', paramNames);
     let openedBlock = false;
     for (const { is_rest, kwargsMark, name } of paramInfo) {
         if (kwargsMark) {
-            // This is the keyword-args separator, we won't check keyword arguments here because the kwargs will be rolled
-            // up into a struct instance, and that struct's constructor will be checking again...
-            break;
+            if (!context.runtimeTypeCheckKwargs) {
+                // This is the keyword-args separator, we won't check keyword arguments here because the kwargs will be rolled
+                // up into a struct instance, and that struct's constructor will be checking again...
+                break;
+            }
+            // Skip this (there is nothing to be checked as this is just a marker...)
+            continue;
         }
         if (!openedBlock) {
             code.openBlock('if __debug__');
-            code.line(`${typesVar} = typing.get_type_hints(${typedEntity})`);
+            const stubVar = slugifyAsNeeded('stub', [...paramNames, typesVar]);
+            // Inline a stub function to be able to have the required type hints regardless of what customers do with the
+            // code. Using a reference to the `Type.function` may result in incorrect data if some function was replaced (e.g.
+            // by a decorated version with different type annotations). We also cannot construct the actual value expected by
+            // typeguard's `check_type` because Python does not expose the APIs necessary to build many of these objects in
+            // regular Python code.
+            //
+            // Since the nesting function will only be callable once this module is fully loaded, we can convert forward type
+            // references into regular references, so that the type checker is not confused by multiple type references
+            // sharing the same leaf type name (the ForwardRef resolution may be cached in the execution scope, which causes
+            // order-of-initialization problems, as can be seen in aws/jsii#3818).
+            openSignature(code, 'def', stubVar, params.map((param) => param.replace(/"/g, '')), 'None');
+            code.line('...');
+            code.closeBlock();
+            code.line(`${typesVar} = typing.get_type_hints(${stubVar})`);
             openedBlock = true;
         }
         let expectedType = `${typesVar}[${JSON.stringify(name)}]`;

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: string;
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.69.0 (build f656c31)";
+export declare const VERSION_DESC = "1.71.0 (build f1f58ae)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2022-09-27T10:46:56Z by generate.sh
+// Generated at 2022-11-09T12:10:33Z 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`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-exports.VERSION = '1.69.0';
+exports.VERSION = '1.71.0';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.69.0 (build f656c31)';
+exports.VERSION_DESC = '1.71.0 (build f1f58ae)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.69.0",
+  "version": "1.71.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.69.0",
-    "@jsii/spec": "^1.69.0",
+    "@jsii/check-node": "1.71.0",
+    "@jsii/spec": "^1.71.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.69.0",
+    "codemaker": "^1.71.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.69.0",
-    "jsii-rosetta": "^1.69.0",
-    "semver": "^7.3.7",
+    "jsii-reflect": "^1.71.0",
+    "jsii-rosetta": "^1.71.0",
+    "semver": "^7.3.8",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.69.0",
-    "@jsii/java-runtime": "^1.69.0",
-    "@jsii/go-runtime": "^1.69.0",
-    "@scope/jsii-calc-lib": "^1.69.0",
+    "@jsii/dotnet-runtime": "^1.71.0",
+    "@jsii/java-runtime": "^1.71.0",
+    "@jsii/go-runtime": "^1.71.0",
+    "@scope/jsii-calc-lib": "^1.71.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.12",
+    "@types/semver": "^7.3.13",
     "diff": "^5.1.0",
-    "jsii": "^1.69.0",
-    "jsii-build-tools": "^1.69.0",
+    "jsii": "^1.71.0",
+    "jsii-build-tools": "^1.71.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.272"
+    "pyright": "^1.1.278"
   },
   "keywords": [
     "jsii",