jsii-pacmak 1.65.0 → 1.65.1

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

@@ -217,7 +217,7 @@ class UserType {
             // Identify declarations that are not yet initialized and hence cannot be
             // used as part of a type qualification. Since this is not a forward
             // reference, the type was already emitted and its un-qualified name must
-            // be used instead of it's locally qualified name.
+            // be used instead of its locally qualified name.
             const nestingParent = surroundingTypeFqns
                 ?.map((fqn) => toPythonFqn(fqn, assembly).pythonFqn)
                 ?.reverse()
@@ -233,7 +233,7 @@ class UserType {
                 // This is not for a type annotation, so we should be at a point in time
                 // where the surrounding symbol has been defined entirely, so we can
                 // refer to it "normally" now.
-                return { pythonType: pythonFqn.substring(nestingParent.length + 1) };
+                return { pythonType: pythonFqn.slice(packageName.length + 1) };
             }
             // We'll just make a module-qualified reference at this point.
             return {
@@ -251,7 +251,7 @@ class UserType {
             .substring(0, 8);
         const alias = `_${toImport}_${aliasSuffix}`;
         return {
-            pythonType: [alias, ...nested].join('.'),
+            pythonType: wrapType([alias, ...nested].join('.')),
             requiredImport: {
                 sourcePackage: relativeImportPath(submodulePythonName, typeSubmodulePythonName),
                 item: `${toImport} as ${alias}`,

package/lib/targets/python.js

@@ -394,6 +394,7 @@ class BaseMethod {
                     const paramType = (0, type_name_1.toTypeName)(prop.prop).pythonType({
                         ...context,
                         parameterType: true,
+                        typeAnnotation: true,
                     });
                     const paramDefault = prop.prop.optional ? ' = None' : '';
                     pythonParams.push(`${paramName}: ${paramType}${paramDefault}`);
@@ -739,7 +740,10 @@ class Struct extends BasePythonClassType {
         // Re-type struct arguments that were passed as "dict". Do this before validating argument types...
         for (const member of members.filter((m) => m.isStruct(this.generator))) {
             // Note that "None" is NOT an instance of dict (that's convenient!)
-            const typeName = (0, type_name_1.toPythonFullName)(member.type.type.fqn, context.assembly);
+            const typeName = (0, type_name_1.toTypeName)(member.type.type).pythonType({
+                ...context,
+                typeAnnotation: false,
+            });
             code.openBlock(`if isinstance(${member.pythonName}, dict)`);
             code.line(`${member.pythonName} = ${typeName}(**${member.pythonName})`);
             code.closeBlock();

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.0";
+export declare const VERSION = "1.65.1";
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.65.0 (build 7a02b7f)";
+export declare const VERSION_DESC = "1.65.1 (build b0947e4)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,9 +1,9 @@
 "use strict";
-// Generated at 2022-08-18T14:34:45Z by generate.sh
+// Generated at 2022-08-29T17:36:17Z 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.0';
+exports.VERSION = '1.65.1';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.65.0 (build 7a02b7f)';
+exports.VERSION_DESC = '1.65.1 (build b0947e4)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.65.0",
+  "version": "1.65.1",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,33 +37,33 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.65.0",
-    "@jsii/spec": "^1.65.0",
+    "@jsii/check-node": "1.65.1",
+    "@jsii/spec": "^1.65.1",
     "clone": "^2.1.2",
-    "codemaker": "^1.65.0",
+    "codemaker": "^1.65.1",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.65.0",
-    "jsii-rosetta": "^1.65.0",
+    "jsii-reflect": "^1.65.1",
+    "jsii-rosetta": "^1.65.1",
     "semver": "^7.3.7",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.65.0",
-    "@jsii/java-runtime": "^1.65.0",
-    "@jsii/go-runtime": "^1.65.0",
-    "@scope/jsii-calc-lib": "^1.65.0",
+    "@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",
     "@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",
     "diff": "^5.1.0",
-    "jsii": "^1.65.0",
-    "jsii-build-tools": "^1.65.0",
+    "jsii": "^1.65.1",
+    "jsii-build-tools": "^1.65.1",
     "jsii-calc": "^3.20.120",
     "pyright": "^1.1.266"
   },