jsii-pacmak 1.96.0 → 1.98.0

package/bin/jsii-pacmak.d.ts

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 import '@jsii/check-node/run';
-import '../lib/suppress-jsii-upgrade-prompts';
 //# sourceMappingURL=jsii-pacmak.d.ts.map

package/bin/jsii-pacmak.js

@@ -2,7 +2,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("@jsii/check-node/run");
-require("../lib/suppress-jsii-upgrade-prompts");
 const jsii_rosetta_1 = require("jsii-rosetta");
 const yargs = require("yargs");
 const lib_1 = require("../lib");

package/lib/builder.d.ts

@@ -1,4 +1,4 @@
-import { Rosetta } from 'jsii-rosetta';
+import { RosettaTabletReader } from 'jsii-rosetta';
 import { JsiiModule } from './packaging';
 import { TargetConstructor } from './target';
 import { TargetName } from './targets';
@@ -35,7 +35,7 @@ export interface BuildOptions {
     /**
      * The Rosetta instance to load examples from
      */
-    readonly rosetta: Rosetta;
+    readonly rosetta: RosettaTabletReader;
     /**
      * Whether to generate runtime type checking code in places where compile-time
      * type checking is not possible.

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,7 +1,6 @@
 "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");
@@ -18,7 +17,7 @@ Object.defineProperty(exports, "configureLogging", { enumerable: true, get: func
  * Generates code in the desired targets.
  */
 async function pacmak({ argv = {}, clean = true, codeOnly = false, fingerprint = true, force = false, forceSubdirectory = true, forceTarget = false, inputDirectories, outputDirectory, parallel = true, recurse = false, rosettaTablet, rosettaUnknownSnippets = undefined, runtimeTypeChecking = true, targets = Object.values(targets_1.TargetName), timers = new timer_1.Timers(), updateNpmIgnoreFiles = false, validateAssemblies = false, }) {
-    const rosetta = new jsii_rosetta_1.Rosetta({
+    const rosetta = new jsii_rosetta_1.RosettaTabletReader({
         unknownSnippets: rosettaUnknownSnippets,
         prefixDisclaimer: true,
     });

package/lib/target.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@jsii/spec';
 import * as reflect from 'jsii-reflect';
-import { Rosetta } from 'jsii-rosetta';
+import { RosettaTabletReader } from 'jsii-rosetta';
 import { IGenerator } from './generator';
 export declare abstract class Target {
     protected readonly packageDir: string;
@@ -11,7 +11,7 @@ export declare abstract class Target {
     };
     protected readonly targetName: string;
     protected readonly assembly: reflect.Assembly;
-    protected readonly rosetta: Rosetta;
+    protected readonly rosetta: RosettaTabletReader;
     protected readonly runtimeTypeChecking: boolean;
     protected abstract readonly generator: IGenerator;
     constructor(options: TargetOptions);
@@ -125,7 +125,7 @@ export interface TargetOptions {
     /** The JSII-reflect assembly for this JSII assembly */
     assembly: reflect.Assembly;
     /** The Rosetta instance */
-    rosetta: Rosetta;
+    rosetta: RosettaTabletReader;
     /** Whether to generate runtime type-checking code */
     runtimeTypeChecking: boolean;
     /**

package/lib/targets/dotnet/dotnetdocgenerator.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@jsii/spec';
 import { CodeMaker } from 'codemaker';
-import { Rosetta, ApiLocation } from 'jsii-rosetta';
+import { RosettaTabletReader, ApiLocation } from 'jsii-rosetta';
 /**
  * Generates the Jsii attributes and calls for the .NET runtime
  *
@@ -11,7 +11,7 @@ export declare class DotNetDocGenerator {
     private readonly assembly;
     private readonly code;
     private readonly nameutils;
-    constructor(code: CodeMaker, rosetta: Rosetta, assembly: spec.Assembly);
+    constructor(code: CodeMaker, rosetta: RosettaTabletReader, assembly: spec.Assembly);
     /**
      * Emits all documentation depending on what is available in the jsii model
      *
@@ -25,7 +25,7 @@ export declare class DotNetDocGenerator {
     emitDocs(obj: spec.Documentable, apiLocation: ApiLocation): void;
     emitMarkdownAsRemarks(markdown: string | undefined, apiLocation: ApiLocation): void;
     /**
-     * Returns the lines that should go into the <remarks> section
+     * Returns the lines that should go into the <remarks> section {@link http://www.google.com|Google}
      */
     private renderRemarks;
     private convertExample;

package/lib/targets/dotnet/dotnetdocgenerator.js

@@ -80,7 +80,7 @@ class DotNetDocGenerator {
         this.code.line('/// </remarks>');
     }
     /**
-     * Returns the lines that should go into the <remarks> section
+     * Returns the lines that should go into the <remarks> section {@link http://www.google.com|Google}
      */
     renderRemarks(docs, apiLocation) {
         const ret = [];

package/lib/targets/dotnet/dotnetgenerator.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@jsii/spec';
 import * as reflect from 'jsii-reflect';
-import { Rosetta } from 'jsii-rosetta';
+import { RosettaTabletReader } from 'jsii-rosetta';
 import { Generator, Legalese } from '../../generator';
 /**
  * CODE GENERATOR V2
@@ -14,7 +14,7 @@ export declare class DotNetGenerator extends Generator {
     private dotnetRuntimeGenerator;
     private dotnetDocGenerator;
     constructor(assembliesCurrentlyBeingCompiled: string[], options: {
-        readonly rosetta: Rosetta;
+        readonly rosetta: RosettaTabletReader;
         readonly runtimeTypeChecking: boolean;
     });
     load(packageRoot: string, assembly: reflect.Assembly): Promise<void>;

package/lib/targets/go/documentation.d.ts

@@ -1,10 +1,10 @@
 import { CodeMaker } from 'codemaker';
 import { Docs } from 'jsii-reflect';
-import { ApiLocation, Rosetta } from 'jsii-rosetta';
+import { ApiLocation, RosettaTabletReader } from 'jsii-rosetta';
 export declare class Documentation {
     private readonly code;
     private readonly rosetta;
-    constructor(code: CodeMaker, rosetta: Rosetta);
+    constructor(code: CodeMaker, rosetta: RosettaTabletReader);
     /**
      * Emits all documentation depending on what is available in the jsii model
      *

package/lib/targets/go.d.ts

@@ -1,5 +1,5 @@
 import { Assembly } from 'jsii-reflect';
-import { Rosetta } from 'jsii-rosetta';
+import { RosettaTabletReader } from 'jsii-rosetta';
 import { IGenerator, Legalese } from '../generator';
 import { Target, TargetOptions } from '../target';
 import { RootPackage } from './go/package';
@@ -31,7 +31,7 @@ declare class GoGenerator implements IGenerator {
     private readonly rosetta;
     private readonly runtimeTypeChecking;
     constructor(options: {
-        readonly rosetta: Rosetta;
+        readonly rosetta: RosettaTabletReader;
         readonly runtimeTypeChecking: boolean;
     });
     load(_: string, assembly: Assembly): Promise<void>;

package/lib/targets/java.d.ts

@@ -1,5 +1,5 @@
 import * as spec from '@jsii/spec';
-import { Rosetta } from 'jsii-rosetta';
+import { RosettaTabletReader } from 'jsii-rosetta';
 import { TargetBuilder, BuildOptions } from '../builder';
 import { Generator } from '../generator';
 import { JsiiModule } from '../packaging';
@@ -70,7 +70,7 @@ declare class JavaGenerator extends Generator {
     private readonly referencedModules;
     private readonly rosetta;
     constructor(options: {
-        readonly rosetta: Rosetta;
+        readonly rosetta: RosettaTabletReader;
         readonly runtimeTypeChecking: boolean;
     });
     protected onBeginAssembly(assm: spec.Assembly, fingerprint: boolean): void;

package/lib/targets/python.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@jsii/spec';
 import { CodeMaker } from 'codemaker';
-import { Rosetta, ApiLocation } from 'jsii-rosetta';
+import { RosettaTabletReader, ApiLocation } from 'jsii-rosetta';
 import { Generator, GeneratorOptions } from '../generator';
 import { Target, TargetOptions } from '../target';
 import { NamingContext, PythonImports } from './python/type-name';
@@ -61,7 +61,7 @@ declare class PythonGenerator extends Generator {
     private package;
     private rootModule?;
     private readonly types;
-    constructor(rosetta: Rosetta, options: GeneratorOptions);
+    constructor(rosetta: RosettaTabletReader, options: GeneratorOptions);
     emitDocString(code: CodeMaker, apiLocation: ApiLocation, docs: spec.Docs | undefined, options?: {
         arguments?: DocumentableArgument[];
         documentableItem?: string;

package/lib/targets/version-utils.js

@@ -81,30 +81,54 @@ function toReleaseVersion(assemblyVersion, target) {
     }
     switch (target) {
         case _1.TargetName.PYTHON:
+            const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
             // Python supports a limited set of identifiers... And we have a mapping table...
             // https://packaging.python.org/guides/distributing-packages-using-setuptools/#pre-release-versioning
-            const [label, sequence, ...rest] = version.prerelease;
-            if (rest.filter((elt) => elt !== 0).length > 0 || sequence == null) {
-                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) components to python: ${(0, util_1.inspect)(version.prerelease)}. The format should be 'X.Y.Z-label.sequence', where sequence is a positive integer, and label is "dev", "pre", "alpha", beta", or "rc"`);
-            }
-            if (!Number.isInteger(sequence)) {
-                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as sequence ${(0, util_1.inspect)(sequence)} is not an integer`);
-            }
-            const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
-            // See PEP 440: https://www.python.org/dev/peps/pep-0440/#pre-releases
-            switch (label) {
-                case 'dev':
-                case 'pre':
-                    return `${baseVersion}.dev${sequence}`;
-                case 'alpha':
-                    return `${baseVersion}.a${sequence}`;
-                case 'beta':
-                    return `${baseVersion}.b${sequence}`;
-                case 'rc':
-                    return `${baseVersion}.rc${sequence}`;
-                default:
-                    throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as label ${(0, util_1.inspect)(label)} is not mapped (only "dev", "pre", "alpha", "beta" and "rc" are)`);
+            const releaseLabels = {
+                alpha: 'a',
+                beta: 'b',
+                rc: 'rc',
+                post: 'post',
+                dev: 'dev',
+                pre: 'pre',
+            };
+            const validationErrors = [];
+            // Ensure that prerelease composed entirely of [label, sequence] pairs
+            version.prerelease.forEach((elem, idx, arr) => {
+                const next = arr[idx + 1];
+                if (typeof elem === 'string') {
+                    if (!Object.keys(releaseLabels).includes(elem)) {
+                        validationErrors.push(`Label ${elem} is not one of ${Object.keys(releaseLabels).join(',')}`);
+                    }
+                    if (next === undefined || !Number.isInteger(next)) {
+                        validationErrors.push(`Label ${elem} must be followed by a positive integer`);
+                    }
+                }
+            });
+            if (validationErrors.length > 0) {
+                throw new Error(`Unable to map prerelease identifier (in: ${assemblyVersion}) components to python: ${(0, util_1.inspect)(version.prerelease)}. The format should be 'X.Y.Z-[label.sequence][.post.sequence][.(dev|pre).sequence]', where sequence is a positive integer and label is one of ${(0, util_1.inspect)(Object.keys(releaseLabels))}. Validation errors encountered: ${validationErrors.join(', ')}`);
             }
+            // PEP440 supports multiple labels in a given version, so
+            // we should attempt to identify and map as many labels as
+            // possible from the given prerelease input
+            // e.g. 1.2.3-rc.123.dev.456.post.789 => 1.2.3.rc123.dev456.post789
+            const postIdx = version.prerelease.findIndex((v) => v.toString() === 'post');
+            const devIdx = version.prerelease.findIndex((v) => ['dev', 'pre'].includes(v.toString()));
+            const preReleaseIdx = version.prerelease.findIndex((v) => ['alpha', 'beta', 'rc'].includes(v.toString()));
+            const prereleaseVersion = [
+                preReleaseIdx > -1
+                    ? `${releaseLabels[version.prerelease[preReleaseIdx]]}${version.prerelease[preReleaseIdx + 1] ?? 0}`
+                    : undefined,
+                postIdx > -1
+                    ? `post${version.prerelease[postIdx + 1] ?? 0}`
+                    : undefined,
+                devIdx > -1 ? `dev${version.prerelease[devIdx + 1] ?? 0}` : undefined,
+            ]
+                .filter((v) => v)
+                .join('.');
+            return version.build.length > 0
+                ? `${baseVersion}.${prereleaseVersion}+${version.build.join('.')}`
+                : `${baseVersion}.${prereleaseVersion}`;
         case _1.TargetName.DOTNET:
         case _1.TargetName.GO:
         case _1.TargetName.JAVA:

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.96.0 (build 921e240)";
+export declare const VERSION_DESC = "1.98.0 (build 00b106d)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,10 +1,10 @@
 "use strict";
-// Generated at 2024-03-22T17:45:29Z by generate.sh
+// Generated at 2024-04-30T19:18:56Z 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.96.0';
+exports.VERSION = '1.98.0';
 /** The qualified version number for this jsii-pacmak release (e.g: `X.Y.Z (build #######)`) */
-exports.VERSION_DESC = '1.96.0 (build 921e240)';
+exports.VERSION_DESC = '1.98.0 (build 00b106d)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-pacmak",
-  "version": "1.96.0",
+  "version": "1.98.0",
   "description": "A code generation framework for jsii backend languages",
   "license": "Apache-2.0",
   "author": {
@@ -37,36 +37,39 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.96.0",
-    "@jsii/spec": "^1.96.0",
+    "@jsii/check-node": "1.98.0",
+    "@jsii/spec": "^1.98.0",
     "clone": "^2.1.2",
-    "codemaker": "^1.96.0",
+    "codemaker": "^1.98.0",
     "commonmark": "^0.30.0",
     "escape-string-regexp": "^4.0.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.96.0",
-    "jsii-rosetta": "^1.96.0",
+    "jsii-reflect": "^1.98.0",
     "semver": "^7.5.4",
     "spdx-license-list": "^6.8.0",
     "xmlbuilder": "^15.1.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^1.96.0",
-    "@jsii/java-runtime": "^1.96.0",
-    "@jsii/go-runtime": "^1.96.0",
-    "@scope/jsii-calc-lib": "^1.96.0",
+    "@jsii/dotnet-runtime": "^1.98.0",
+    "@jsii/java-runtime": "^1.98.0",
+    "@jsii/go-runtime": "^1.98.0",
+    "@scope/jsii-calc-lib": "^1.98.0",
     "@types/clone": "^2.1.4",
     "@types/diff": "^5.0.8",
     "@types/commonmark": "^0.27.9",
     "@types/fs-extra": "^9.0.13",
     "@types/semver": "^7.5.5",
     "diff": "^5.1.0",
-    "jsii": "^1.96.0",
-    "jsii-build-tools": "^1.96.0",
+    "jsii": "^1.98.0",
+    "jsii-build-tools": "^1.98.0",
     "jsii-calc": "^3.20.120",
+    "jsii-rosetta": "^1.98.0",
     "pyright": "^1.1.332"
   },
+  "peerDependencies": {
+    "jsii-rosetta": "^1.98.0 || ~5.2.0 || ~5.3.0 || ~5.4.0"
+  },
   "keywords": [
     "jsii",
     "aws"

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

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

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

@@ -1,4 +0,0 @@
-"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