jsii-reflect 1.118.0 → 1.120.0

package/lib/jsii-query.js

@@ -152,28 +152,33 @@ function matches(el, kind, pred) {
         if (!['type', 'class'].includes(kind))
             return false;
         context.kind = 'class';
+        context.fqn = el.fqn;
     }
     if (el instanceof lib_1.InterfaceType) {
         const moreSpecificInterfaceType = el.datatype ? 'struct' : 'interface';
         if (!['type', moreSpecificInterfaceType].includes(kind))
             return false;
         context.kind = moreSpecificInterfaceType;
+        context.fqn = el.fqn;
     }
     if (el instanceof lib_1.EnumType) {
         if (!['type', 'enum'].includes(kind))
             return false;
         context.kind = 'enum';
+        context.fqn = el.fqn;
     }
     if (el instanceof lib_1.Property) {
         if (!['member', 'property'].includes(kind))
             return false;
         context.kind = 'property';
+        context.fqn = `${el.parentType.fqn}#${el.name}`;
     }
     if (el instanceof lib_1.Callable) {
         const moreSpecificCallable = el instanceof lib_1.Initializer ? 'initializer' : 'method';
         if (!['member', moreSpecificCallable].includes(kind))
             return false;
         context.kind = moreSpecificCallable;
+        context.fqn = `${el.parentType.fqn}#${el.name}`;
     }
     Object.assign(context, Object.fromEntries(API_ELEMENT_ATTRIBUTES.map((attr) => [attr, el[attr]])));
     const ret = pred.apply(context);
@@ -285,6 +290,7 @@ const VALID_KINDS = [
 ];
 const API_ELEMENT_ATTRIBUTES = [
     'kind',
+    'fqn',
     // Types
     'ancestors',
     'abstract',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsii-reflect",
-  "version": "1.118.0",
+  "version": "1.120.0",
   "description": "strongly-typed reflection library and tools for jsii",
   "license": "Apache-2.0",
   "author": {
@@ -22,7 +22,8 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "bin": {
-    "jsii-tree": "bin/jsii-tree"
+    "jsii-tree": "bin/jsii-tree",
+    "jsii-query": "bin/jsii-query"
   },
   "scripts": {
     "build": "tsc --build && chmod +x bin/jsii-tree && yarn lint",
@@ -34,19 +35,19 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/check-node": "1.118.0",
-    "@jsii/spec": "1.118.0",
+    "@jsii/check-node": "1.120.0",
+    "@jsii/spec": "1.120.0",
     "chalk": "^4",
     "fs-extra": "^10.1.0",
-    "oo-ascii-tree": "^1.118.0",
+    "oo-ascii-tree": "^1.120.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@scope/jsii-calc-lib": "^1.118.0",
+    "@scope/jsii-calc-lib": "^1.120.0",
     "@types/fs-extra": "^9.0.13",
     "@types/yargs": "^17.0.33",
     "jsii": "^5.9.10",
-    "jsii-build-tools": "^1.118.0",
+    "jsii-build-tools": "^1.120.0",
     "jsii-calc": "^3.20.120"
   }
 }

package/test/jsii-query.test.js

@@ -74,6 +74,12 @@ describe('filtering', () => {
         ], 'members');
         expect(result).toContainEqual('static @scope/jsii-calc-base-of-base.StaticConsumer#consume(..._args: any[]): void');
     });
+    test('fqn is available to filter on', async () => {
+        const result = await query([
+            (0, jsii_query_1.parseExpression)('class:fqn.includes("base.StaticConsumer")'),
+        ]);
+        expect(result).toContainEqual('static @scope/jsii-calc-base-of-base.StaticConsumer#consume(..._args: any[]): void');
+    });
 });
 async function query(exp, what = 'all') {
     const jsiiCalcDir = path.dirname(require.resolve('jsii-calc/package.json'));