jsii-rosetta 1.76.0 → 1.77.0

package/bin/jsii-rosetta.js

@@ -426,7 +426,7 @@ function handleDiagnostics(diagnostics, fail, snippetCount = 1) {
     if (fail !== false) {
         // Fail on any diagnostic
         if (diagnostics.length > 0) {
-            (0, util_1.printDiagnostics)(diagnostics, process.stderr);
+            (0, util_1.printDiagnostics)(diagnostics, process.stderr, process.stderr.isTTY);
             logging.error([
                 `${diagnostics.length} diagnostics encountered in ${snippetCount} snippets`,
                 ...(fail === true ? ["(running with '--fail')"] : []),
@@ -439,7 +439,7 @@ function handleDiagnostics(diagnostics, fail, snippetCount = 1) {
     // (so it's very clear what is failing the build), otherwise print everything.
     const strictDiagnostics = diagnostics.filter((diag) => diag.isFromStrictAssembly);
     if (strictDiagnostics.length > 0) {
-        (0, util_1.printDiagnostics)(strictDiagnostics, process.stderr);
+        (0, util_1.printDiagnostics)(strictDiagnostics, process.stderr, process.stderr.isTTY);
         const remaining = diagnostics.length - strictDiagnostics.length;
         logging.warn([
             `${strictDiagnostics.length} diagnostics from assemblies with 'strict' mode on`,
@@ -449,7 +449,7 @@ function handleDiagnostics(diagnostics, fail, snippetCount = 1) {
         return;
     }
     if (diagnostics.length > 0) {
-        (0, util_1.printDiagnostics)(diagnostics, process.stderr);
+        (0, util_1.printDiagnostics)(diagnostics, process.stderr, process.stderr.isTTY);
         logging.warn(`${diagnostics.length} diagnostics encountered in ${snippetCount} snippets`);
     }
 }

package/lib/commands/transliterate.js

@@ -68,7 +68,7 @@ async function transliterateAssembly(assemblyLocations, targetLanguages, options
             (0, logging_1.debug)(`Done transliterating ${result.name}@${result.version} to ${language} after ${then - now} milliseconds`);
         }
     }
-    rosetta.printDiagnostics(process.stderr);
+    rosetta.printDiagnostics(process.stderr, process.stderr.isTTY);
     if (rosetta.hasErrors && options.strict) {
         throw new Error('Strict mode is enabled and some examples failed compilation!');
     }

package/lib/languages/go.js

@@ -323,12 +323,13 @@ class GoVisitor extends default_1.DefaultVisitor {
             ts.isClassDeclaration(expressionType.symbol.valueDeclaration) &&
             (ts.isPropertyDeclaration(valueSymbol.valueDeclaration) || ts.isAccessor(valueSymbol.valueDeclaration));
         const isClassStaticMethodAccess = isStaticMember && !isClassStaticPropertyAccess && ts.isMethodDeclaration(valueSymbol.valueDeclaration);
-        // When the expression has an unknown type (unresolved symbol), and has an upper-case first
-        // letter, we assume it's a type name... In such cases, what comes after can be considered a
-        // static member access. Note that the expression might be further qualified, so we check using
-        // a regex that checks for the last "."-delimited segment if there's dots in there...
+        // When the expression has an unknown type (unresolved symbol), has an upper-case first letter,
+        // and doesn't end in a call expression (as hinted by the presence of parentheses), we assume
+        // it's a type name... In such cases, what comes after can be considered a static member access.
+        // Note that the expression might be further qualified, so we check using a regex that checks
+        // for the last "." - delimited segment if there's dots in there...
         const expressionLooksLikeTypeReference = expressionType.symbol == null &&
-            /(?:\.|^)[A-Z][^.]*$/.exec(node.expression.getText(node.expression.getSourceFile())) != null;
+            /(?:\.|^)[A-Z][^.)]*$/.exec(node.expression.getText(node.expression.getSourceFile())) != null;
         // Whether the node is an enum member reference.
         const isEnumMember = expressionType?.symbol?.valueDeclaration != null && ts.isEnumDeclaration(expressionType.symbol.valueDeclaration);
         const jsiiSymbol = (0, jsii_utils_1.lookupJsiiSymbolFromNode)(renderer.typeChecker, node.name);

package/lib/rosetta-reader.d.ts

@@ -139,7 +139,7 @@ export declare class RosettaTabletReader {
      * method for documentation.
      */
     translateSnippetsInMarkdown(apiLocation: ApiLocation, markdown: string, targetLang: TargetLanguage, strict: boolean, translationToCodeBlock?: (x: Translation) => CodeBlock, compileDirectory?: string): string;
-    printDiagnostics(stream: NodeJS.WritableStream): void;
+    printDiagnostics(stream: NodeJS.WritableStream, colors?: boolean): void;
     get hasErrors(): boolean;
     private get allTablets();
     /**

package/lib/rosetta-reader.js

@@ -198,8 +198,8 @@ class RosettaTabletReader {
             return translationToCodeBlock(translated);
         }));
     }
-    printDiagnostics(stream) {
-        (0, util_1.printDiagnostics)(this.diagnostics, stream);
+    printDiagnostics(stream, colors = true) {
+        (0, util_1.printDiagnostics)(this.diagnostics, stream, colors);
     }
     get hasErrors() {
         return this.diagnostics.some((d) => d.isError);

package/lib/util.d.ts

@@ -6,7 +6,7 @@ export interface File {
     readonly contents: string;
     readonly fileName: string;
 }
-export declare function printDiagnostics(diags: readonly RosettaDiagnostic[], stream: NodeJS.WritableStream): void;
+export declare function printDiagnostics(diags: readonly RosettaDiagnostic[], stream: NodeJS.WritableStream, colors: boolean): void;
 export declare function formatList(xs: string[], n?: number): string;
 export declare const StrictBrand = "jsii.strict";
 /**

package/lib/util.js

@@ -6,11 +6,11 @@ function startsWithUppercase(x) {
     return /^[A-Z]/.exec(x) != null;
 }
 exports.startsWithUppercase = startsWithUppercase;
-function printDiagnostics(diags, stream) {
+function printDiagnostics(diags, stream, colors) {
     // Don't print too much, at some point it just clogs up the log
     const maxDiags = 50;
     for (const diag of diags.slice(0, maxDiags)) {
-        stream.write(diag.formattedMessage);
+        stream.write(colors ? diag.formattedMessage : stripColorCodes(diag.formattedMessage));
     }
     if (diags.length > maxDiags) {
         stream.write(`(...and ${diags.length - maxDiags} more diagnostics not shown)`);
@@ -198,4 +198,12 @@ async function pathExists(path) {
     }
 }
 exports.pathExists = pathExists;
+// Copy/pasted from the 'ansi-regex' package to avoid taking a dependency for this one line that will never change
+const ANSI_PATTERN = new RegExp([
+    '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+    '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))',
+].join('|'), 'g');
+function stripColorCodes(x) {
+    return x.replace(ANSI_PATTERN, '');
+}
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-rosetta",
-  "version": "1.76.0",
+  "version": "1.77.0",
   "description": "Translate TypeScript code snippets to other languages",
   "main": "lib/index.js",
   "bin": {
@@ -20,23 +20,23 @@
     "@types/mock-fs": "^4.13.1",
     "@types/workerpool": "^6.1.1",
     "@types/semver": "^7.3.13",
-    "jsii-build-tools": "1.76.0",
+    "jsii-build-tools": "1.77.0",
     "jsii-calc": "3.20.120",
     "memory-streams": "^0.1.3",
     "mock-fs": "^5.2.0"
   },
   "dependencies": {
-    "@jsii/check-node": "1.76.0",
-    "@jsii/spec": "1.76.0",
+    "@jsii/check-node": "1.77.0",
+    "@jsii/spec": "1.77.0",
     "commonmark": "^0.30.0",
     "typescript": "~3.9.10",
     "@xmldom/xmldom": "^0.8.6",
-    "workerpool": "^6.3.1",
+    "workerpool": "^6.4.0",
     "yargs": "^16.2.0",
     "semver": "^7.3.8",
     "semver-intersect": "^1.4.0",
     "fast-glob": "^3.2.12",
-    "jsii": "1.76.0"
+    "jsii": "1.77.0"
   },
   "license": "Apache-2.0",
   "author": {