jsii 5.4.34-dev.0 → 5.4.34-dev.2

package/lib/utils.d.ts

@@ -1,5 +1,9 @@
 import * as log4js from 'log4js';
 import * as ts from 'typescript';
+/**
+ * Name of the logger for cli errors
+ */
+export declare const CLI_LOGGER = "jsii/cli";
 /**
  * Name of the logger for diagnostics information
  */
@@ -61,4 +65,19 @@ export declare function stripAnsi(x: string): string;
 export type Mutable<T> = {
     -readonly [K in keyof T]: Mutable<T[K]>;
 };
+/**
+ * Throws an error that is intended as CLI output.
+ */
+export declare class JsiiError extends Error {
+    readonly message: string;
+    readonly showHelp: boolean;
+    /**
+     * An expected error that can be nicely formatted where needed (e.g. in CLI output)
+     * This should only be used for errors that a user can fix themselves.
+     *
+     * @param message The error message to be printed to the user.
+     * @param showHelp Print the help before the error.
+     */
+    constructor(message: string, showHelp?: boolean);
+}
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripAnsi = exports.parseRepository = exports.parsePerson = exports.logDiagnostic = exports._formatDiagnostic = exports.formatDiagnostic = exports.diagnosticsLogger = exports.JSII_DIAGNOSTICS_CODE = exports.DIAGNOSTICS = void 0;
+exports.JsiiError = exports.stripAnsi = exports.parseRepository = exports.parsePerson = exports.logDiagnostic = exports._formatDiagnostic = exports.formatDiagnostic = exports.diagnosticsLogger = exports.JSII_DIAGNOSTICS_CODE = exports.DIAGNOSTICS = exports.CLI_LOGGER = void 0;
 const log4js = require("log4js");
 const ts = require("typescript");
 const jsii_diagnostic_1 = require("./jsii-diagnostic");
+/**
+ * Name of the logger for cli errors
+ */
+exports.CLI_LOGGER = 'jsii/cli';
 /**
  * Name of the logger for diagnostics information
  */
