@hydranium/core 1.0.0-next.39 → 1.0.0-next.390

package/src/langium/module.ts

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { type Clock, type Logger, type Project, type Tracer, NoopLogger, SystemClock } from '@hydranium/protocol';
+import { type Clock, type Logger, type Project, type Tracer, type TransferDiagnostic, NoopLogger, SystemClock } from '@hydranium/protocol';
 import { DefaultServerLocale, type ServerLocale } from '../locale/server-locale.js';
 import { DefaultMessageRenderer, type MessageRenderer } from '../messages/renderer.js';
 import { ServerTracer } from './diagnostics/server-tracer.js';
@@ -15,6 +15,7 @@ import { HydraniumLangiumProfiler } from './diagnostics/hydranium-langium-profil
 import { type AstNode, type Module } from '@hydranium/langium';
 import { type DefaultSharedModuleContext, type LangiumSharedServices, type PartialLangiumSharedServices } from '@hydranium/langium/lsp';
 import { type TextDocument } from 'vscode-languageserver-textdocument';
+import { type ClientSessionFactory, DefaultClientSessionFactory } from './model-service/client-session.js';
 import { DefaultModelService, type ModelService } from './model-service/model-service.js';
 import { type ProjectManager } from './project/project-manager.js';
 import { SingleProjectManager } from './project/single-project-manager.js';
@@ -24,6 +25,7 @@ import { DefaultBuildPipelineIntegration, type BuildPipelineIntegration } from '
 import { type BuildPhasePassContribution } from './build-phase-pass/build-phase-pass.js';
 import { type BuildPhasePassService, DefaultBuildPhasePassService } from './build-phase-pass/build-phase-pass-service.js';
 import { DefaultCstResidencyService, type CstResidencyService } from './residency/index.js';
+import { HydraniumConfigurationProvider } from './config/configuration-provider.js';
 import { HydraniumIndexManager } from './workspace/index-manager.js';
 import { HydraniumWorkspaceManager } from './workspace/hydranium-workspace-manager.js';
 import { HydraniumWorkspaceLock } from './workspace/hydranium-workspace-lock.js';
@@ -32,9 +34,19 @@ import { type HydraniumDocumentRegistry, HydraniumLangiumDocuments } from './wor
 import { type AdditionalDocumentContribution } from './workspace/additional-document-contribution.js';
 import { DefaultDocumentUriPolicy, type DocumentUriPolicy } from './workspace/document-uri-policy.js';
 import { HydraniumTextDocuments } from '../documents/hydranium-text-documents.js';
-import { DefaultAstDocumentManager, type AstDocumentManager, type WritableFileSystemProvider } from '../documents/ast-document-manager.js';
-import { DefaultSelfSaveRegistry, type SelfSaveRegistry } from '../documents/self-save-registry.js';
-import { DefaultEmptyFileSystemProvider } from './workspace/file-system-provider.js';
+import { DefaultAstDocumentManager, type AstDocumentManager } from '../documents/ast-document-manager.js';
+import { DefaultSelfSaveRegistry, type SelfSaveRegistry } from './workspace/self-save-registry.js';
+import { DefaultFileSystemTaskQueue, type FileSystemTaskQueue } from '../documents/file-system-task-queue.js';
+import { DefaultModelLedger, type ModelLedger } from '../documents/model-ledger.js';
+import { DefaultDocumentReleaseHandler, type DocumentReleaseHandler } from '../documents/document-release-handler.js';
+import { DefaultVersionSyncService, type VersionSyncService } from '../documents/version-sync-service.js';
+import {
+   DefaultEmptyFileSystemProvider,
+   DefaultFileSystemProviderRegistry,
+   type FileSystemProviderRegistry,
+   type WritableFileSystemProvider
+} from './workspace/file-system-provider.js';
+import { VIRTUAL_SCHEME, VirtualFileSystemProvider } from './workspace/virtual-document.js';
 import { type ServerLanguageServices } from './language-module.js';
 import { ExtendedServiceRegistry } from './service-registry.js';
 
@@ -46,7 +58,10 @@ import { ExtendedServiceRegistry } from './service-registry.js';
  * these shared services; per-head shared bindings, if any, are
  * contributed by additional modules layered after this one.
  */
