Clean up Cause objects to generally be strings. (#1904)

* Clean up Cause objects to generally be strings.
- Change The and Entity types in many places to the more meaningful URI and MIME.
- Remove broken support for queries with "is" but no cause.

* Removed stray "The" instead of "MIME"

Author: ubik2

packages/memory/changes.ts

@@ -1,7 +1,7 @@
 import {
   AssertFact,
   Assertion,
-  Cause,
+  CauseString,
   Changes,
   ClaimFact,
   Fact,
@@ -22,7 +22,7 @@ export const from = <T extends Statement>(statements: Iterable<T>) => {
   }
 
   return changes as T extends Assertion<infer The, infer Of, infer Is>
-    ? { [of in Of]: { [the in The]: { [cause: Cause]: { is: Is } } } }
+    ? { [of in Of]: { [the in The]: { [cause in CauseString]: { is: Is } } } }
     : T extends Fact<infer The, infer Of, infer Is> ? Changes<The, Of, Is>
     : T extends Statement<infer The, infer Of, infer Is> ? Changes<The, Of, Is>
     : never;

packages/memory/consumer.ts

@@ -3,7 +3,7 @@ import type {
   Authorization,
   AuthorizationError,
   Await,
-  Cause,
+  CauseString,
   Clock,
   Command,
   ConnectionError,
@@ -14,14 +14,14 @@ import type {
   ConsumerResultFor,
   DID,
   EnhancedCommit,
-  Entity,
   Fact,
   FactSelection,
   InferOf,
   Invocation,
   InvocationURL,
   JSONValue,
   MemorySpace,
+  MIME,
   OfTheCause,
   Proto,
   Protocol,
@@ -39,13 +39,14 @@ import type {
   SchemaSelector,
   Seconds,
   Select,
+  SelectAll,
   Selection,
   Selector,
   Signer,
-  The,
   Transaction,
   TransactionResult,
   UCAN,
+  URI,
   UTCUnixTimestampInSeconds,
 } from "./interface.ts";
 import { fromJSON, refer } from "./reference.ts";
@@ -367,18 +368,22 @@ class MemorySpaceConsumerSession<Space extends MemorySpace>
   }
 
   private static asSelectSchema(queryArg: QueryArgs): SchemaQueryArgs {
-    const selectSchema: OfTheCause<SchemaPathSelector> = {};
+    const selectSchema: Select<
+      URI,
+      Select<MIME, Select<CauseString, SchemaPathSelector>>
+    > = {};
     for (const [of, attributes] of Object.entries(queryArg.select)) {
-      const entityEntry: Select<The, Select<Cause, SchemaPathSelector>> = {};
-      selectSchema[of as Entity] = entityEntry;
+      const entityEntry: Select<MIME, Select<CauseString, SchemaPathSelector>> =
+        {};
+      selectSchema[of as URI | SelectAll] = entityEntry;
       let attrEntries = Object.entries(attributes);
       // A Selector may not have a "the", but SchemaSelector needs all three levels
       if (attrEntries.length === 0) {
         attrEntries = [["_", {}]];
       }
       for (const [the, causes] of attrEntries) {
-        const attributeEntry: Select<Cause, SchemaPathSelector> = {};
-        entityEntry[the] = attributeEntry;
+        const attributeEntry: Select<CauseString, SchemaPathSelector> = {};
+        entityEntry[the as MIME | SelectAll] = attributeEntry;
         // A Selector may not have a cause, but SchemaSelector needs all three levels
         let causeEntries = Object.entries(causes);
         if (causeEntries.length === 0) {
@@ -390,7 +395,7 @@ class MemorySpaceConsumerSession<Space extends MemorySpace>
             schemaContext: SchemaNone,
             ...selector.is ? { is: selector.is } : {},
           };
-          attributeEntry[cause] = causeEntry;
+          attributeEntry[cause as CauseString | SelectAll] = causeEntry;
         }
       }
     }
@@ -412,7 +417,7 @@ interface Job<Ability, Protocol extends Proto> {
   perform(effect: ConsumerEffectFor<Ability, Protocol>): void;
 }
 
-class ConsumerInvocation<Ability extends The, Protocol extends Proto> {
+class ConsumerInvocation<Ability extends string, Protocol extends Proto> {
   promise: Promise<ConsumerResultFor<Ability, Protocol>>;
 
   return: (input: ConsumerResultFor<Ability, Protocol>) => boolean;
@@ -421,7 +426,7 @@ class ConsumerInvocation<Ability extends The, Protocol extends Proto> {
 
   #reference: Reference<Invocation>;
 
-  static create<Ability extends The, Protocol extends Proto>(
+  static create<Ability extends string, Protocol extends Proto>(
     as: DID,
     { cmd, sub, args, nonce }: Command<Ability, InferOf<Protocol>>,
     time: UTCUnixTimestampInSeconds,
@@ -605,7 +610,7 @@ class QuerySubscriptionInvocation<
   controller:
     | undefined
     | ReadableStreamDefaultController<EnhancedCommit<Space>>;
-  patterns: { the?: The; of?: Entity; cause?: Cause }[];
+  patterns: { the?: MIME; of?: URI; cause?: CauseString }[];
 
   selection: Selection<Space>;
   constructor(public query: QueryView<Space, MemoryProtocol>) {
@@ -654,7 +659,7 @@ class QuerySubscriptionInvocation<
     const fact = toRevision(commit.commit);
 
     const { the, of, is } = fact;
-    const cause = fact.cause.toString();
+    const cause = fact.cause.toString() as CauseString;
     const { transaction, since } = is;
     const matchCommit = this.patterns.some((pattern) =>
       (!pattern.of || pattern.of === of) &&
@@ -666,8 +671,10 @@ class QuerySubscriptionInvocation<
       // Update the main application/commit+json record for the space
       setRevision(differential, of, the, cause, { is, since });
     }
-    for (const [of, attributes] of Object.entries(transaction.args.changes)) {
-      for (const [the, changes] of Object.entries(attributes)) {
+    for (const [k1, attributes] of Object.entries(transaction.args.changes)) {
+      const of = k1 as URI;
+      for (const [k2, changes] of Object.entries(attributes)) {
+        const the = k2 as MIME;
         const causeEntries = Object.entries(changes);
         if (causeEntries.length === 0) {
           // A classified object will not have a cause/change pair
@@ -676,13 +683,14 @@ class QuerySubscriptionInvocation<
             (!pattern.the || pattern.the === the) && !pattern.cause
           );
           if (matchDoc) {
-            setEmptyObj(differential, of as Entity, the);
+            setEmptyObj(differential, of, the);
           }
         } else {
-          const [[cause, change]] = causeEntries;
+          const [[k3, change]] = causeEntries;
+          const cause = k3 as CauseString;
           if (change !== true) {
             const state = Object.entries(
-              selection?.[of as Entity]?.[the] ?? {},
+              selection?.[of]?.[the] ?? {},
             );
             const [current] = state.length > 0 ? state[0] : [];
             if (cause !== current) {
@@ -696,7 +704,7 @@ class QuerySubscriptionInvocation<
                 const value = change.is
                   ? { is: change.is, since: since }
                   : { since: since };
-                setRevision(differential, of as Entity, the, cause, value);
+                setRevision(differential, of, the, cause, value);
               }
             }
           }

packages/memory/fact.ts

@@ -1,15 +1,14 @@
-import { JSONValue } from "@commontools/runner";
+import { JSONValue, URI } from "@commontools/runner";
 import {
   Assertion,
-  Entity,
   Fact,
   FactSelection,
   Invariant,
+  MIME,
   Reference,
   Retraction,
   Revision,
   State,
-  The,
   Unclaimed,
 } from "./interface.ts";
 import {
@@ -23,13 +22,13 @@ import {
  * Creates an unclaimed fact.
  */
 export const unclaimed = (
-  { the, of }: { the: The; of: Entity },
+  { the, of }: { the: MIME; of: URI },
 ): Unclaimed => ({
   the,
   of,
 });
 
-export const assert = <Is extends JSONValue, T extends The, Of extends Entity>({
+export const assert = <Is extends JSONValue, T extends MIME, Of extends URI>({
   the,
   of,
   is,
@@ -77,14 +76,14 @@ export const claimState = (state: State): Invariant => ({
 export const iterate = function* (
   selection: FactSelection,
 ): Iterable<Revision<Fact>> {
-  for (const [entity, attributes] of Object.entries(selection)) {
+  for (const [of, attributes] of Object.entries(selection)) {
     for (const [the, changes] of Object.entries(attributes)) {
       const [change] = Object.entries(changes);
       if (change) {
         const [cause, { is, since }] = change;
         yield {
-          the,
-          of: entity as Entity,
+          the: the as MIME,
+          of: of as URI,
           cause: fromString(cause),
           since,
           ...(is ? { is } : undefined),
@@ -98,8 +97,8 @@ export const iterate = function* (
 // conform), and convert it to a proper fact.
 
 export function normalizeFact<
-  T extends The,
-  Of extends Entity,
+  T extends MIME,
+  Of extends URI,
   Is extends JSONValue,
 >(
   arg: {
@@ -116,8 +115,8 @@ export function normalizeFact<
 ): Assertion<T, Of, Is>;
 
 export function normalizeFact<
-  T extends The,
-  Of extends Entity,
+  T extends MIME,
+  Of extends URI,
   Is extends JSONValue,
 >(
   arg: {
@@ -133,8 +132,8 @@ export function normalizeFact<
 ): Retraction<T, Of, Is>;
 
 export function normalizeFact<
-  T extends The,
-  Of extends Entity,
+  T extends MIME,
+  Of extends URI,
   Is extends JSONValue,
 >(
   arg: {