@@ -108,7 +112,7 @@ const PERSON_REGEX = /^\s*(.+?)(?:\s*<([^>]+)>)?(?:\s*\(([^)]+)\))?\s*$/;
 function parsePerson(value) {
     const match = PERSON_REGEX.exec(value);
     if (!match) {
-        throw new Error(`Invalid stringified "person" value: ${value}`);
+        throw new JsiiError(`Invalid stringified "person" value: ${value}`);
     }
     const [, name, email, url] = match;
     const result = {
@@ -140,7 +144,7 @@ function parseRepository(value) {
         case 'gitlab':
             return { url: `https://gitlab.com/${slug}.git` };
         default:
-            throw new Error(`Unknown host service: ${host}`);
+            throw new JsiiError(`Unknown repository hosting service: ${host}`);
     }
 }
 exports.parseRepository = parseRepository;
@@ -151,4 +155,23 @@ function stripAnsi(x) {
     return x.replace(ANSI_REGEX, '');
 }
 exports.stripAnsi = stripAnsi;
+/**
+ * Throws an error that is intended as CLI output.
+ */
+class JsiiError extends Error {
+    /**
+     * An expected error that can be nicely formatted where needed (e.g. in CLI output)
+     * This should only be used for errors that a user can fix themselves.
+     *
+     * @param message The error message to be printed to the user.
+     * @param showHelp Print the help before the error.
+     */
+    constructor(message, showHelp = false) {
+        super(message);
+        this.message = message;
+        this.showHelp = showHelp;
+        Object.setPrototypeOf(this, JsiiError.prototype);
+    }
+}
+exports.JsiiError = JsiiError;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import * as log4js from 'log4js';\nimport * as ts from 'typescript';\n\nimport { JsiiDiagnostic } from './jsii-diagnostic';\n\n/**\n * Name of the logger for diagnostics information\n */\nexport const DIAGNOSTICS = 'diagnostics';\n/**\n * Diagnostic code for JSII-generated messages.\n */\nexport const JSII_DIAGNOSTICS_CODE = 9999;\n\n/**\n * Obtains the relevant logger to be used for a given diagnostic message.\n *\n * @param logger     the ``log4js.Logger`` to use for emitting the message.\n * @param diagnostic the message for which a logger is requested.\n *\n * @returns a logger method of the ``logger`` for the appropriate level.\n */\nexport function diagnosticsLogger(\n  logger: log4js.Logger,\n  diagnostic: ts.Diagnostic,\n): ((message: any, ...args: any[]) => void) | undefined {\n  switch (diagnostic.category) {\n    case ts.DiagnosticCategory.Error:\n      if (!logger.isErrorEnabled()) {\n        return undefined;\n      }\n      return logger.error.bind(logger);\n    case ts.DiagnosticCategory.Warning:\n      if (!logger.isWarnEnabled()) {\n        return undefined;\n      }\n      return logger.warn.bind(logger);\n    case ts.DiagnosticCategory.Message:\n      if (!logger.isDebugEnabled()) {\n        return undefined;\n      }\n      return logger.debug.bind(logger);\n    case ts.DiagnosticCategory.Suggestion:\n    default:\n      if (!logger.isTraceEnabled()) {\n        return undefined;\n      }\n      return logger.trace.bind(logger);\n  }\n}\n\n/**\n * Formats a diagnostic message with color and context, if possible.\n *\n * @param diagnostic  the diagnostic message ot be formatted.\n * @param projectRoot the root of the TypeScript project.\n *\n * @returns a formatted string.\n */\nexport function formatDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  if (JsiiDiagnostic.isJsiiDiagnostic(diagnostic)) {\n    // Ensure we leverage pre-rendered diagnostics where available.\n    return diagnostic.format(projectRoot);\n  }\n  return _formatDiagnostic(diagnostic, projectRoot);\n}\n\n/**\n * Formats a diagnostic message with color and context, if possible. Users\n * should use `formatDiagnostic` instead, as this implementation is intended for\n * internal usafe only.\n *\n * @param diagnostic  the diagnostic message ot be formatted.\n * @param projectRoot the root of the TypeScript project.\n *\n * @returns a formatted string.\n */\nexport function _formatDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  const formatDiagnosticsHost: ts.FormatDiagnosticsHost = {\n    getCurrentDirectory: () => projectRoot,\n    getCanonicalFileName: (fileName) => fileName,\n    getNewLine: () => ts.sys.newLine,\n  };\n\n  const message =\n    diagnostic.file != null\n      ? ts.formatDiagnosticsWithColorAndContext([diagnostic], formatDiagnosticsHost)\n      : ts.formatDiagnostic(diagnostic, formatDiagnosticsHost);\n\n  if (!JsiiDiagnostic.isJsiiDiagnostic(diagnostic)) {\n    return message;\n  }\n\n  // This is our own diagnostics, so we'll format appropriately (replacing TS#### with JSII####).\n  return message.replace(` TS${JSII_DIAGNOSTICS_CODE}: `, ` JSII${diagnostic.jsiiCode}: `);\n}\n\nexport function logDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  const logFunc = diagnosticsLogger(log4js.getLogger(DIAGNOSTICS), diagnostic);\n  if (!logFunc) {\n    return;\n  }\n  logFunc(formatDiagnostic(diagnostic, projectRoot).trim());\n}\n\nconst PERSON_REGEX = /^\\s*(.+?)(?:\\s*<([^>]+)>)?(?:\\s*\\(([^)]+)\\))?\\s*$/;\n/**\n * Parses a string-formatted person entry from `package.json`.\n * @param value the string-formatted person entry.\n *\n * @example\n *  parsePerson(\"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)\");\n *  // => { name: \"Barney Rubble\", email: \"b@rubble.com\", url: \"http://barnyrubble.tumblr.com/\" }\n */\nexport function parsePerson(value: string) {\n  const match = PERSON_REGEX.exec(value);\n  if (!match) {\n    throw new Error(`Invalid stringified \"person\" value: ${value}`);\n  }\n  const [, name, email, url] = match;\n  const result: { name: string; email?: string; url?: string } = {\n    name: name.trim(),\n  };\n  if (email) {\n    result.email = email.trim();\n  }\n  if (url) {\n    result.url = url.trim();\n  }\n  return result;\n}\n\nconst REPOSITORY_REGEX = /^(?:(github|gist|bitbucket|gitlab):)?([A-Za-z\\d_-]+\\/[A-Za-z\\d_-]+)$/;\nexport function parseRepository(value: string): { url: string } {\n  const match = REPOSITORY_REGEX.exec(value);\n  if (!match) {\n    return { url: value };\n  }\n  const [, host, slug] = match;\n  switch (host ?? 'github') {\n    case 'github':\n      return { url: `https://github.com/${slug}.git` };\n    case 'gist':\n      return { url: `https://gist.github.com/${slug}.git` };\n    case 'bitbucket':\n      return { url: `https://bitbucket.org/${slug}.git` };\n    case 'gitlab':\n      return { url: `https://gitlab.com/${slug}.git` };\n    default:\n      throw new Error(`Unknown host service: ${host}`);\n  }\n}\n\nconst ANSI_REGEX =\n  // eslint-disable-next-line no-control-regex\n  /[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;\n\nexport function stripAnsi(x: string): string {\n  return x.replace(ANSI_REGEX, '');\n}\n\n/**\n * Maps the provided type to stip all `readonly` modifiers from its properties.\n */\nexport type Mutable<T> = { -readonly [K in keyof T]: Mutable<T[K]> };\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,iCAAiC;AAEjC,uDAAmD;AAEnD;;GAEG;AACU,QAAA,UAAU,GAAG,UAAU,CAAC;AACrC;;GAEG;AACU,QAAA,WAAW,GAAG,aAAa,CAAC;AACzC;;GAEG;AACU,QAAA,qBAAqB,GAAG,IAAI,CAAC;AAE1C;;;;;;;GAOG;AACH,SAAgB,iBAAiB,CAC/B,MAAqB,EACrB,UAAyB;IAEzB,QAAQ,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC5B,KAAK,EAAE,CAAC,kBAAkB,CAAC,KAAK;YAC9B,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,KAAK,EAAE,CAAC,kBAAkB,CAAC,OAAO;YAChC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;gBAC5B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClC,KAAK,EAAE,CAAC,kBAAkB,CAAC,OAAO;YAChC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,KAAK,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC;QACtC;YACE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AA3BD,8CA2BC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAAC,UAAyB,EAAE,WAAmB;IAC7E,IAAI,gCAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QAChD,+DAA+D;QAC/D,OAAO,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAND,4CAMC;AAED;;;;;;;;;GASG;AACH,SAAgB,iBAAiB,CAAC,UAAyB,EAAE,WAAmB;IAC9E,MAAM,qBAAqB,GAA6B;QACtD,mBAAmB,EAAE,GAAG,EAAE,CAAC,WAAW;QACtC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ;QAC5C,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO;KACjC,CAAC;IAEF,MAAM,OAAO,GACX,UAAU,CAAC,IAAI,IAAI,IAAI;QACrB,CAAC,CAAC,EAAE,CAAC,oCAAoC,CAAC,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAC;QAC9E,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;IAE7D,IAAI,CAAC,gCAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,+FAA+F;IAC/F,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,6BAAqB,IAAI,EAAE,QAAQ,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;AAC3F,CAAC;AAlBD,8CAkBC;AAED,SAAgB,aAAa,CAAC,UAAyB,EAAE,WAAmB;IAC1E,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAW,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC;AAND,sCAMC;AAED,MAAM,YAAY,GAAG,mDAAmD,CAAC;AACzE;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,SAAS,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;IACnC,MAAM,MAAM,GAAmD;QAC7D,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;KAClB,CAAC;IACF,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IACD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,kCAgBC;AAED,MAAM,gBAAgB,GAAG,sEAAsE,CAAC;AAChG,SAAgB,eAAe,CAAC,KAAa;IAC3C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC;IAC7B,QAAQ,IAAI,IAAI,QAAQ,EAAE,CAAC;QACzB,KAAK,QAAQ;YACX,OAAO,EAAE,GAAG,EAAE,sBAAsB,IAAI,MAAM,EAAE,CAAC;QACnD,KAAK,MAAM;YACT,OAAO,EAAE,GAAG,EAAE,2BAA2B,IAAI,MAAM,EAAE,CAAC;QACxD,KAAK,WAAW;YACd,OAAO,EAAE,GAAG,EAAE,yBAAyB,IAAI,MAAM,EAAE,CAAC;QACtD,KAAK,QAAQ;YACX,OAAO,EAAE,GAAG,EAAE,sBAAsB,IAAI,MAAM,EAAE,CAAC;QACnD;YACE,MAAM,IAAI,SAAS,CAAC,uCAAuC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAlBD,0CAkBC;AAED,MAAM,UAAU;AACd,4CAA4C;AAC5C,6EAA6E,CAAC;AAEhF,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC;AAOD;;GAEG;AACH,MAAa,SAAU,SAAQ,KAAK;IAClC;;;;;;OAMG;IACH,YAAqC,OAAe,EAAkB,WAAW,KAAK;QACpF,KAAK,CAAC,OAAO,CAAC,CAAC;QADoB,YAAO,GAAP,OAAO,CAAQ;QAAkB,aAAQ,GAAR,QAAQ,CAAQ;QAEpF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;CACF;AAZD,8BAYC","sourcesContent":["import * as log4js from 'log4js';\nimport * as ts from 'typescript';\n\nimport { JsiiDiagnostic } from './jsii-diagnostic';\n\n/**\n * Name of the logger for cli errors\n */\nexport const CLI_LOGGER = 'jsii/cli';\n/**\n * Name of the logger for diagnostics information\n */\nexport const DIAGNOSTICS = 'diagnostics';\n/**\n * Diagnostic code for JSII-generated messages.\n */\nexport const JSII_DIAGNOSTICS_CODE = 9999;\n\n/**\n * Obtains the relevant logger to be used for a given diagnostic message.\n *\n * @param logger     the ``log4js.Logger`` to use for emitting the message.\n * @param diagnostic the message for which a logger is requested.\n *\n * @returns a logger method of the ``logger`` for the appropriate level.\n */\nexport function diagnosticsLogger(\n  logger: log4js.Logger,\n  diagnostic: ts.Diagnostic,\n): ((message: any, ...args: any[]) => void) | undefined {\n  switch (diagnostic.category) {\n    case ts.DiagnosticCategory.Error:\n      if (!logger.isErrorEnabled()) {\n        return undefined;\n      }\n      return logger.error.bind(logger);\n    case ts.DiagnosticCategory.Warning:\n      if (!logger.isWarnEnabled()) {\n        return undefined;\n      }\n      return logger.warn.bind(logger);\n    case ts.DiagnosticCategory.Message:\n      if (!logger.isDebugEnabled()) {\n        return undefined;\n      }\n      return logger.debug.bind(logger);\n    case ts.DiagnosticCategory.Suggestion:\n    default:\n      if (!logger.isTraceEnabled()) {\n        return undefined;\n      }\n      return logger.trace.bind(logger);\n  }\n}\n\n/**\n * Formats a diagnostic message with color and context, if possible.\n *\n * @param diagnostic  the diagnostic message ot be formatted.\n * @param projectRoot the root of the TypeScript project.\n *\n * @returns a formatted string.\n */\nexport function formatDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  if (JsiiDiagnostic.isJsiiDiagnostic(diagnostic)) {\n    // Ensure we leverage pre-rendered diagnostics where available.\n    return diagnostic.format(projectRoot);\n  }\n  return _formatDiagnostic(diagnostic, projectRoot);\n}\n\n/**\n * Formats a diagnostic message with color and context, if possible. Users\n * should use `formatDiagnostic` instead, as this implementation is intended for\n * internal usafe only.\n *\n * @param diagnostic  the diagnostic message ot be formatted.\n * @param projectRoot the root of the TypeScript project.\n *\n * @returns a formatted string.\n */\nexport function _formatDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  const formatDiagnosticsHost: ts.FormatDiagnosticsHost = {\n    getCurrentDirectory: () => projectRoot,\n    getCanonicalFileName: (fileName) => fileName,\n    getNewLine: () => ts.sys.newLine,\n  };\n\n  const message =\n    diagnostic.file != null\n      ? ts.formatDiagnosticsWithColorAndContext([diagnostic], formatDiagnosticsHost)\n      : ts.formatDiagnostic(diagnostic, formatDiagnosticsHost);\n\n  if (!JsiiDiagnostic.isJsiiDiagnostic(diagnostic)) {\n    return message;\n  }\n\n  // This is our own diagnostics, so we'll format appropriately (replacing TS#### with JSII####).\n  return message.replace(` TS${JSII_DIAGNOSTICS_CODE}: `, ` JSII${diagnostic.jsiiCode}: `);\n}\n\nexport function logDiagnostic(diagnostic: ts.Diagnostic, projectRoot: string) {\n  const logFunc = diagnosticsLogger(log4js.getLogger(DIAGNOSTICS), diagnostic);\n  if (!logFunc) {\n    return;\n  }\n  logFunc(formatDiagnostic(diagnostic, projectRoot).trim());\n}\n\nconst PERSON_REGEX = /^\\s*(.+?)(?:\\s*<([^>]+)>)?(?:\\s*\\(([^)]+)\\))?\\s*$/;\n/**\n * Parses a string-formatted person entry from `package.json`.\n * @param value the string-formatted person entry.\n *\n * @example\n *  parsePerson(\"Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)\");\n *  // => { name: \"Barney Rubble\", email: \"b@rubble.com\", url: \"http://barnyrubble.tumblr.com/\" }\n */\nexport function parsePerson(value: string) {\n  const match = PERSON_REGEX.exec(value);\n  if (!match) {\n    throw new JsiiError(`Invalid stringified \"person\" value: ${value}`);\n  }\n  const [, name, email, url] = match;\n  const result: { name: string; email?: string; url?: string } = {\n    name: name.trim(),\n  };\n  if (email) {\n    result.email = email.trim();\n  }\n  if (url) {\n    result.url = url.trim();\n  }\n  return result;\n}\n\nconst REPOSITORY_REGEX = /^(?:(github|gist|bitbucket|gitlab):)?([A-Za-z\\d_-]+\\/[A-Za-z\\d_-]+)$/;\nexport function parseRepository(value: string): { url: string } {\n  const match = REPOSITORY_REGEX.exec(value);\n  if (!match) {\n    return { url: value };\n  }\n  const [, host, slug] = match;\n  switch (host ?? 'github') {\n    case 'github':\n      return { url: `https://github.com/${slug}.git` };\n    case 'gist':\n      return { url: `https://gist.github.com/${slug}.git` };\n    case 'bitbucket':\n      return { url: `https://bitbucket.org/${slug}.git` };\n    case 'gitlab':\n      return { url: `https://gitlab.com/${slug}.git` };\n    default:\n      throw new JsiiError(`Unknown repository hosting service: ${host}`);\n  }\n}\n\nconst ANSI_REGEX =\n  // eslint-disable-next-line no-control-regex\n  /[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;\n\nexport function stripAnsi(x: string): string {\n  return x.replace(ANSI_REGEX, '');\n}\n\n/**\n * Maps the provided type to stip all `readonly` modifiers from its properties.\n */\nexport type Mutable<T> = { -readonly [K in keyof T]: Mutable<T[K]> };\n\n/**\n * Throws an error that is intended as CLI output.\n */\nexport class JsiiError extends Error {\n  /**\n   * An expected error that can be nicely formatted where needed (e.g. in CLI output)\n   * This should only be used for errors that a user can fix themselves.\n   *\n   * @param message The error message to be printed to the user.\n   * @param showHelp Print the help before the error.\n   */\n  constructor(public override readonly message: string, public readonly showHelp = false) {\n    super(message);\n    Object.setPrototypeOf(this, JsiiError.prototype);\n  }\n}\n"]}

package/lib/version.d.ts

@@ -1,7 +1,7 @@
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
-export declare const SHORT_VERSION = "5.4.34-dev.0";
+export declare const SHORT_VERSION = "5.4.34-dev.2";
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-export declare const VERSION = "5.4.34-dev.0 (build aa3b066)";
+export declare const VERSION = "5.4.34-dev.2 (build 48fa62e)";
 /** The release line identifier for this JSII compiler (e.g: `X.Y`) */
 export declare const RELEASE_LINE = "5.4";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -4,9 +4,9 @@ exports.RELEASE_LINE = exports.VERSION = exports.SHORT_VERSION = void 0;
 const typescript_1 = require("typescript");
 // GENERATED: This file is generated by build-tools/code-gen.ts -- Do not edit by hand!
 /** The short version number for this JSII compiler (e.g: `X.Y.Z`) */
-exports.SHORT_VERSION = '5.4.34-dev.0';
+exports.SHORT_VERSION = '5.4.34-dev.2';
 /** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION = '5.4.34-dev.0 (build aa3b066)';
+exports.VERSION = '5.4.34-dev.2 (build 48fa62e)';
 /** The release line identifier for this JSII compiler (e.g: `X.Y`) */
 exports.RELEASE_LINE = typescript_1.versionMajorMinor;
 //# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAE/C,uFAAuF;AAEvF,qEAAqE;AACxD,QAAA,aAAa,GAAG,cAAc,CAAC;AAE5C,yFAAyF;AAC5E,QAAA,OAAO,GAAG,8BAA8B,CAAC;AAEtD,sEAAsE;AACzD,QAAA,YAAY,GAAG,8BAAiB,CAAC","sourcesContent":["import { versionMajorMinor } from 'typescript';\n\n// GENERATED: This file is generated by build-tools/code-gen.ts -- Do not edit by hand!\n\n/** The short version number for this JSII compiler (e.g: `X.Y.Z`) */\nexport const SHORT_VERSION = '5.4.34-dev.0';\n\n/** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */\nexport const VERSION = '5.4.34-dev.0 (build aa3b066)';\n\n/** The release line identifier for this JSII compiler (e.g: `X.Y`) */\nexport const RELEASE_LINE = versionMajorMinor;\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAE/C,uFAAuF;AAEvF,qEAAqE;AACxD,QAAA,aAAa,GAAG,cAAc,CAAC;AAE5C,yFAAyF;AAC5E,QAAA,OAAO,GAAG,8BAA8B,CAAC;AAEtD,sEAAsE;AACzD,QAAA,YAAY,GAAG,8BAAiB,CAAC","sourcesContent":["import { versionMajorMinor } from 'typescript';\n\n// GENERATED: This file is generated by build-tools/code-gen.ts -- Do not edit by hand!\n\n/** The short version number for this JSII compiler (e.g: `X.Y.Z`) */\nexport const SHORT_VERSION = '5.4.34-dev.2';\n\n/** The qualified version number for this JSII compiler (e.g: `X.Y.Z (build #######)`) */\nexport const VERSION = '5.4.34-dev.2 (build 48fa62e)';\n\n/** The release line identifier for this JSII compiler (e.g: `X.Y`) */\nexport const RELEASE_LINE = versionMajorMinor;\n"]}

package/package.json

@@ -64,7 +64,7 @@
     "npm": "^9.9.3",
     "npm-check-updates": "^16",
     "prettier": "^2.8.8",
-    "projen": "^0.85.0",
+    "projen": "^0.85.2",
     "tar": "^6.2.1",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2"
@@ -93,7 +93,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "5.4.34-dev.0",
+  "version": "5.4.34-dev.2",
   "types": "lib/index.d.ts",
   "exports": {
     ".": "./lib/index.js",