jsii 6.0.4 → 6.0.5-dev.0

package/lib/assembler.d.ts

@@ -145,6 +145,13 @@ export declare class Assembler implements Emitter {
      * (no messing around with binding 'self' and 'this' and doing multiple calls to _withBaseClass.)
      */
     private _withBaseClass;
+    /**
+     * Whether a symbol is marked with the `@jsii ignore` directive on *all* of its
+     * declarations. We require every declaration to be ignored so that emission
+     * (`_visitNode`) and reference resolution (`_isPrivateOrInternal`) agree: a
+     * partially-ignored merged declaration stays a visible part of the public API.
+     */
+    private _isIgnored;
     /**
      * @returns true if this member is internal and should be omitted from the type manifest
      */

package/lib/assembler.js

@@ -745,6 +745,19 @@ class Assembler {
         if ((ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) === 0) {
             return [];
         }
+        // Early exit if the declaration is marked with `@jsii ignore`. We resolve the
+        // symbol and require *every* declaration to be ignored (see `_isIgnored`) so
+        // this stays consistent with how references are resolved; otherwise a
+        // partially-ignored merged declaration would be dropped here but treated as
+        // public elsewhere. Without this, deriving from a `Partial<T>` would also
+        // raise spurious compiler errors on an ignored declaration.
+        const nodeSymbol = this._typeChecker.getSymbolAtLocation(ts.getNameOfDeclaration(node) ?? node);
+        const isIgnored = nodeSymbol != null
+            ? this._isIgnored(nodeSymbol)
+            : directives_1.Directives.of(node, (diag) => this._diagnostics.push(diag)).ignore != null;
+        if (isIgnored) {
+            return [];
+        }
         let jsiiType;
         if (ts.isClassDeclaration(node) && _isExported(node)) {
             // export class Name { ... }
@@ -1200,6 +1213,16 @@ class Assembler {
             });
         }
     }
+    /**
+     * Whether a symbol is marked with the `@jsii ignore` directive on *all* of its
+     * declarations. We require every declaration to be ignored so that emission
+     * (`_visitNode`) and reference resolution (`_isPrivateOrInternal`) agree: a
+     * partially-ignored merged declaration stays a visible part of the public API.
+     */
+    _isIgnored(symbol) {
+        return ((symbol.declarations?.length ?? 0) > 0 &&
+            symbol.declarations.every((decl) => directives_1.Directives.of(decl, (diag) => this._diagnostics.push(diag)).ignore != null));
+    }
     /**
      * @returns true if this member is internal and should be omitted from the type manifest
      */
@@ -1212,7 +1235,7 @@ class Assembler {
             return true;
         }
         // If all the declarations are marked with `@jsii ignore`, then this is effetcively private as far as jsii is concerned.
-        if (symbol.declarations?.every((decl) => directives_1.Directives.of(decl, (diag) => this._diagnostics.push(diag)).ignore != null)) {
+        if (this._isIgnored(symbol)) {
             return true;
         }
         if (!hasInternalJsDocTag && !hasUnderscorePrefix) {