jsii-diff 1.70.0 → 1.72.0

package/lib/type-comparison.js

@@ -32,10 +32,10 @@ class AssemblyComparison {
      */
     load(original, updated) {
         /* eslint-disable prettier/prettier */
-        for (const [origClass, updatedClass] of this.typePairs(original.classes, updated)) {
+        for (const [origClass, updatedClass] of this.typePairs(original.allClasses, updated)) {
             this.types.set(origClass.fqn, new ComparableClassType(this, origClass, updatedClass));
         }
-        for (const [origIface, updatedIface] of this.typePairs(original.interfaces, updated)) {
+        for (const [origIface, updatedIface] of this.typePairs(original.allInterfaces, updated)) {
             if (origIface.datatype !== updatedIface.datatype) {
                 this.mismatches.report({
                     ruleKey: 'iface-type',
@@ -48,7 +48,7 @@ class AssemblyComparison {
                 ? new ComparableStructType(this, origIface, updatedIface)
                 : new ComparableInterfaceType(this, origIface, updatedIface));
         }
-        for (const [origEnum, updatedEnum] of this.typePairs(original.enums, updated)) {
+        for (const [origEnum, updatedEnum] of this.typePairs(original.allEnums, updated)) {
             this.types.set(origEnum.fqn, new ComparableEnumType(this, origEnum, updatedEnum));
         }
         /* eslint-enable prettier/prettier */
@@ -57,6 +57,7 @@ class AssemblyComparison {
      * Perform the comparison for all loaded types
      */
     compare() {
+        LOG.debug(`Comparing ${this.comparableTypes.length} types`);
         this.comparableTypes.forEach((t) => t.markTypeRoles());
         this.comparableTypes.forEach((t) => t.compare());
     }
@@ -207,6 +208,7 @@ class ComparableReferenceType extends ComparableType {
      * Compare members of the reference types
      */
     compare() {
+        LOG.debug(`Reference type ${this.oldType.fqn}`);
         (0, stability_1.validateStabilities)(this.oldType, this.newType, this.mismatches);
         (0, validations_1.validateBaseTypeAssignability)(this.oldType, this.newType, this.mismatches);
         (0, validations_1.validateSubclassableNotRemoved)(this.oldType, this.newType, this.mismatches);
@@ -346,6 +348,7 @@ exports.ComparableInterfaceType = ComparableInterfaceType;
  */
 class ComparableStructType extends ComparableType {
     compare() {
+        LOG.debug(`Struct type ${this.oldType.fqn}`);
         (0, stability_1.validateStabilities)(this.oldType, this.newType, this.mismatches);
         (0, validations_1.validateBaseTypeAssignability)(this.oldType, this.newType, this.mismatches);
         this.validateNoPropertiesRemoved();
@@ -424,6 +427,7 @@ class ComparableEnumType extends ComparableType {
      * Perform comparisons on enum members
      */
     compare() {
+        LOG.debug(`Enum type ${this.oldType.fqn}`);
         (0, stability_1.validateStabilities)(this.oldType, this.newType, this.mismatches);
         (0, validations_1.validateExistingMembers)(this.oldType, this.newType, this.mismatches, (oldMember, newMember) => {
             (0, stability_1.validateStabilities)(oldMember, newMember, this.mismatches);

package/lib/version.d.ts

@@ -1,3 +1,3 @@
 /** The qualified version number for this JSII compiler. */
-export declare const VERSION = "1.70.0 (build 03c2f6f)";
+export declare const VERSION = "1.72.0 (build 4b8828b)";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,7 +1,7 @@
 "use strict";
-// Generated at 2022-10-19T17:18:34Z by generate.sh
+// Generated at 2022-12-05T11:41:52Z by generate.sh
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 /** The qualified version number for this JSII compiler. */
-exports.VERSION = '1.70.0 (build 03c2f6f)';
+exports.VERSION = '1.72.0 (build 4b8828b)';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-diff",
-  "version": "1.70.0",
+  "version": "1.72.0",
   "description": "Assembly comparison for jsii",
   "license": "Apache-2.0",
   "author": {
@@ -33,18 +33,18 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.70.0",
-    "@jsii/spec": "^1.70.0",
+    "@jsii/check-node": "1.72.0",
+    "@jsii/spec": "^1.72.0",
     "fs-extra": "^10.1.0",
-    "jsii-reflect": "^1.70.0",
-    "log4js": "^6.7.0",
+    "jsii-reflect": "^1.72.0",
+    "log4js": "^6.7.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@types/tar-fs": "^2.0.1",
     "jest-expect-message": "^1.1.3",
-    "jsii": "^1.70.0",
-    "jsii-build-tools": "^1.70.0"
+    "jsii": "^1.72.0",
+    "jsii-build-tools": "^1.72.0"
   }
 }

package/test/classes.test.js

@@ -539,4 +539,12 @@ test.each([
         ${usageDecl}
       }
       `));
+// ----------------------------------------------------------------------
+test('will find mismatches in submodules', () => (0, util_1.expectError)(/number is not assignable to string/, {
+    'index.ts': 'export * as submodule from "./subdir"',
+    'subdir/index.ts': 'export class Foo { public static readonly PROP = "abc"; }',
+}, {
+    'index.ts': 'export * as submodule from "./subdir"',
+    'subdir/index.ts': 'export class Foo { public static readonly PROP = 42; }',
+}));
 //# sourceMappingURL=classes.test.js.map

package/test/util.d.ts

@@ -1,5 +1,6 @@
+import { MultipleSourceFiles } from 'jsii';
 import { Mismatches } from '../lib/types';
-export declare function expectNoError(original: string, updated: string): void;
-export declare function expectError(error: RegExp | undefined, original: string, updated: string): void;
-export declare function compare(original: string, updated: string): Mismatches;
+export declare function expectNoError(original: string | MultipleSourceFiles, updated: string | MultipleSourceFiles): void;
+export declare function expectError(error: RegExp | undefined, original: string | MultipleSourceFiles, updated: string | MultipleSourceFiles): void;
+export declare function compare(original: string | MultipleSourceFiles, updated: string | MultipleSourceFiles): Mismatches;
 //# sourceMappingURL=util.d.ts.map