jsii-pacmak 1.80.0 → 1.82.0

package/bin/jsii-pacmak.js

@@ -152,8 +152,7 @@ const version_1 = require("../lib/version");
         desc: 'Whether jsii assemblies should be validated. This can be expensive and is skipped by default.',
         default: false,
     })
-        .version(version_1.VERSION_DESC)
-        .strict().argv;
+        .version(version_1.VERSION_DESC).argv;
     (0, lib_1.configureLogging)({ level: argv.verbose !== undefined ? argv.verbose : 0 });
     // Default to 4 threads in case of concurrency, good enough for most situations
     (0, logging_1.debug)('command line arguments:', argv);

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import './suppress-jsii-upgrade-prompts';
 import { UnknownSnippetMode } from 'jsii-rosetta';
 import { TargetName } from './targets';
 import { Timers } from './timer';

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pacmak = exports.configureLogging = exports.TargetName = void 0;
+require("./suppress-jsii-upgrade-prompts");
 const jsii_reflect_1 = require("jsii-reflect");
 const jsii_rosetta_1 = require("jsii-rosetta");
 const path_1 = require("path");

package/lib/suppress-jsii-upgrade-prompts.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=suppress-jsii-upgrade-prompts.d.ts.map

package/lib/suppress-jsii-upgrade-prompts.js

@@ -0,0 +1,4 @@
+"use strict";
+// Suppress the upgrade prompt from jsii and jsii-rosetta
+process.env.JSII_SUPPRESS_UPGRADE_PROMPT = '1';
+//# sourceMappingURL=suppress-jsii-upgrade-prompts.js.map

package/lib/targets/go/package.js

@@ -12,6 +12,7 @@ const util_1 = require("./util");
 const version_file_1 = require("./version-file");
 exports.GOMOD_FILENAME = 'go.mod';
 exports.GO_VERSION = '1.18';
+const MAIN_FILE = 'main.go';
 /*
  * Package represents a single `.go` source file within a package. This can be the root package file or a submodule
  */
