jsii-reflect 1.62.0 → 1.63.0

package/lib/assembly.d.ts

@@ -111,11 +111,11 @@ export declare class Assembly extends ModuleLike {
      * it after all. Throws an exception if validation fails.
      */
     validate(): void;
-    protected get submoduleMap(): Readonly<Record<string, Submodule>>;
+    protected get submoduleMap(): ReadonlyMap<string, Submodule>;
     /**
      * All types in the root of the assembly
      */
-    protected get typeMap(): Readonly<Record<string, Type>>;
+    protected get typeMap(): ReadonlyMap<string, Type>;
     private get _dependencies();
     private _analyzeTypes;
     /**

package/lib/assembly.js

@@ -101,10 +101,10 @@ class Assembly extends module_like_1.ModuleLike {
      * Dependencies on other assemblies (with semver), the key is the JSII assembly name.
      */
     get dependencies() {
-        return Object.keys(this._dependencies).map((name) => this._dependencies[name]);
+        return Array.from(this._dependencies.values());
     }
     findDependency(name) {
-        const dep = this._dependencies[name];
+        const dep = this._dependencies.get(name);
         if (!dep) {
             throw new Error(`Dependency ${name} not found for assembly ${this.name}`);
         }
@@ -127,7 +127,7 @@ class Assembly extends module_like_1.ModuleLike {
      */
     get submodules() {
         const { submodules } = this._analyzeTypes();
-        return Object.entries(submodules)
+        return Array.from(submodules.entries())
             .filter(([name, _]) => name.split('.').length === 2)
             .map(([_, submodule]) => submodule);
     }
@@ -136,13 +136,13 @@ class Assembly extends module_like_1.ModuleLike {
      */
     get allSubmodules() {
         const { submodules } = this._analyzeTypes();
-        return Object.values(submodules);
+        return Array.from(submodules.values());
     }
     /**
      * All types, even those in submodules and nested submodules.
      */
     get types() {
-        return Object.values(this.typeMap);
+        return Array.from(this.typeMap.values());
     }
     /**
      * Return all types in the current assembly/submodule and all submodules underneath
@@ -177,10 +177,10 @@ class Assembly extends module_like_1.ModuleLike {
     }
     get _dependencies() {
         if (!this._dependencyCache) {
-            this._dependencyCache = {};
+            this._dependencyCache = new Map();
             if (this.spec.dependencies) {
                 for (const name of Object.keys(this.spec.dependencies)) {
-                    this._dependencyCache[name] = new dependency_1.Dependency(this.system, name, this.spec.dependencies[name]);
+                    this._dependencyCache.set(name, new dependency_1.Dependency(this.system, name, this.spec.dependencies[name]));
                 }
             }
         }
@@ -188,7 +188,7 @@ class Assembly extends module_like_1.ModuleLike {
     }
     _analyzeTypes() {
         if (!this._typeCache || !this._submoduleCache) {
-            this._typeCache = {};
+            this._typeCache = new Map();
             const submoduleBuilders = this.discoverSubmodules();
             const ts = this.spec.types ?? {};
             for (const [fqn, typeSpec] of Object.entries(ts)) {
@@ -214,10 +214,10 @@ class Assembly extends module_like_1.ModuleLike {
                 }
                 if (submodule != null) {
                     const moduleName = `${this.spec.name}.${submodule}`;
-                    submoduleBuilders[moduleName].addType(type);
+                    submoduleBuilders.get(moduleName).addType(type);
                 }
                 else {
-                    this._typeCache[fqn] = type;
+                    this._typeCache.set(fqn, type);
                 }
             }
             this._submoduleCache = mapValues(submoduleBuilders, (b) => b.build());
@@ -230,9 +230,9 @@ class Assembly extends module_like_1.ModuleLike {
      */
     discoverSubmodules() {
         const system = this.system;
-        const ret = {};
+        const ret = new Map();
         for (const [submoduleName, submoduleSpec] of Object.entries(this.spec.submodules ?? {})) {
-            ret[submoduleName] = new SubmoduleBuilder(system, submoduleSpec, submoduleName, ret);
+            ret.set(submoduleName, new SubmoduleBuilder(system, submoduleSpec, submoduleName, ret));
         }
         return ret;
     }
@@ -252,7 +252,7 @@ class SubmoduleBuilder {
         this.spec = spec;
         this.fullName = fullName;
         this.allModuleBuilders = allModuleBuilders;
-        this.types = {};
+        this.types = new Map();
     }
     /**
      * Whether this submodule is a direct child of another submodule
@@ -271,22 +271,22 @@ class SubmoduleBuilder {
      * Return all the builders from the map that are nested underneath ourselves.
      */
     findSubmoduleBuilders() {
-        const ret = {};
-        for (const [k, child] of Object.entries(this.allModuleBuilders)) {
+        const ret = new Map();
+        for (const [k, child] of this.allModuleBuilders) {
             if (child.isChildOf(this)) {
-                ret[k] = child;
+                ret.set(k, child);
             }
         }
         return ret;
     }
     addType(type) {
-        this.types[type.fqn] = type;
+        this.types.set(type.fqn, type);
     }
 }
 function mapValues(xs, fn) {
-    const ret = {};
-    for (const [k, v] of Object.entries(xs)) {
-        ret[k] = fn(v);
+    const ret = new Map();
+    for (const [k, v] of xs) {
+        ret.set(k, fn(v));
     }
     return ret;
 }

package/lib/class.js

@@ -5,7 +5,6 @@ const initializer_1 = require("./initializer");
 const method_1 = require("./method");
 const property_1 = require("./property");
 const reference_type_1 = require("./reference-type");
-const util_1 = require("./util");
 class ClassType extends reference_type_1.ReferenceType {
     constructor(system, assembly, spec) {
         super(system, assembly, spec);
@@ -57,14 +56,14 @@ class ClassType extends reference_type_1.ReferenceType {
      * @param inherited include all properties inherited from base classes (default: false)
      */
     getProperties(inherited = false) {
-        return this._getProperties(inherited, this);
+        return Object.fromEntries(this._getProperties(inherited, this));
     }
     /**
      * List all methods in this class.
      * @param inherited include all methods inherited from base classes (default: false)
      */
     getMethods(inherited = false) {
-        return this._getMethods(inherited, this);
+        return Object.fromEntries(this._getMethods(inherited, this));
     }
     /**
      * Lists all interfaces this class implements.
@@ -89,16 +88,22 @@ class ClassType extends reference_type_1.ReferenceType {
         return true;
     }
     _getProperties(inherited, parentType) {
-        const base = inherited && this.base
+        const result = inherited && this.base
             ? this.base._getProperties(inherited, parentType)
-            : {};
-        return Object.assign(base, (0, util_1.indexBy)((this.spec.properties ?? []).map((p) => new property_1.Property(this.system, this.assembly, parentType, this, p)), (p) => p.name));
+            : new Map();
+        for (const p of this.spec.properties ?? []) {
+            result.set(p.name, new property_1.Property(this.system, this.assembly, parentType, this, p));
+        }
+        return result;
     }
     _getMethods(inherited, parentType) {
-        const base = inherited && this.base
+        const result = inherited && this.base
             ? this.base._getMethods(inherited, parentType)
-            : {};
-        return Object.assign(base, (0, util_1.indexBy)((this.spec.methods ?? []).map((m) => new method_1.Method(this.system, this.assembly, parentType, this, m)), (m) => m.name));
+            : new Map();
+        for (const m of this.spec.methods ?? []) {
+            result.set(m.name, new method_1.Method(this.system, this.assembly, parentType, this, m));
+        }
+        return result;
     }
 }
 exports.ClassType = ClassType;

package/lib/interface.js

@@ -10,7 +10,6 @@ exports.InterfaceType = void 0;
 const method_1 = require("./method");
 const property_1 = require("./property");
 const reference_type_1 = require("./reference-type");
-const util_1 = require("./util");
 class InterfaceType extends reference_type_1.ReferenceType {
     constructor(system, assembly, spec) {
         super(system, assembly, spec);
@@ -59,14 +58,14 @@ class InterfaceType extends reference_type_1.ReferenceType {
      * @param inherited include all properties inherited from base classes (default: false)
      */
     getProperties(inherited = false) {
-        return this._getProperties(inherited, this);
+        return Object.fromEntries(this._getProperties(inherited, this));
     }
     /**
      * List all methods in this class.
      * @param inherited include all methods inherited from base classes (default: false)
      */
     getMethods(inherited = false) {
-        return this._getMethods(inherited, this);
+        return Object.fromEntries(this._getMethods(inherited, this));
     }
     isDataType() {
         return !!this.spec.datatype;
@@ -75,22 +74,32 @@ class InterfaceType extends reference_type_1.ReferenceType {
         return true;
     }
     _getProperties(inherited, parentType) {
-        const base = {};
+        const result = new Map();
         if (inherited) {
             for (const parent of this.getInterfaces()) {
-                Object.assign(base, parent._getProperties(inherited, parentType));
+                for (const [key, value] of parent._getProperties(inherited, parentType)) {
+                    result.set(key, value);
+                }
             }
         }
-        return Object.assign(base, (0, util_1.indexBy)((this.spec.properties ?? []).map((p) => new property_1.Property(this.system, this.assembly, parentType, this, p)), (p) => p.name));
+        for (const p of this.spec.properties ?? []) {
+            result.set(p.name, new property_1.Property(this.system, this.assembly, parentType, this, p));
+        }
+        return result;
     }
     _getMethods(inherited, parentType) {
-        const base = {};
+        const methods = new Map();
         if (inherited) {
             for (const parent of this.getInterfaces()) {
-                Object.assign(base, parent._getMethods(inherited, parentType));
+                for (const [key, value] of parent._getMethods(inherited, parentType)) {
+                    methods.set(key, value);
+                }
             }
         }
-        return Object.assign(base, (0, util_1.indexBy)((this.spec.methods ?? []).map((m) => new method_1.Method(this.system, this.assembly, parentType, this, m)), (m) => m.name));
+        for (const m of this.spec.methods ?? []) {
+            methods.set(m.name, new method_1.Method(this.system, this.assembly, parentType, this, m));
+        }
+        return methods;
     }
 }
 exports.InterfaceType = InterfaceType;

package/lib/module-like.d.ts

@@ -14,8 +14,8 @@ export declare abstract class ModuleLike {
      */
     abstract readonly targets?: jsii.AssemblyTargets;
     abstract readonly readme?: jsii.ReadMe;
-    protected abstract readonly submoduleMap: Readonly<Record<string, Submodule>>;
-    protected abstract readonly typeMap: Readonly<Record<string, Type>>;
+    protected abstract readonly submoduleMap: ReadonlyMap<string, Submodule>;
+    protected abstract readonly typeMap: ReadonlyMap<string, Type>;
     /**
      * Cache for the results of `tryFindType`.
      */

package/lib/module-like.js

@@ -13,10 +13,10 @@ class ModuleLike {
         this.typeLocatorCache = new Map();
     }
     get submodules() {
-        return Object.values(this.submoduleMap);
+        return Array.from(this.submoduleMap.values());
     }
     get types() {
-        return Object.values(this.typeMap);
+        return Array.from(this.typeMap.values());
     }
     get classes() {
         return this.types
@@ -37,7 +37,7 @@ class ModuleLike {
         if (this.typeLocatorCache.has(fqn)) {
             return this.typeLocatorCache.get(fqn);
         }
-        const ownType = this.typeMap[fqn];
+        const ownType = this.typeMap.get(fqn);
         if (ownType != null) {
             this.typeLocatorCache.set(fqn, ownType);
             return ownType;
@@ -51,7 +51,7 @@ class ModuleLike {
             .split('.')
             .slice(0, myFqnLength + 1)
             .join('.');
-        const sub = this.submoduleMap[subFqn];
+        const sub = this.submoduleMap.get(subFqn);
         const submoduleType = sub?.tryFindType(fqn);
         this.typeLocatorCache.set(fqn, submoduleType);
         return submoduleType;

package/lib/submodule.d.ts

@@ -5,13 +5,13 @@ import { TypeSystem } from './type-system';
 export declare class Submodule extends ModuleLike {
     readonly spec: jsii.Submodule;
     readonly fqn: string;
-    protected readonly submoduleMap: Readonly<Record<string, Submodule>>;
-    protected readonly typeMap: Readonly<Record<string, Type>>;
+    protected readonly submoduleMap: ReadonlyMap<string, Submodule>;
+    protected readonly typeMap: ReadonlyMap<string, Type>;
     /**
      * The simple name of the submodule (the last segment of the `fullName`).
      */
     readonly name: string;
-    constructor(system: TypeSystem, spec: jsii.Submodule, fqn: string, submoduleMap: Readonly<Record<string, Submodule>>, typeMap: Readonly<Record<string, Type>>);
+    constructor(system: TypeSystem, spec: jsii.Submodule, fqn: string, submoduleMap: ReadonlyMap<string, Submodule>, typeMap: ReadonlyMap<string, Type>);
     /**
      * A map of target name to configuration, which is used when generating packages for
      * various languages.

package/lib/type-system.d.ts

@@ -6,15 +6,15 @@ import { Method } from './method';
 import { Property } from './property';
 import { Type } from './type';
 export declare class TypeSystem {
-    /**
-     * All assemblies in this type system.
-     */
-    readonly assemblies: Assembly[];
     /**
      * The "root" assemblies (ones that loaded explicitly via a "load" call).
      */
     readonly roots: Assembly[];
     private readonly _assemblyLookup;
+    /**
+     * All assemblies in this type system.
+     */
+    get assemblies(): readonly Assembly[];
     /**
      * Load all JSII dependencies of the given NPM package directory.
      *

package/lib/type-system.js

@@ -11,15 +11,17 @@ const interface_1 = require("./interface");
 const util_1 = require("./util");
 class TypeSystem {
     constructor() {
-        /**
-         * All assemblies in this type system.
-         */
-        this.assemblies = new Array();
         /**
          * The "root" assemblies (ones that loaded explicitly via a "load" call).
          */
         this.roots = new Array();
-        this._assemblyLookup = {};
+        this._assemblyLookup = new Map();
+    }
+    /**
+     * All assemblies in this type system.
+     */
+    get assemblies() {
+        return Array.from(this._assemblyLookup.values());
     }
     /**
      * Load all JSII dependencies of the given NPM package directory.
@@ -120,9 +122,8 @@ class TypeSystem {
         if (asm.system !== this) {
             throw new Error('Assembly has been created for different typesystem');
         }
-        if (!this._assemblyLookup[asm.name]) {
-            this._assemblyLookup[asm.name] = asm;
-            this.assemblies.push(asm);
+        if (!this._assemblyLookup.has(asm.name)) {
+            this._assemblyLookup.set(asm.name, asm);
         }
         if (options.isRoot !== false) {
             this.addRoot(asm);
@@ -135,7 +136,7 @@ class TypeSystem {
      * @param name the name of the assembly being looked for.
      */
     includesAssembly(name) {
-        return name in this._assemblyLookup;
+        return this._assemblyLookup.has(name);
     }
     isRoot(name) {
         return this.roots.map((r) => r.name).includes(name);
@@ -148,7 +149,7 @@ class TypeSystem {
         return ret;
     }
     tryFindAssembly(name) {
-        return this._assemblyLookup[name];
+        return this._assemblyLookup.get(name);
     }
     findFqn(fqn) {
         const [assembly] = fqn.split('.');
@@ -247,7 +248,7 @@ class TypeSystem {
         return new assembly_1.Assembly(this, contents);
     }
     addRoot(asm) {
-        if (!this.roots.map((r) => r.name).includes(asm.name)) {
+        if (!this.roots.some((r) => r.name === asm.name)) {
             this.roots.push(asm);
         }
     }

package/lib/util.d.ts

@@ -1,6 +1,3 @@
-export declare function indexBy<T>(xs: T[], f: (x: T) => string): {
-    [key: string]: T;
-};
 /**
  * Find the directory that contains a given dependency, identified by its 'package.json', from a starting search directory
  *

package/lib/util.js

@@ -1,16 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findUp = exports.findPackageJsonUp = exports.isBuiltinModule = exports.findDependencyDirectory = exports.indexBy = void 0;
+exports.findUp = exports.findPackageJsonUp = exports.isBuiltinModule = exports.findDependencyDirectory = void 0;
 const fs = require("fs-extra");
 const path = require("path");
-function indexBy(xs, f) {
-    const ret = {};
-    for (const x of xs) {
-        ret[f(x)] = x;
-    }
-    return ret;
-}
-exports.indexBy = indexBy;
 /**
  * Find the directory that contains a given dependency, identified by its 'package.json', from a starting search directory
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-reflect",
-  "version": "1.62.0",
+  "version": "1.63.0",
   "description": "strongly-typed reflection library and tools for jsii",
   "license": "Apache-2.0",
   "author": {
@@ -34,18 +34,18 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.62.0",
-    "@jsii/spec": "^1.62.0",
+    "@jsii/check-node": "1.63.0",
+    "@jsii/spec": "^1.63.0",
     "chalk": "^4",
     "fs-extra": "^10.1.0",
-    "oo-ascii-tree": "^1.62.0",
+    "oo-ascii-tree": "^1.63.0",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@scope/jsii-calc-lib": "^1.62.0",
+    "@scope/jsii-calc-lib": "^1.63.0",
     "@types/fs-extra": "^9.0.13",
-    "jsii": "^1.62.0",
-    "jsii-build-tools": "^1.62.0",
+    "jsii": "^1.63.0",
+    "jsii-build-tools": "^1.63.0",
     "jsii-calc": "^3.20.120"
   }
 }