jsii-pacmak 1.63.0 → 1.63.1

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

@@ -1,4 +1,4 @@
-import { Assembly, OptionalValue, TypeReference } from '@jsii/spec';
+import { Assembly, OptionalValue, TypeReference, Type } from '@jsii/spec';
 export interface TypeName {
     pythonType(context: NamingContext): string;
     requiredImports(context: NamingContext): PythonImports;
@@ -17,6 +17,8 @@ export interface PythonImports {
 export interface NamingContext {
     /** The assembly in which the PythonType is expressed. */
     readonly assembly: Assembly;
+    /** A resolver to obtain complete information about a type. */
+    readonly typeResolver: (fqn: string) => Type;
     /** The submodule of the assembly in which the PythonType is expressed (could be the module root) */
     readonly submodule: string;
     /**

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

@@ -193,11 +193,18 @@ class UserType {
         }
         return { [requiredImport.sourcePackage]: new Set([requiredImport.item]) };
     }
-    resolve({ assembly, emittedTypes, submodule, surroundingTypeFqns, typeAnnotation = true, }) {
+    resolve({ assembly, emittedTypes, submodule, surroundingTypeFqns, typeAnnotation = true, parameterType, typeResolver, }) {
         const { assemblyName, packageName, pythonFqn } = toPythonFqn(__classPrivateFieldGet(this, _UserType_fqn, "f"), assembly);
+        // If this is a type annotation for a parameter, allow dicts to be passed where structs are expected.
+        const type = typeResolver(__classPrivateFieldGet(this, _UserType_fqn, "f"));
+        const isStruct = (0, spec_1.isInterfaceType)(type) && !!type.datatype;
+        const wrapType = typeAnnotation && parameterType && isStruct
+            ? (pyType) => `typing.Union[${pyType}, typing.Dict[str, typing.Any]]`
+            : (pyType) => pyType;
         if (assemblyName !== assembly.name) {
             return {
-                pythonType: pythonFqn,
+                // If it's a struct, then we allow passing as a dict, too...
+                pythonType: wrapType(pythonFqn),
                 requiredImport: {
                     sourcePackage: packageName,
                     item: '',
@@ -219,7 +226,7 @@ class UserType {
                 (!emittedTypes.has(__classPrivateFieldGet(this, _UserType_fqn, "f")) || nestingParent != null)) {
                 // Possibly a forward reference, outputting the stringifierd python FQN
                 return {
-                    pythonType: JSON.stringify(pythonFqn.substring(submodulePythonName.length + 1)),
+                    pythonType: wrapType(JSON.stringify(pythonFqn.substring(submodulePythonName.length + 1))),
                 };
             }
             if (!typeAnnotation && nestingParent) {
@@ -230,7 +237,7 @@ class UserType {
             }
             // We'll just make a module-qualified reference at this point.
             return {
-                pythonType: pythonFqn.substring(submodulePythonName.length + 1),
+                pythonType: wrapType(pythonFqn.substring(submodulePythonName.length + 1)),
             };
         }
         const [toImport, ...nested] = pythonFqn

package/lib/targets/python.js

@@ -1726,6 +1726,7 @@ class PythonGenerator extends generator_1.Generator {
             emittedTypes: new Set(),
             resolver,
             submodule: assm.name,
+            typeResolver: (fqn) => resolver.dereference(fqn),
         });
     }
     /**

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.63.0";
+export declare const VERSION = "1.63.1";
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.63.0 (build 7c24e36)";
+export declare const VERSION_DESC = "1.63.1 (build 185bb34)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,9 +1,9 @@
 "use strict";
-// Generated at 2022-07-26T16:29:28Z by generate.sh
+// Generated at 2022-07-27T18:06:20Z 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.63.0';
+exports.VERSION = '1.63.1';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.63.0 (build 7c24e36)';
+exports.VERSION_DESC = '1.63.1 (build 185bb34)';
 //# sourceMappingURL=version.js.map

package/package.json

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