-export interface ServerAddedSharedServices<TProject extends Project = Project> {
+export interface ServerAddedSharedServices<
+   TProject extends Project = Project,
+   TDiagnostic extends TransferDiagnostic = TransferDiagnostic
+> {
    /**
     * Injectable time source. Framework default is {@link SystemClock} (real
     * `Date.now` / `performance.now` / `setTimeout`); tests bind a fake to
@@ -154,12 +169,11 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        * the `awaitDocumentState` bug-fix, framework-wired phase logs,
        * and the `markNextReason` observability primitive without
        * binding the slot explicitly. The
-       * `HydraniumDocumentUpdateHandler`'s `dispatch` calls this
-       * slot's `markNextReason` to stage the LSP event that triggered
-       * the build, for a subclass's build logging to tag its line with,
-       * so narrowing here is a load-bearing type contract — adopters who
-       * explicitly downgrade to Langium's default lose that call site's
-       * compile-time target.
+       * `HydraniumDocumentUpdateHandler`'s `dispatch` and
+       * `ModelService.rebuild` build through this slot's
+       * `scheduleUpdate`, so narrowing here is a load-bearing contract:
+       * a builder without it fails every LSP-driven build, and every
+       * session write that takes the lock, at run time.
        */
       /* override */ DocumentBuilder: HydraniumDocumentBuilder;
       /**
@@ -173,20 +187,36 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        */
       /* override */ WorkspaceLock: HydraniumWorkspaceLock;
       /**
-       * Tighten Langium's read-only `FileSystemProvider` slot to
-       * {@link WritableFileSystemProvider}. The framework's save path
-       * ({@link AstDocumentManager.save}, integrity corrections,
-       * `ModelService.save`) requires write semantics — a read-only slot
-       * type forces an `as WritableFileSystemProvider` cast at the binding
-       * line and defers the failure of a read-only implementation to the
-       * first save. The `.`-entry default is
-       * {@link DefaultEmptyFileSystemProvider}, which is what keeps the core
-       * barrel free of `node:fs` and therefore browser-bundleable; a Node host
-       * binds `@hydranium/core/node`'s Node-backed provider (wired to
-       * {@link SelfSaveRegistry}) instead, and adopters override with their own
+       * Tighten Langium's read-only `FileSystemProvider` slot to a
+       * {@link FileSystemProviderRegistry}, which is writable: the
+       * framework's save path ({@link AstDocumentManager.save}, integrity
+       * corrections, a session's `save`) requires write semantics, and a
+       * read-only slot type defers the failure of a read-only
+       * implementation to the first save.
+       *
+       * Bound to {@link DefaultFileSystemProviderRegistry}, which dispatches
+       * by scheme to the {@link ServerAddedSharedServices.fileSystemProviders}
+       * group and sends every other scheme to its `host`: the provider
+       * `context.fileSystemProvider` returns when it is writable, or else
+       * `DefaultEmptyFileSystemProvider`, which is what keeps the core
+       * barrel free of `node:fs` and therefore browser-bundleable. A Node
+       * host passes `@hydranium/core/node`'s Node-backed provider (wired to
+       * {@link SelfSaveRegistry}) instead, and adopters pass their own
        * writable implementation when neither fits.
+       *
+       * To reach the members of its own provider, an adopter declares this
+       * slot as `FileSystemProviderRegistry<MyProvider>` through
+       * {@link WithServiceOverrides}, binds a
+       * `DefaultFileSystemProviderRegistry` with that host from a factory
+       * whose return type names the narrowed slot (a module's `DeepPartial`
+       * checks no host member otherwise), and reads
+       * `FileSystemProvider.host`. A
+       * registry that serves a seeded document under none of its providers
+       * loses the document at its last close, which
+       * {@link HydraniumWorkspaceManager.warnIfDocumentsUnserved} reports
+       * once at startup.
        */
-      /* override */ FileSystemProvider: WritableFileSystemProvider;
+      /* override */ FileSystemProvider: FileSystemProviderRegistry;
       ProjectManager: ProjectManager<TProject>;
       SelfSaveRegistry: SelfSaveRegistry;
       /**
@@ -213,9 +243,17 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        * there is only one, and `'plaintext'` when there are several, rather
        * than naming a language the document demonstrably is not. Consumers
        * that need to narrow the diagnostic type or override lifecycle
-       * behaviour rebind this slot with a subclass.
+       * behaviour rebind this slot with a subclass. Subscribes to the build
+       * pipeline and the text store in its constructor, so it is eagerly
+       * constructed via `DEFAULT_EAGER_SERVICES`.
+       */
+      AstDocumentManager: AstDocumentManager<AstNode>;
+      /**
+       * Orders the server's disk accesses of each file. One slot for every
+       * reader and writer: a service given a queue of its own does not order
+       * against the others.
        */
-      AstDocumentManager: AstDocumentManager<AstNode, unknown>;
+      FileSystemTaskQueue: FileSystemTaskQueue;
       /**
        * Wires the framework's build-time features (integrity, AST
        * enrichment) into Langium's build pipeline: owns the build-phase
@@ -230,7 +268,7 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
        * `onBuildPhase` sibling of the per-node `AstExtensionService`
        * (`onDocumentPhase`) and `IntegrityService`. {@link BuildPipelineIntegration}
        * drives it from its phase listeners; the framework self-registers its
-       * integrity passes and the Langium profiler flush into it, and adopters
+       * integrity and CST-residency passes into it, and adopters
        * contribute via the shared {@link ServerAddedSharedServices.buildPhasePasses}
        * group. A single priority space orders framework and adopter passes
        * against one another deterministically.
@@ -238,15 +276,25 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
       BuildPhasePassService: BuildPhasePassService;
       /**
        * CST residency policy: sheds the concrete syntax tree of closed
-       * documents (keeping the AST resident) to reclaim memory, re-parsing
-       * on demand when a shed document re-enters a build. Self-registers a
-       * `Validated` {@link BuildPhasePassService} pass in its constructor, so
-       * it is eagerly constructed via `DEFAULT_EAGER_SERVICES`. Framework
-       * default is `{ kind: 'always-keep' }` (a no-op — the pass runs but sheds
-       * nothing); adopters rebind the slot with a subclass or a different
-       * strategy (`shed-closed-when-idle`) to enable shedding.
+       * documents (keeping the AST resident) to reclaim memory, grafting it
+       * back on demand when a shed document is read or re-enters a build.
+       * Self-registers a `Validated` {@link BuildPhasePassService} pass in its
+       * constructor, so it is eagerly constructed via `DEFAULT_EAGER_SERVICES`.
+       * Framework default is `{ kind: 'always-keep' }` (a no-op — the pass runs
+       * but sheds nothing). Adopters rebind the slot with a subclass or a
+       * different strategy (`shed-closed-when-idle`) to enable shedding.
        */
       CstResidencyService: CstResidencyService;
+      /** The version of the text each root was parsed from. */
+      ModelLedger: ModelLedger;
+      /** Reconciles each produced root with the store, and owns every build that syncs a root to its text or recovers one. */
+      VersionSyncService: VersionSyncService;
+      /**
+       * What the build keeps for a document {@link HydraniumTextDocuments} has
+       * released, for every head. Bound to {@link DefaultDocumentReleaseHandler},
+       * which reverts it to disk.
+       */
+      DocumentReleaseHandler: DocumentReleaseHandler;
    };
    /**
     * In-process workspace facade ({@link ModelService}) + AST→transfer
@@ -259,7 +307,7 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * adopter can therefore REPLACE this declaration (see
     * {@link WithServiceOverrides}) rather than intersect with it, which is what
     * keeps slot resolution independent of the order a services type is written
-    * in. `ModelService` is still a class and does not yet have that property.
+    * in. `ModelService` is an interface for the same reason.
     *
     * A class in a slot costs two things, both measured. Its `protected` members
     * join every assignability check and are compared NOMINALLY, so a subclass
@@ -270,8 +318,14 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * framework's. Neither survives on an interface.
     */
    model: {
-      TransferEncoder: TransferEncoder;
-      ModelService: ModelService<AstNode, unknown>;
+      TransferEncoder: TransferEncoder<TDiagnostic>;
+      /**
+       * Subscribes to the settled document phase in its constructor, so it is
+       * eagerly constructed via `DEFAULT_EAGER_SERVICES`.
+       */
+      ModelService: ModelService<AstNode>;
+      /** Builds the handle of every session `ModelService.createSession` starts. */
+      ClientSessionFactory: ClientSessionFactory;
    };
    /**
     * Shared contribution group for batch-level build-phase passes (see
@@ -294,6 +348,15 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
     * contribute none never touch it.
     */
    additionalDocuments: Record<string, AdditionalDocumentContribution>;
+   /**
+    * Shared contribution group of file system providers keyed by the URI
+    * scheme each answers for, which {@link FileSystemProviderRegistry}
+    * dispatches to. The framework registers {@link VirtualFileSystemProvider}
+    * under `virtual`; an adopter deep-merges a provider for a scheme of its
+    * own, and an entry under `virtual` replaces the framework's. A scheme with
+    * no entry goes to the registry's `host`.
+    */
+   fileSystemProviders: Record<string, WritableFileSystemProvider>;
 }
 
 /**
@@ -309,10 +372,18 @@ export interface ServerAddedSharedServices<TProject extends Project = Project> {
  * `ClientTextDocumentChangeEvent` payload (with `clientId`);
  * `ServiceRegistry.getServices(uri)` keeps the
  * {@link ServerLanguageServices} return shape.
+ *
+ * `TDiagnostic` is the diagnostic the bound `model.TransferEncoder` emits. A
+ * head that sends a narrower diagnostic than `TransferDiagnostic` takes
+ * services typed with it, so none of its envelopes claims a shape the encoder
+ * does not produce.
  */
