@procedures/client 0.33.0 → 0.35.0

package/src/server/procedure-server.ts

@@ -20,7 +20,7 @@ import { ProcedureRegistry, PROCEDURE_REGISTRY } from "../procedures/registry.js
 import { createCollectionProcedures } from "../procedures/collection/procedures.js";
 import { InvocationError, closableUnread, invokeProcedure, type AdmitItem, type Interceptor, type Invocation } from "../procedures/invoke.js";
 import type { Capability, ClearanceOrder, ProcedureContext, ResourcesOf } from "../procedures/types.js";
-import { assertTopicsApart, type CollectionPartitions } from "../procedures/collection/partition.js";
+import type { CollectionPartitions } from "../procedures/collection/partition.js";
 import { VERSION_CONFLICTS_METADATA_KEY, versionConflictsOf } from "../procedures/collection/precondition.js";
 import { TIMEOUT_METADATA_KEY, effectsOf, joinNarrowing, narrowCapability } from "../procedures/capability.js";
 import { IdempotencyCache, idempotencyKeyOf, isRepeatable, type IdempotencyOptions } from "../procedures/idempotency.js";
@@ -546,8 +546,7 @@ export class ProcedureServer extends Server implements RepositoryProvider, StopP
     this.publisher = events instanceof EventPublisher ? events : events ? new EventPublisher({ ...events, clock: events.clock ?? this.clock }) : undefined;
     if (this.publisher) this.registerProcedure(this.publisher.procedure, { alwaysOn: true });
 
-    // Configure collections. A new server has no partitions yet: usePartitions() examines these
-    // storages for a shared topic (roadmap CLI-57)
+    // Configure collections
     if (options.collections) {
       for (const [name, storage] of Object.entries(options.collections)) {
         this.storages.set(name, storage);
@@ -626,34 +625,19 @@ export class ProcedureServer extends Server implements RepositoryProvider, StopP
    * for: the collection procedures and the subscriptions of `EventPublisher` use it. `storageOf`
    * gives the storage of a partition: give the same storage for the same partition each time.
    *
-   * The name can have a dot (roadmap CLI-42). The topic of a partition encodes the name, so the
-   * name and the partition of a topic stay apart (`collectionChangeTopic()`).
-   *
-   * The server refuses partitions of `a` while it has a storage of `a.b` (roadmap CLI-57, decision
-   * D23). The plain topic of `a.b` is the topic of the partition `b` of `a`. `useStorage` refuses
-   * the other order.
+   * The name is the raw name, and it can have a dot (roadmap CLI-42 and CLI-75). Each topic
+   * encodes the name, so the name and the partition of a topic stay apart
+   * (`collectionChangeTopic()`). The partitions of `a` and a storage of `a.b` do not share a topic.
    *
    * @param name - Collection name
    * @param partitions - The storage of each partition, and the resolver
    * @returns this (for chaining)
-   * @throws CollectionTopicCollisionError when the topic of a partition is the topic of a collection with a storage
    */
   usePartitions<T>(name: string, partitions: CollectionPartitions<T>): this {
-    assertTopicsApart(this.storages.keys(), (collection) => collection === name);
     this.partitions.set(name, partitions as CollectionPartitions<unknown>);
     return this;
   }
 
-  /**
-   * The check of the topics of new storages (roadmap CLI-57, decision D23). The plain topic of each
-   * one must not be the topic of a partition of a collection with partitions.
-   *
-   * @throws CollectionTopicCollisionError for the first pair with the same topic
-   */
-  private assertPlainTopicsApart(names: Iterable<string>): void {
-    assertTopicsApart(names, (collection) => this.partitions.has(collection));
-  }
-
   // ===========================================================================
   // Storage Configuration
   // ===========================================================================
@@ -674,21 +658,17 @@ export class ProcedureServer extends Server implements RepositoryProvider, StopP
    *   that took the old storage, for the time of `grace` at most. Before, such a call could fail
    *   because the storage was closed.
    *
-   * The server refuses a storage of `a.b` while `a` has partitions (roadmap CLI-57, decision D23).
-   * The plain topic of `a.b` is the topic of the partition `b` of `a`. With options, the promise
-   * rejects, and the old storage stays as it is.
+   * The name is the raw name, and it can have a dot. Its topic encodes the name (roadmap CLI-75).
    *
    * @param name - Collection name
    * @param storage - Storage backend
    * @param options - Drain and close the old storage
    * @returns this (for chaining), or a promise of it when options are given
-   * @throws CollectionTopicCollisionError when the topic of the collection is the topic of a partition
    */
   useStorage<T>(name: string, storage: CollectionStorage<T>): this;
   useStorage<T>(name: string, storage: CollectionStorage<T>, options: UseStorageOptions): Promise<this>;
   useStorage<T>(name: string, storage: CollectionStorage<T>, options?: UseStorageOptions): this | Promise<this> {
     if (options === undefined) {
-      this.assertPlainTopicsApart([name]);
       this.storages.set(name, storage as CollectionStorage<unknown>);
       return this;
     }
@@ -700,9 +680,6 @@ export class ProcedureServer extends Server implements RepositoryProvider, StopP
    * the old storage, and close it.
    */
   private async replaceStorage(name: string, storage: CollectionStorage<unknown>, options: UseStorageOptions): Promise<this> {
-    // Before the flush: a refused storage changes nothing (roadmap CLI-57). With an old storage,
-    // usePartitions() sees the name during the flush. Without one, no await comes before the set.
-    this.assertPlainTopicsApart([name]);
     const graceMs = optionalMs(options.grace, "grace") ?? TIMER_DEFAULTS.server.storageGraceMs;
     const old = this.storages.get(name);
     const other = old !== undefined && old !== storage ? old : undefined;
@@ -774,15 +751,10 @@ export class ProcedureServer extends Server implements RepositoryProvider, StopP
   /**
    * Configure multiple storages at once.
    *
-   * The server examines all the names before it sets a storage: a refused name sets none (roadmap
-   * CLI-57, decision D23).
-   *
    * @param storages - Map of collection names to storage backends
    * @returns this (for chaining)
-   * @throws CollectionTopicCollisionError when the topic of a collection is the topic of a partition
    */
   useStorages(storages: Record<string, CollectionStorage<unknown>>): this {
-    this.assertPlainTopicsApart(Object.keys(storages));
     for (const [name, storage] of Object.entries(storages)) {
       this.storages.set(name, storage);
     }