@@ -141,10 +142,9 @@ class Package {
         // as a consequence.
         if (this.types.length > 0) {
             const { code } = context;
-            const initFile = (0, path_1.join)(this.directory, `main.go`);
+            const initFile = (0, path_1.join)(this.directory, MAIN_FILE);
             code.openFile(initFile);
-            code.line(`package ${this.packageName}`);
-            code.line();
+            this.emitHeader(code);
             importGoModules(code, [dependencies_1.GO_REFLECT, dependencies_1.JSII_RT_MODULE]);
             code.line();
             code.openBlock('func init()');
@@ -332,7 +332,10 @@ class RootPackage extends Package {
             new RootPackage(dep.assembly, this.rootPackageCache));
     }
     emitHeader(code) {
-        if (this.assembly.description !== '') {
+        const currentFilePath = code.getCurrentFilePath();
+        if (this.assembly.description !== '' &&
+            currentFilePath !== undefined &&
+            currentFilePath.includes(MAIN_FILE)) {
             code.line(`// ${this.assembly.description}`);
         }
         code.line(`package ${this.packageName}`);

package/lib/targets/java.js

@@ -351,6 +351,10 @@ class JavaGenerator extends generator_1.Generator {
         if (!propertyName) {
             return propertyName;
         }
+        if (propertyName === '_') {
+            // Slightly different pattern for this one
+            return '__';
+        }
         if (JavaGenerator.RESERVED_KEYWORDS.includes(propertyName)) {
             return `${propertyName}Value`;
         }
@@ -364,6 +368,10 @@ class JavaGenerator extends generator_1.Generator {
         if (!methodName) {
             return methodName;
         }
+        if (methodName === '_') {
+            // Different pattern for this one. Also this should never happen, who names a function '_' ??
+            return 'doIt';
+        }
         if (JavaGenerator.RESERVED_KEYWORDS.includes(methodName)) {
             return `do${(0, naming_util_1.jsiiToPascalCase)(methodName)}`;
         }
@@ -661,7 +669,7 @@ class JavaGenerator extends generator_1.Generator {
         this.code.openFile(packageInfoFile);
         this.code.line('/**');
         if (mod.readme) {
-            for (const line of (0, jsii_rosetta_1.markDownToJavaDoc)(this.convertSamplesInMarkdown(mod.readme.markdown, {
+            for (const line of myMarkDownToJavaDoc(this.convertSamplesInMarkdown(mod.readme.markdown, {
                 api: 'moduleReadme',
                 moduleFqn: mod.name,
             })).split('\n')) {
@@ -688,7 +696,7 @@ class JavaGenerator extends generator_1.Generator {
         this.code.openFile(packageInfoFile);
         this.code.line('/**');
         if (mod.readme) {
-            for (const line of (0, jsii_rosetta_1.markDownToJavaDoc)(this.convertSamplesInMarkdown(mod.readme.markdown, {
+            for (const line of myMarkDownToJavaDoc(this.convertSamplesInMarkdown(mod.readme.markdown, {
                 api: 'moduleReadme',
                 moduleFqn,
             })).split('\n')) {
@@ -798,6 +806,8 @@ class JavaGenerator extends generator_1.Generator {
                                         '-J-XX:+TieredCompilation',
                                         '-J-XX:TieredStopAtLevel=1',
                                     ],
+                                    doclint: 'none',
+                                    quiet: 'true',
                                 },
                             },
                             {
@@ -1529,7 +1539,7 @@ class JavaGenerator extends generator_1.Generator {
         // Final build method
         this.code.line();
         this.code.line('/**');
-        this.code.line(` * @returns a newly built instance of {@link ${builtType}}.`);
+        this.code.line(` * @return a newly built instance of {@link ${builtType}}.`);
         this.code.line(' */');
         this.emitStabilityAnnotations(cls.initializer);
         this.code.line('@Override');
@@ -1567,7 +1577,7 @@ class JavaGenerator extends generator_1.Generator {
             this.code.line(` * ${paramJavadoc(prop.fieldName, prop.nullable, summary)}`);
             if (prop.docs?.remarks != null) {
                 const indent = ' '.repeat(7 + prop.fieldName.length);
-                const remarks = (0, jsii_rosetta_1.markDownToJavaDoc)(this.convertSamplesInMarkdown(prop.docs.remarks, {
+                const remarks = myMarkDownToJavaDoc(this.convertSamplesInMarkdown(prop.docs.remarks, {
                     api: 'member',
                     fqn: prop.definingType.fqn,
                     memberName: prop.jsiiName,
@@ -1848,13 +1858,13 @@ class JavaGenerator extends generator_1.Generator {
         const docs = (doc.docs = doc.docs ?? {});
         const paras = [];
         if (docs.summary) {
-            paras.push((0, _utils_1.renderSummary)(docs));
+            paras.push(stripNewLines(myMarkDownToJavaDoc((0, _utils_1.renderSummary)(docs))));
         }
         else if (defaultText) {
-            paras.push(defaultText);
+            paras.push(myMarkDownToJavaDoc(defaultText));
         }
         if (docs.remarks) {
-            paras.push((0, jsii_rosetta_1.markDownToJavaDoc)(this.convertSamplesInMarkdown(docs.remarks, apiLoc)).trimRight());
+            paras.push(myMarkDownToJavaDoc(this.convertSamplesInMarkdown(docs.remarks, apiLoc)).trimRight());
         }
         if (docs.default) {
             paras.push(`Default: ${docs.default}`); // NOTE: there is no annotation in JavaDoc for this
@@ -1873,17 +1883,17 @@ class JavaGenerator extends generator_1.Generator {
             //
             // Hence, we just resort to HTML-encoding everything (same as we do for code
             // examples that have been translated from MarkDown).
-            paras.push((0, jsii_rosetta_1.markDownToJavaDoc)(['```', convertedExample, '```'].join('\n')));
+            paras.push(myMarkDownToJavaDoc(['```', convertedExample, '```'].join('\n')));
         }
         const tagLines = [];
         if (docs.returns) {
-            tagLines.push(`@return ${docs.returns}`);
+            tagLines.push(`@return ${myMarkDownToJavaDoc(docs.returns)}`);
         }
         if (docs.see) {
             tagLines.push(`@see <a href="${escape(docs.see)}">${escape(docs.see)}</a>`);
         }
         if (docs.deprecated) {
-            tagLines.push(`@deprecated ${docs.deprecated}`);
+            tagLines.push(`@deprecated ${myMarkDownToJavaDoc(docs.deprecated)}`);
         }
         // Params
         if (doc.parameters) {
@@ -2406,6 +2416,7 @@ JavaGenerator.RESERVED_KEYWORDS = [
     'void',
     'volatile',
     'while',
+    '_',
 ];
 /**
  * Looks up the `@jsii/java-runtime` package from the local repository.
@@ -2435,7 +2446,7 @@ function isNullable(optionalValue) {
 function paramJavadoc(name, optional, summary) {
     const parts = ['@param', name];
     if (summary) {
-        parts.push(endWithPeriod(summary));
+        parts.push(stripNewLines(myMarkDownToJavaDoc(endWithPeriod(summary))));
     }
     if (!optional) {
         parts.push('This parameter is required.');
@@ -2588,4 +2599,18 @@ function containsUnionType(typeRef) {
         (spec.isCollectionTypeReference(typeRef) &&
             containsUnionType(typeRef.collection.elementtype)));
 }
+function myMarkDownToJavaDoc(source) {
+    if (source.includes('{@link') || source.includes('{@code')) {
+        // Slightly dirty hack: if we are seeing this, it means the docstring was provided literally
+        // in this file. These strings are safe to not be escaped, and in fact escaping them will
+        // break them: they will turn into `{&#64;`, which breaks the JavaDoc markup.
+        //
+        // Since docstring do not (or at least should not) contain JavaDoc literals, this is safe.
+        return source;
+    }
+    return (0, jsii_rosetta_1.markDownToJavaDoc)(source);
+}
+function stripNewLines(x) {
+    return x.replace(/\n/g, '');
+}
 //# sourceMappingURL=java.js.map

package/lib/version.d.ts

@@ -1,5 +1,5 @@
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 export declare const VERSION: string;
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION_DESC = "1.80.0 (build bce6a1d)";
+export declare const VERSION_DESC = "1.82.0 (build 2d2ddd7)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2023-04-04T15:19:12Z by generate.sh
+// Generated at 2023-05-22T21:03:18Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION_DESC = exports.VERSION = void 0;
 /** The short version number for this jsii-pacmak release (e.g: `X.Y.Z`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-exports.VERSION = '1.80.0';
+exports.VERSION = '1.82.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.80.0 (build bce6a1d)';
+exports.VERSION_DESC = '1.82.0 (build 2d2ddd7)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.80.0",
+  "version": "1.82.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.80.0",
-    "@jsii/spec": "^1.80.0",
+    "@jsii/check-node": "1.82.0",
+    "@jsii/spec": "^1.82.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.80.0",
+    "codemaker": "^1.82.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.80.0",
-    "jsii-rosetta": "^1.80.0",
-    "semver": "^7.3.8",
+    "jsii-reflect": "^1.82.0",
+    "jsii-rosetta": "^1.82.0",
+    "semver": "^7.5.1",
     "spdx-license-list": "^6.6.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.80.0",
-    "@jsii/java-runtime": "^1.80.0",
-    "@jsii/go-runtime": "^1.80.0",
-    "@scope/jsii-calc-lib": "^1.80.0",
+    "@jsii/dotnet-runtime": "^1.82.0",
+    "@jsii/java-runtime": "^1.82.0",
+    "@jsii/go-runtime": "^1.82.0",
+    "@scope/jsii-calc-lib": "^1.82.0",
     "@types/clone": "^2.1.1",
     "@types/diff": "^5.0.3",
     "@types/commonmark": "^0.27.6",
     "@types/fs-extra": "^9.0.13",
-    "@types/semver": "^7.3.13",
+    "@types/semver": "^7.5.0",
     "diff": "^5.1.0",
-    "jsii": "^1.80.0",
-    "jsii-build-tools": "^1.80.0",
+    "jsii": "^1.82.0",
+    "jsii-build-tools": "^1.82.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.301"
+    "pyright": "^1.1.309"
   },
   "keywords": [
     "jsii",