-export type ServerSharedServices<TProject extends Project = Project> = Omit<LangiumSharedServices, 'workspace' | 'ServiceRegistry'> & {
+export type ServerSharedServices<TProject extends Project = Project, TDiagnostic extends TransferDiagnostic = TransferDiagnostic> = Omit<
+   LangiumSharedServices,
+   'workspace' | 'ServiceRegistry'
+> & {
    workspace: Omit<LangiumSharedServices['workspace'], 'TextDocuments' | 'DocumentBuilder'>;
-} & ServerAddedSharedServices<TProject>;
+} & ServerAddedSharedServices<TProject, TDiagnostic>;
 
 /**
  * The service-tree namespaces — the keys whose value groups further slots
@@ -464,9 +535,13 @@ export function createServerSharedModule(
          TextDocuments: services => new HydraniumTextDocuments(services),
          WorkspaceManager: services => new HydraniumWorkspaceManager(services),
          IndexManager: services => new HydraniumIndexManager(services),
-         // Override Langium's factory so a `fromModel` (code-built) virtual
-         // document retains serialized text via the per-language Serializer,
-         // making it re-read-safe through the virtual-aware FileSystemProvider.
+         // Langium's default asks only about sections named after registered
+         // language ids, so a section `lsp.configurationRoot` is bound to reads
+         // `undefined` forever with no request on the wire.
+         ConfigurationProvider: services => new HydraniumConfigurationProvider(services),
+         // Override Langium's factory so a `fromModel` (code-built) document
+         // retains serialized text via the per-language Serializer, and is
+         // re-read from that text while no file is at its URI.
          LangiumDocumentFactory: services => new HydraniumLangiumDocumentFactory(services),
          // Langium's default routes through no identity seam and treats every
          // failed load alike, so leaving this unbound opts a server out of both
@@ -475,52 +550,53 @@ export function createServerSharedModule(
          DocumentBuilder: services => new HydraniumDocumentBuilder(services),
          // The write-lock scope this marks is inert unless a host installs a
          // scope tracker — `@hydranium/core/node` does.
-         WorkspaceLock: () => new HydraniumWorkspaceLock(),
+         WorkspaceLock: services => new HydraniumWorkspaceLock(services),
          ProjectManager: services => new SingleProjectManager(services),
          SelfSaveRegistry: services => new DefaultSelfSaveRegistry(services),
          DocumentUriPolicy: () => new DefaultDocumentUriPolicy(),
-         // Writable filesystem with two paths:
-         // - Adopter passed `context.fileSystemProvider` and it returned a
-         //   writable implementation (has `writeFile`) — use it. Honours the
-         //   Langium-conventional context channel for passing a custom backing
-         //   (in-memory, browser, test stub like `DefaultEmptyFileSystemProvider`).
-         // - Otherwise — the portable default `DefaultEmptyFileSystemProvider`
-         //   (no-op writes, no disk access). Node hosts opt into real disk I/O
-         //   by binding `@hydranium/core/node`'s `DefaultFileSystemProvider`
-         //   (Node-backed, wired to `SelfSaveRegistry` so framework `writeFile`
-         //   calls register their mtime and adopters can suppress the
-         //   `didChangeWatchedFiles` echo) — typically via this same
-         //   `context.fileSystemProvider` channel or by rebinding
-         //   the slot. Keeping the `.`-entry default empty is what lets the
-         //   core barrel stay free of `node:fs` (browser-bundleable); see the
-         //   `@hydranium/core/node` carve.
+         // The host is the provider `context.fileSystemProvider` returns
+         // when it is writable (has `writeFile`); anything narrower gets the
+         // empty provider, which is what keeps the core barrel free of
+         // `node:fs`.
          FileSystemProvider: services => {
             const fromContext = context.fileSystemProvider?.(services);
-            if (fromContext && typeof (fromContext as Partial<WritableFileSystemProvider>).writeFile === 'function') {
-               return fromContext as WritableFileSystemProvider;
-            }
-            return new DefaultEmptyFileSystemProvider(services);
+            const writable = typeof (fromContext as Partial<WritableFileSystemProvider> | undefined)?.writeFile === 'function';
+            return new DefaultFileSystemProviderRegistry(services, {
+               host: writable ? (fromContext as WritableFileSystemProvider) : new DefaultEmptyFileSystemProvider(services)
+            });
          },
+         // Eagerly constructed, so its build-pipeline and text-store listeners
+         // attach before the first build.
          AstDocumentManager: services => new DefaultAstDocumentManager(services),
+         FileSystemTaskQueue: services => new DefaultFileSystemTaskQueue(services),
          // Eagerly constructed, so its build-phase listeners attach before the
          // first build.
          BuildPipelineIntegration: services => new DefaultBuildPipelineIntegration(services),
          BuildPhasePassService: services => new DefaultBuildPhasePassService(services),
          // Eagerly constructed, so its `Validated` pass registers before the
          // first build.
-         CstResidencyService: services => new DefaultCstResidencyService(services)
+         CstResidencyService: services => new DefaultCstResidencyService(services),
+         ModelLedger: () => new DefaultModelLedger(),
+         VersionSyncService: services => new DefaultVersionSyncService(services),
+         DocumentReleaseHandler: services => new DefaultDocumentReleaseHandler(services)
       },
       model: {
          // Generic walker — adopters with a typed `$type → wire shape` overlay
          // rebind this slot with a subclass.
          TransferEncoder: services => new DefaultTransferEncoder(services),
-         ModelService: services => new DefaultModelService(services)
+         // Eagerly constructed, so its settled-phase listener attaches before
+         // the first build.
+         ModelService: services => new DefaultModelService(services),
+         ClientSessionFactory: services => new DefaultClientSessionFactory(services)
       },
       // Empty default so `services.buildPhasePasses` always resolves (Langium
       // throws on access to an unbound slot). The framework's own integrity /
-      // profiler passes self-register imperatively, not here.
+      // CST-residency passes self-register imperatively, not here.
       buildPhasePasses: {},
       // Empty default so `services.additionalDocuments` always resolves.
-      additionalDocuments: {}
+      additionalDocuments: {},
+      fileSystemProviders: {
+         [VIRTUAL_SCHEME]: services => new VirtualFileSystemProvider(services)
+      }
    };
 }

package/src/langium/naming/name-provider.ts

@@ -221,6 +221,11 @@ export interface NameProvider extends LangiumNameProvider {
     * walk traverses through the document root: if the root has its own
     * name, that name IS part of the qualified form. Adopters who want a
     * different boundary override this method.
+    *
+    * May answer as of its first read since the last build: the default
+    * memoises per built node, so a name changed in memory after that read
+    * reads as the old one until its document rebuilds. A node in no document
+    * is named afresh on every call.
     */
    getDocumentQualifiedName(node?: AstNode): string | undefined;
 
