jsii-reflect 1.120.0 → 1.122.0

package/lib/assembly.d.ts

@@ -9,10 +9,14 @@ import { Type } from './type';
 import { TypeSystem } from './type-system';
 export declare class Assembly extends ModuleLike {
     readonly spec: jsii.Assembly;
+    private readonly _directory?;
+    private readonly _packageJson?;
     private _typeCache?;
     private _submoduleCache?;
     private _dependencyCache?;
-    constructor(system: TypeSystem, spec: jsii.Assembly);
+    constructor(system: TypeSystem, spec: jsii.Assembly, _directory?: string | undefined, _packageJson?: any | undefined);
+    get directory(): string;
+    get packageJson(): any;
     get fqn(): string;
     /**
      * The version of the spec schema

package/lib/assembly.js

@@ -9,9 +9,23 @@ const interface_1 = require("./interface");
 const module_like_1 = require("./module-like");
 const submodule_1 = require("./submodule");
 class Assembly extends module_like_1.ModuleLike {
-    constructor(system, spec) {
+    constructor(system, spec, _directory, _packageJson) {
         super(system);
         this.spec = spec;
+        this._directory = _directory;
+        this._packageJson = _packageJson;
+    }
+    get directory() {
+        if (!this._directory) {
+            throw new Error('A directory was not supplied when initializing this Assembly');
+        }
+        return this._directory;
+    }
+    get packageJson() {
+        if (!this._packageJson) {
+            throw new Error('A package.json was not supplied when initializing this Assembly');
+        }
+        return this._packageJson;
     }
     get fqn() {
         return this.spec.name;
@@ -252,7 +266,7 @@ class Assembly extends module_like_1.ModuleLike {
         const system = this.system;
         const ret = new Map();
         for (const [submoduleName, submoduleSpec] of Object.entries(this.spec.submodules ?? {})) {
-            ret.set(submoduleName, new SubmoduleBuilder(system, submoduleSpec, submoduleName, ret));
+            ret.set(submoduleName, new SubmoduleBuilder(this, system, submoduleSpec, submoduleName, ret));
         }
         return ret;
     }
@@ -267,7 +281,8 @@ exports.Assembly = Assembly;
  * to translate
  */
 class SubmoduleBuilder {
-    constructor(system, spec, fullName, allModuleBuilders) {
+    constructor(parent, system, spec, fullName, allModuleBuilders) {
+        this.parent = parent;
         this.system = system;
         this.spec = spec;
         this.fullName = fullName;
@@ -282,7 +297,7 @@ class SubmoduleBuilder {
             this.fullName.split('.').length === other.fullName.split('.').length + 1);
     }
     build() {
-        this._built ?? (this._built = new submodule_1.Submodule(this.system, this.spec, this.fullName, mapValues(this.findSubmoduleBuilders(), (b) => b.build()), this.types));
+        this._built ?? (this._built = new submodule_1.Submodule(this.system, this.spec, this.fullName, mapValues(this.findSubmoduleBuilders(), (b) => b.build()), this.types, this.parent));
         return this._built;
     }
     /**

package/lib/submodule.d.ts

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

package/lib/submodule.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Submodule = void 0;
 const module_like_1 = require("./module-like");
 class Submodule extends module_like_1.ModuleLike {
-    constructor(system, spec, fqn, submoduleMap, typeMap) {
+    constructor(system, spec, fqn, submoduleMap, typeMap, parent) {
         super(system);
         this.spec = spec;
         this.fqn = fqn;
         this.submoduleMap = submoduleMap;
         this.typeMap = typeMap;
         this.name = fqn.split('.').pop();
+        this.parent = parent;
     }
     /**
      * A map of target name to configuration, which is used when generating packages for

package/lib/type-system.js

@@ -280,7 +280,18 @@ class TypeSystem {
     loadAssembly(file, validate = true, supportedFeatures) {
         validateFeatureSubset(supportedFeatures);
         const contents = (0, spec_1.loadAssemblyFromFile)(file, validate, supportedFeatures);
-        return new assembly_1.Assembly(this, contents);
+        const pjFile = path.join(path.dirname(file), 'package.json');
+        let pjData = {};
+        try {
+            pjData = JSON.parse(fs.readFileSync(pjFile, 'utf-8'));
+        }
+        catch (e) {
+            // Opportunistically it's not a failure if the file doesn't exist
+            if (e.code !== 'ENOENT') {
+                throw new Error(`Error loading ${pjFile}: ${e}`);
+            }
+        }
+        return new assembly_1.Assembly(this, contents, path.dirname(file), pjData);
     }
     addRoot(asm) {
         if (!this.roots.some((r) => r.name === asm.name)) {

package/package.json

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

package/test/__snapshots__/jsii-tree.test.js.snap

@@ -2296,6 +2296,11 @@ exports[`jsii-tree --all 1`] = `
  │   │     │ └─┬ value
  │   │     │   └── type: string
  │   │     └── returns: boolean
+ │   ├─┬ class SomeContainingClass (stable)
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer (stable)
+ │   │   └─┬ sayHello() method (stable)
+ │   │     └── returns: string
  │   ├─┬ class SomeTypeJsii976 (stable)
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer (stable)
@@ -3442,6 +3447,20 @@ exports[`jsii-tree --all 1`] = `
  │   │     ├── abstract
  │   │     ├── immutable
  │   │     └── type: boolean
+ │   ├─┬ interface ChildStruct (stable)
+ │   │ ├─┬ interfaces
+ │   │ │ └── ParentStruct
+ │   │ └─┬ members
+ │   │   └─┬ field2 property (stable)
+ │   │     ├── abstract
+ │   │     ├── immutable
+ │   │     └── type: string
+ │   ├─┬ interface ParentStruct (stable)
+ │   │ └─┬ members
+ │   │   └─┬ field1 property (stable)
+ │   │     ├── abstract
+ │   │     ├── immutable
+ │   │     └── type: string
  │   ├─┬ interface StableStruct (stable)
  │   │ └─┬ members
  │   │   └─┬ readonlyProperty property (stable)
@@ -4202,6 +4221,7 @@ exports[`jsii-tree --inheritance 1`] = `
  │   ├── class SingleInstanceTwoTypes
  │   ├── class SingletonInt
  │   ├── class SingletonString
+ │   ├── class SomeContainingClass
  │   ├── class SomeTypeJsii976
  │   ├── class StableClass
  │   ├── class StaticContext
@@ -4335,6 +4355,10 @@ exports[`jsii-tree --inheritance 1`] = `
  │   ├── interface RootStruct
  │   ├── interface SecondLevelStruct
  │   ├── interface SmellyStruct
+ │   ├─┬ interface ChildStruct
+ │   │ └─┬ interfaces
+ │   │   └── ParentStruct
+ │   ├── interface ParentStruct
  │   ├── interface StableStruct
  │   ├── interface StructA
  │   ├── interface StructB
@@ -5512,6 +5536,10 @@ exports[`jsii-tree --members 1`] = `
  │   ├─┬ class SingletonString
  │   │ └─┬ members
  │   │   └── isSingletonString(value) method
+ │   ├─┬ class SomeContainingClass
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer
+ │   │   └── sayHello() method
  │   ├─┬ class SomeTypeJsii976
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer
@@ -5973,6 +6001,12 @@ exports[`jsii-tree --members 1`] = `
  │   │ └─┬ members
  │   │   ├── property property
  │   │   └── yetAnoterOne property
+ │   ├─┬ interface ChildStruct
+ │   │ └─┬ members
+ │   │   └── field2 property
+ │   ├─┬ interface ParentStruct
+ │   │ └─┬ members
+ │   │   └── field1 property
  │   ├─┬ interface StableStruct
  │   │ └─┬ members
  │   │   └── readonlyProperty property
@@ -6532,6 +6566,7 @@ exports[`jsii-tree --types 1`] = `
  │   ├── class SingleInstanceTwoTypes
  │   ├── class SingletonInt
  │   ├── class SingletonString
+ │   ├── class SomeContainingClass
  │   ├── class SomeTypeJsii976
  │   ├── class StableClass
  │   ├── class StaticContext
@@ -6631,6 +6666,8 @@ exports[`jsii-tree --types 1`] = `
  │   ├── interface RootStruct
  │   ├── interface SecondLevelStruct
  │   ├── interface SmellyStruct
+ │   ├── interface ChildStruct
+ │   ├── interface ParentStruct
  │   ├── interface StableStruct
  │   ├── interface StructA
  │   ├── interface StructB

package/test/__snapshots__/tree.test.js.snap

@@ -2491,6 +2491,11 @@ exports[`showAll 1`] = `
  │   │     │ └─┬ value
  │   │     │   └── type: string
  │   │     └── returns: boolean
+ │   ├─┬ class SomeContainingClass
+ │   │ └─┬ members
+ │   │   ├── <initializer>() initializer
+ │   │   └─┬ sayHello() method
+ │   │     └── returns: string
  │   ├─┬ class SomeTypeJsii976
  │   │ └─┬ members
  │   │   ├── <initializer>() initializer
@@ -3637,6 +3642,20 @@ exports[`showAll 1`] = `
  │   │     ├── abstract
  │   │     ├── immutable
  │   │     └── type: boolean
+ │   ├─┬ interface ChildStruct
+ │   │ ├─┬ interfaces
+ │   │ │ └── ParentStruct
+ │   │ └─┬ members
+ │   │   └─┬ field2 property
+ │   │     ├── abstract
+ │   │     ├── immutable
+ │   │     └── type: string
+ │   ├─┬ interface ParentStruct
+ │   │ └─┬ members
+ │   │   └─┬ field1 property
+ │   │     ├── abstract
+ │   │     ├── immutable
+ │   │     └── type: string
  │   ├─┬ interface StableStruct
  │   │ └─┬ members
  │   │   └─┬ readonlyProperty property
@@ -4394,6 +4413,7 @@ exports[`types 1`] = `
  │   ├── class SingleInstanceTwoTypes
  │   ├── class SingletonInt
  │   ├── class SingletonString
+ │   ├── class SomeContainingClass
  │   ├── class SomeTypeJsii976
  │   ├── class StableClass
  │   ├── class StaticContext
@@ -4493,6 +4513,8 @@ exports[`types 1`] = `
  │   ├── interface RootStruct
  │   ├── interface SecondLevelStruct
  │   ├── interface SmellyStruct
+ │   ├── interface ChildStruct
+ │   ├── interface ParentStruct
  │   ├── interface StableStruct
  │   ├── interface StructA
  │   ├── interface StructB

package/test/__snapshots__/type-system.test.js.snap

@@ -140,6 +140,7 @@ exports[`TypeSystem.classes lists all the classes in the typesystem 1`] = `
   "jsii-calc.SingleInstanceTwoTypes",
   "jsii-calc.SingletonInt",
   "jsii-calc.SingletonString",
+  "jsii-calc.SomeContainingClass",
   "jsii-calc.SomeTypeJsii976",
   "jsii-calc.StableClass",
   "jsii-calc.StaticContext",

package/test/type-system.test.js

@@ -13,6 +13,13 @@ beforeAll(async () => {
         supportedFeatures: features_1.TEST_FEATURES,
     });
 });
+test('jsii-calc assembly has package.json data attached', () => {
+    const asm = typesys.assemblies.find((a) => a.name === 'jsii-calc');
+    expect(asm?.packageJson).toMatchObject({
+        name: 'jsii-calc',
+        homepage: 'https://github.com/aws/jsii',
+    });
+});
 test('TypeSystem.hasAssembly', () => {
     expect(typesys.includesAssembly('@foo/bar')).toBeFalsy();
     expect(typesys.includesAssembly('jsii-calc')).toBeTruthy();

package/test/util.js

@@ -10,7 +10,11 @@ function typeSystemFromSource(source, cb) {
 }
 function assemblyFromSource(source, cb) {
     const ass = (0, jsii_1.sourceToAssemblyHelper)(source, cb);
+    let pjData = {};
+    if (typeof source === 'object' && 'package.json' in source) {
+        pjData = JSON.parse(source['package.json']);
+    }
     const ts = new lib_1.TypeSystem();
-    return ts.addAssembly(new lib_1.Assembly(ts, ass));
+    return ts.addAssembly(new lib_1.Assembly(ts, ass, '/fake-dir', pjData));
 }
 //# sourceMappingURL=util.js.map