@@ -236,6 +241,10 @@ export interface NameProvider extends LangiumNameProvider {
     * string) or no project owns the URI — in those cases project-
     * qualified equals document-qualified, and
     * `HydraniumScopeComputation` skips the multi-tier emit.
+    *
+    * The default memoises it as it does {@link getDocumentQualifiedName}, and
+    * for a node in no document answers the document-qualified name: there is
+    * no project to prefix.
     */
    getProjectQualifiedName(node?: AstNode): string | undefined;
 
@@ -254,10 +263,21 @@ export interface NameProvider extends LangiumNameProvider {
    /**
     * Find a unique name for a new node within `container`, using `base`
     * as a stem. Walks the AST subtree rooted at `container` and avoids
-    * names already used by `$type === type` nodes there. Default
-    * generates `${base}1`, `${base}2`, ... until an unused value is
-    * found. Used by create-element operation handlers when the
-    * uniqueness scope is one AST subtree.
+    * names already held there by nodes of `type` or of any subtype of it,
+    * as `AstReflection.isSubtype` reports. Default generates `${base}1`,
+    * `${base}2`, ... until an unused value is found. Used by create-element
+    * operation handlers when the uniqueness scope is one AST subtree.
+    *
+    * Subtype-closed rather than `$type`-exact, because a name space shared by
+    * several concrete types is named by their common supertype and by no
+    * concrete type at all — the shape a cross-reference whose target type is
+    * that supertype produces. An exact filter finds no collisions for such a
+    * call and returns the proposal unchanged, which a caller cannot tell from
+    * a name that was genuinely free.
+    * {@link NameProvider.findNextDocumentQualifiedName} and
+    * {@link NameProvider.findNextProjectQualifiedName} resolve `type` the same
+    * way, through `IndexManager.allElements`, so one type argument does not
+    * mean different sets at different tiers.
     */
    findNextName(type: string, base: string, container: AstNode): string;
 
@@ -315,6 +335,9 @@ export class DefaultNameProvider implements NameProvider {
     * document's lifetime. Evicted automatically when Langium rebuilds
     * the document.
     *
+    * So a built node renamed in memory reads its old name until the rebuild,
+    * as {@link NameProvider.getDocumentQualifiedName} warns.
+    *
     * Only cached when the computed result is a defined string — `undefined`
     * results re-evaluate on each call (cheap path: `getOwnName` returns
     * undefined for unnamed nodes, no chain walk needed).
@@ -323,7 +346,9 @@ export class DefaultNameProvider implements NameProvider {
    /**
     * Per-document memo for {@link getProjectQualifiedName} results.
     * Sibling of {@link documentQualifiedNameCache}; covers the additional
-    * project-reference-name lookup the project-qualified variant performs.
+    * project-reference-name lookup the project-qualified variant performs,
+    * and goes stale on an in-memory rename the same way, as
+    * {@link NameProvider.getDocumentQualifiedName} warns.
     *
     * **Project-rename caveat.** If `Project.referenceName` mutates without
     * a corresponding document rebuild, cached entries become stale. Adopters
@@ -460,8 +485,8 @@ export class DefaultNameProvider implements NameProvider {
     * qualified names.
     *
     * **Within-document references stay keyed by bare names** via
-    * `HydraniumScopeComputation.addLocalSymbol`, which explicitly calls
-    * {@link getOwnName} when populating the local-symbols map (bypassing
+    * `HydraniumScopeComputation.addLocalSymbolByOwnName`, which explicitly
+    * calls {@link getOwnName} when populating the local-symbols map (bypassing
     * Langium's default that goes through this `getName`). The
     * separation lets `getName` carry the workspace-unique form for the
     * linker without forcing qualified names into the per-document
@@ -496,8 +521,9 @@ export class DefaultNameProvider implements NameProvider {
 
    findNextName(type: string, base: string, container: AstNode): string {
       const proposal = base.replaceAll(this.nameSeparator, '_');
+      const reflection = this.services.shared.AstReflection;
       const knownNames = AstUtils.streamAst(container)
-         .filter(node => node.$type === type)
+         .filter(node => reflection.isSubtype(node.$type, type))
          .map(node => this.getOwnName(node))
          .nonNullable()
          .toArray();