@tanstack/electric-db-collection 0.2.43 → 0.3.1

package/dist/cjs/tag-index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"tag-index.cjs","sources":["../../src/tag-index.ts"],"sourcesContent":["// Import Row and Message types for the isEventMessage function\nimport type { Message, Row } from '@electric-sql/client'\n\nexport type RowId = string | number\nexport type MoveTag = string\nexport type ParsedMoveTag = Array<string>\nexport type Position = number\nexport type Value = string\nexport type MoveOutPattern = {\n  pos: Position\n  value: Value\n}\n\nconst TAG_WILDCARD = `_`\n\n/**\n * Event message type for move-out events\n */\nexport interface EventMessage {\n  headers: {\n    event: `move-out`\n    patterns: Array<MoveOutPattern>\n  }\n}\n\n/**\n * Tag index structure: array indexed by position, maps value to set of row IDs.\n * For example:\n * ```example\n * const tag1 = [a, b, c]\n * const tag2 = [a, b, d]\n * const tag3 = [a, d, e]\n *\n * // Index is:\n * [\n *   new Map([a -> <rows with a on index 0>])\n *   new Map([b -> <rows with b on index 1>, d -> <rows with d on index 1>])\n *   new Map([c -> <rows with c on index 2>, d -> <rows with d on index 2>, e -> <rows with e on index 2>])\n * ]\n * ```\n */\nexport type TagIndex = Array<Map<Value, Set<RowId>>>\n\n/**\n * Abstraction to get the value at a specific position in a tag\n */\nexport function getValue(tag: ParsedMoveTag, position: Position): Value {\n  if (position >= tag.length) {\n    throw new Error(`Position out of bounds`)\n  }\n  return tag[position]!\n}\n\n/**\n * Abstraction to extract position and value from a pattern.\n */\nfunction getPositionalValue(pattern: MoveOutPattern): {\n  pos: number\n  value: string\n} {\n  return pattern\n}\n\n/**\n * Abstraction to get the length of a tag\n */\nexport function getTagLength(tag: ParsedMoveTag): number {\n  return tag.length\n}\n\n/**\n * Check if a tag matches a pattern.\n * A tag matches if the value at the pattern's position equals the pattern's value,\n * or if the value at that position is \"_\" (wildcard).\n */\nexport function tagMatchesPattern(\n  tag: ParsedMoveTag,\n  pattern: MoveOutPattern,\n): boolean {\n  const { pos, value } = getPositionalValue(pattern)\n  const tagValue = getValue(tag, pos)\n  return tagValue === value || tagValue === TAG_WILDCARD\n}\n\n/**\n * Add a tag to the index for efficient pattern matching\n */\nexport function addTagToIndex(\n  tag: ParsedMoveTag,\n  rowId: RowId,\n  index: TagIndex,\n  tagLength: number,\n): void {\n  for (let i = 0; i < tagLength; i++) {\n    const value = getValue(tag, i)\n\n    // Only index non-wildcard values\n    if (value !== TAG_WILDCARD) {\n      const positionIndex = index[i]!\n      if (!positionIndex.has(value)) {\n        positionIndex.set(value, new Set())\n      }\n\n      const tags = positionIndex.get(value)!\n      tags.add(rowId)\n    }\n  }\n}\n\n/**\n * Remove a tag from the index\n */\nexport function removeTagFromIndex(\n  tag: ParsedMoveTag,\n  rowId: RowId,\n  index: TagIndex,\n  tagLength: number,\n): void {\n  for (let i = 0; i < tagLength; i++) {\n    const value = getValue(tag, i)\n\n    // Only remove non-wildcard values\n    if (value !== TAG_WILDCARD) {\n      const positionIndex = index[i]\n      if (positionIndex) {\n        const rowSet = positionIndex.get(value)\n        if (rowSet) {\n          rowSet.delete(rowId)\n\n          // Clean up empty sets\n          if (rowSet.size === 0) {\n            positionIndex.delete(value)\n          }\n        }\n      }\n    }\n  }\n}\n\n/**\n * Find all rows that match a given pattern\n */\nexport function findRowsMatchingPattern(\n  pattern: MoveOutPattern,\n  index: TagIndex,\n): Set<RowId> {\n  const { pos, value } = getPositionalValue(pattern)\n  const positionIndex = index[pos]\n  const rowSet = positionIndex?.get(value)\n  return rowSet ?? new Set()\n}\n\n/**\n * Check if a message is an event message with move-out event\n */\nexport function isMoveOutMessage<T extends Row<unknown>>(\n  message: Message<T>,\n): message is Message<T> & EventMessage {\n  return message.headers.event === `move-out`\n}\n"],"names":[],"mappings":";;AAaA,MAAM,eAAe;AAiCd,SAAS,SAAS,KAAoB,UAA2B;AACtE,MAAI,YAAY,IAAI,QAAQ;AAC1B,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AACA,SAAO,IAAI,QAAQ;AACrB;AAKA,SAAS,mBAAmB,SAG1B;AACA,SAAO;AACT;AAKO,SAAS,aAAa,KAA4B;AACvD,SAAO,IAAI;AACb;AAOO,SAAS,kBACd,KACA,SACS;AACT,QAAM,EAAE,KAAK,UAAU,mBAAmB,OAAO;AACjD,QAAM,WAAW,SAAS,KAAK,GAAG;AAClC,SAAO,aAAa,SAAS,aAAa;AAC5C;AAKO,SAAS,cACd,KACA,OACA,OACA,WACM;AACN,WAAS,IAAI,GAAG,IAAI,WAAW,KAAK;AAClC,UAAM,QAAQ,SAAS,KAAK,CAAC;AAG7B,QAAI,UAAU,cAAc;AAC1B,YAAM,gBAAgB,MAAM,CAAC;AAC7B,UAAI,CAAC,cAAc,IAAI,KAAK,GAAG;AAC7B,sBAAc,IAAI,OAAO,oBAAI,IAAA,CAAK;AAAA,MACpC;AAEA,YAAM,OAAO,cAAc,IAAI,KAAK;AACpC,WAAK,IAAI,KAAK;AAAA,IAChB;AAAA,EACF;AACF;AAKO,SAAS,mBACd,KACA,OACA,OACA,WACM;AACN,WAAS,IAAI,GAAG,IAAI,WAAW,KAAK;AAClC,UAAM,QAAQ,SAAS,KAAK,CAAC;AAG7B,QAAI,UAAU,cAAc;AAC1B,YAAM,gBAAgB,MAAM,CAAC;AAC7B,UAAI,eAAe;AACjB,cAAM,SAAS,cAAc,IAAI,KAAK;AACtC,YAAI,QAAQ;AACV,iBAAO,OAAO,KAAK;AAGnB,cAAI,OAAO,SAAS,GAAG;AACrB,0BAAc,OAAO,KAAK;AAAA,UAC5B;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAKO,SAAS,wBACd,SACA,OACY;AACZ,QAAM,EAAE,KAAK,UAAU,mBAAmB,OAAO;AACjD,QAAM,gBAAgB,MAAM,GAAG;AAC/B,QAAM,SAAS,eAAe,IAAI,KAAK;AACvC,SAAO,8BAAc,IAAA;AACvB;AAKO,SAAS,iBACd,SACsC;AACtC,SAAO,QAAQ,QAAQ,UAAU;AACnC;;;;;;;;"}
+{"version":3,"file":"tag-index.cjs","sources":["../../src/tag-index.ts"],"sourcesContent":["// Import Row and Message types for the isEventMessage function\nimport type { Message, Row } from '@electric-sql/client'\n\nexport type RowId = string | number\nexport type MoveTag = string\nexport type ParsedMoveTag = Array<string | NonParticipating>\nexport type Position = number\nexport type Value = string\nexport type MovePattern = {\n  pos: Position\n  value: Value\n}\n\n/**\n * Sentinel value for tag positions where the disjunct does not participate\n * in that condition. These positions are not indexed and won't match any\n * move pattern.\n */\nexport const NON_PARTICIPATING = null\nexport type NonParticipating = typeof NON_PARTICIPATING\n\nexport type ActiveConditions = Array<boolean>\nexport type DisjunctPositions = Array<Array<number>>\n\n/**\n * Event message type for move-out and move-in events\n */\nexport interface EventMessage {\n  headers: {\n    event: `move-out` | `move-in`\n    patterns: Array<MovePattern>\n  }\n}\n\n/**\n * Tag index structure: array indexed by position, maps value to set of row IDs.\n * For example:\n * ```example\n * const tag1 = [a, b, c]\n * const tag2 = [a, b, d]\n * const tag3 = [a, d, e]\n *\n * // Index is:\n * [\n *   new Map([a -> <rows with a on index 0>])\n *   new Map([b -> <rows with b on index 1>, d -> <rows with d on index 1>])\n *   new Map([c -> <rows with c on index 2>, d -> <rows with d on index 2>, e -> <rows with e on index 2>])\n * ]\n * ```\n */\nexport type TagIndex = Array<Map<Value, Set<RowId>>>\n\n/**\n * Parse a tag string into a ParsedMoveTag.\n * Splits on `/` delimiter and maps empty strings to {@link NON_PARTICIPATING}.\n */\nexport function parseTag(tag: MoveTag): ParsedMoveTag {\n  return tag.split(`/`).map((s) => (s === `` ? NON_PARTICIPATING : s))\n}\n\n/**\n * Abstraction to get the value at a specific position in a tag\n */\nexport function getValue(\n  tag: ParsedMoveTag,\n  position: Position,\n): string | NonParticipating {\n  if (position >= tag.length) {\n    throw new Error(`Position out of bounds`)\n  }\n  return tag[position]!\n}\n\n/**\n * Abstraction to extract position and value from a pattern.\n */\nfunction getPositionalValue(pattern: MovePattern): {\n  pos: number\n  value: string\n} {\n  return pattern\n}\n\n/**\n * Abstraction to get the length of a tag\n */\nexport function getTagLength(tag: ParsedMoveTag): number {\n  return tag.length\n}\n\n/**\n * Check if a tag matches a pattern.\n * A tag matches if the value at the pattern's position equals the pattern's value.\n * {@link NON_PARTICIPATING} positions naturally don't match any string value.\n */\nexport function tagMatchesPattern(\n  tag: ParsedMoveTag,\n  pattern: MovePattern,\n): boolean {\n  const { pos, value } = getPositionalValue(pattern)\n  const tagValue = getValue(tag, pos)\n  return tagValue === value\n}\n\n/**\n * Add a tag to the index for efficient pattern matching\n */\nexport function addTagToIndex(\n  tag: ParsedMoveTag,\n  rowId: RowId,\n  index: TagIndex,\n  tagLength: number,\n): void {\n  for (let i = 0; i < tagLength; i++) {\n    const value = getValue(tag, i)\n\n    if (value !== NON_PARTICIPATING) {\n      const positionIndex = index[i]!\n      if (!positionIndex.has(value)) {\n        positionIndex.set(value, new Set())\n      }\n\n      const tags = positionIndex.get(value)!\n      tags.add(rowId)\n    }\n  }\n}\n\n/**\n * Remove a tag from the index\n */\nexport function removeTagFromIndex(\n  tag: ParsedMoveTag,\n  rowId: RowId,\n  index: TagIndex,\n  tagLength: number,\n): void {\n  for (let i = 0; i < tagLength; i++) {\n    const value = getValue(tag, i)\n\n    if (value !== NON_PARTICIPATING) {\n      const positionIndex = index[i]\n      if (positionIndex) {\n        const rowSet = positionIndex.get(value)\n        if (rowSet) {\n          rowSet.delete(rowId)\n\n          // Clean up empty sets\n          if (rowSet.size === 0) {\n            positionIndex.delete(value)\n          }\n        }\n      }\n    }\n  }\n}\n\n/**\n * Find all rows that match a given pattern\n */\nexport function findRowsMatchingPattern(\n  pattern: MovePattern,\n  index: TagIndex,\n): Set<RowId> {\n  const { pos, value } = getPositionalValue(pattern)\n  const positionIndex = index[pos]\n  const rowSet = positionIndex?.get(value)\n  return rowSet ?? new Set()\n}\n\n/**\n * Derive disjunct positions from parsed tags.\n * For each tag (= disjunct), collect the indices of participating positions.\n * E.g., [\"hash_a\", NON_PARTICIPATING, \"hash_b\"] → [0, 2]\n */\nexport function deriveDisjunctPositions(\n  tags: Array<ParsedMoveTag>,\n): DisjunctPositions {\n  return tags.map((tag) => {\n    const positions: Array<number> = []\n    for (let i = 0; i < tag.length; i++) {\n      if (tag[i] !== NON_PARTICIPATING) {\n        positions.push(i)\n      }\n    }\n    return positions\n  })\n}\n\n/**\n * Evaluate whether a row is visible given active conditions and disjunct positions.\n * Returns true if ANY disjunct has ALL its positions as true in activeConditions.\n */\nexport function rowVisible(\n  activeConditions: ActiveConditions,\n  disjunctPositions: DisjunctPositions,\n): boolean {\n  return disjunctPositions.some((positions) =>\n    positions.every((pos) => activeConditions[pos]),\n  )\n}\n\n/**\n * Check if a message is an event message with move-out event\n */\nexport function isMoveOutMessage<T extends Row<unknown>>(\n  message: Message<T>,\n): message is Message<T> & EventMessage {\n  return message.headers.event === `move-out`\n}\n\n/**\n * Check if a message is an event message with move-in event\n */\nexport function isMoveInMessage<T extends Row<unknown>>(\n  message: Message<T>,\n): message is Message<T> & EventMessage {\n  return message.headers.event === `move-in`\n}\n"],"names":[],"mappings":";;AAkBO,MAAM,oBAAoB;AAsC1B,SAAS,SAAS,KAA6B;AACpD,SAAO,IAAI,MAAM,GAAG,EAAE,IAAI,CAAC,MAAO,MAAM,KAAK,oBAAoB,CAAE;AACrE;AAKO,SAAS,SACd,KACA,UAC2B;AAC3B,MAAI,YAAY,IAAI,QAAQ;AAC1B,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AACA,SAAO,IAAI,QAAQ;AACrB;AAKA,SAAS,mBAAmB,SAG1B;AACA,SAAO;AACT;AAKO,SAAS,aAAa,KAA4B;AACvD,SAAO,IAAI;AACb;AAOO,SAAS,kBACd,KACA,SACS;AACT,QAAM,EAAE,KAAK,UAAU,mBAAmB,OAAO;AACjD,QAAM,WAAW,SAAS,KAAK,GAAG;AAClC,SAAO,aAAa;AACtB;AAKO,SAAS,cACd,KACA,OACA,OACA,WACM;AACN,WAAS,IAAI,GAAG,IAAI,WAAW,KAAK;AAClC,UAAM,QAAQ,SAAS,KAAK,CAAC;AAE7B,QAAI,UAAU,mBAAmB;AAC/B,YAAM,gBAAgB,MAAM,CAAC;AAC7B,UAAI,CAAC,cAAc,IAAI,KAAK,GAAG;AAC7B,sBAAc,IAAI,OAAO,oBAAI,IAAA,CAAK;AAAA,MACpC;AAEA,YAAM,OAAO,cAAc,IAAI,KAAK;AACpC,WAAK,IAAI,KAAK;AAAA,IAChB;AAAA,EACF;AACF;AAKO,SAAS,mBACd,KACA,OACA,OACA,WACM;AACN,WAAS,IAAI,GAAG,IAAI,WAAW,KAAK;AAClC,UAAM,QAAQ,SAAS,KAAK,CAAC;AAE7B,QAAI,UAAU,mBAAmB;AAC/B,YAAM,gBAAgB,MAAM,CAAC;AAC7B,UAAI,eAAe;AACjB,cAAM,SAAS,cAAc,IAAI,KAAK;AACtC,YAAI,QAAQ;AACV,iBAAO,OAAO,KAAK;AAGnB,cAAI,OAAO,SAAS,GAAG;AACrB,0BAAc,OAAO,KAAK;AAAA,UAC5B;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAKO,SAAS,wBACd,SACA,OACY;AACZ,QAAM,EAAE,KAAK,UAAU,mBAAmB,OAAO;AACjD,QAAM,gBAAgB,MAAM,GAAG;AAC/B,QAAM,SAAS,eAAe,IAAI,KAAK;AACvC,SAAO,8BAAc,IAAA;AACvB;AAOO,SAAS,wBACd,MACmB;AACnB,SAAO,KAAK,IAAI,CAAC,QAAQ;AACvB,UAAM,YAA2B,CAAA;AACjC,aAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,UAAI,IAAI,CAAC,MAAM,mBAAmB;AAChC,kBAAU,KAAK,CAAC;AAAA,MAClB;AAAA,IACF;AACA,WAAO;AAAA,EACT,CAAC;AACH;AAMO,SAAS,WACd,kBACA,mBACS;AACT,SAAO,kBAAkB;AAAA,IAAK,CAAC,cAC7B,UAAU,MAAM,CAAC,QAAQ,iBAAiB,GAAG,CAAC;AAAA,EAAA;AAElD;AAKO,SAAS,iBACd,SACsC;AACtC,SAAO,QAAQ,QAAQ,UAAU;AACnC;AAKO,SAAS,gBACd,SACsC;AACtC,SAAO,QAAQ,QAAQ,UAAU;AACnC;;;;;;;;;;;;;"}

package/dist/cjs/tag-index.d.cts

@@ -1,20 +1,29 @@
 import { Message, Row } from '@electric-sql/client';
 export type RowId = string | number;
 export type MoveTag = string;
-export type ParsedMoveTag = Array<string>;
+export type ParsedMoveTag = Array<string | NonParticipating>;
 export type Position = number;
 export type Value = string;
-export type MoveOutPattern = {
+export type MovePattern = {
     pos: Position;
     value: Value;
 };
 /**
- * Event message type for move-out events
+ * Sentinel value for tag positions where the disjunct does not participate
+ * in that condition. These positions are not indexed and won't match any
+ * move pattern.
+ */
+export declare const NON_PARTICIPATING: null;
+export type NonParticipating = typeof NON_PARTICIPATING;
+export type ActiveConditions = Array<boolean>;
+export type DisjunctPositions = Array<Array<number>>;
+/**
+ * Event message type for move-out and move-in events
  */
 export interface EventMessage {
     headers: {
-        event: `move-out`;
-        patterns: Array<MoveOutPattern>;
+        event: `move-out` | `move-in`;
+        patterns: Array<MovePattern>;
     };
 }
 /**
@@ -34,20 +43,25 @@ export interface EventMessage {
  * ```
  */
 export type TagIndex = Array<Map<Value, Set<RowId>>>;
+/**
+ * Parse a tag string into a ParsedMoveTag.
+ * Splits on `/` delimiter and maps empty strings to {@link NON_PARTICIPATING}.
+ */
+export declare function parseTag(tag: MoveTag): ParsedMoveTag;
 /**
  * Abstraction to get the value at a specific position in a tag
  */
-export declare function getValue(tag: ParsedMoveTag, position: Position): Value;
+export declare function getValue(tag: ParsedMoveTag, position: Position): string | NonParticipating;
 /**
  * Abstraction to get the length of a tag
  */
 export declare function getTagLength(tag: ParsedMoveTag): number;
 /**
  * Check if a tag matches a pattern.
- * A tag matches if the value at the pattern's position equals the pattern's value,
- * or if the value at that position is "_" (wildcard).
+ * A tag matches if the value at the pattern's position equals the pattern's value.
+ * {@link NON_PARTICIPATING} positions naturally don't match any string value.
  */
-export declare function tagMatchesPattern(tag: ParsedMoveTag, pattern: MoveOutPattern): boolean;
+export declare function tagMatchesPattern(tag: ParsedMoveTag, pattern: MovePattern): boolean;
 /**
  * Add a tag to the index for efficient pattern matching
  */
@@ -59,8 +73,23 @@ export declare function removeTagFromIndex(tag: ParsedMoveTag, rowId: RowId, ind
 /**
  * Find all rows that match a given pattern
  */
-export declare function findRowsMatchingPattern(pattern: MoveOutPattern, index: TagIndex): Set<RowId>;
+export declare function findRowsMatchingPattern(pattern: MovePattern, index: TagIndex): Set<RowId>;
+/**
+ * Derive disjunct positions from parsed tags.
+ * For each tag (= disjunct), collect the indices of participating positions.
+ * E.g., ["hash_a", NON_PARTICIPATING, "hash_b"] → [0, 2]
+ */
+export declare function deriveDisjunctPositions(tags: Array<ParsedMoveTag>): DisjunctPositions;
+/**
+ * Evaluate whether a row is visible given active conditions and disjunct positions.
+ * Returns true if ANY disjunct has ALL its positions as true in activeConditions.
+ */
+export declare function rowVisible(activeConditions: ActiveConditions, disjunctPositions: DisjunctPositions): boolean;
 /**
  * Check if a message is an event message with move-out event
  */
 export declare function isMoveOutMessage<T extends Row<unknown>>(message: Message<T>): message is Message<T> & EventMessage;
+/**
+ * Check if a message is an event message with move-in event
+ */
+export declare function isMoveInMessage<T extends Row<unknown>>(message: Message<T>): message is Message<T> & EventMessage;

package/dist/esm/electric.js

@@ -5,7 +5,7 @@ import DebugModule from "debug";
 import { DeduplicatedLoadSubset, and } from "@tanstack/db";
 import { StreamAbortedError, ExpectedNumberInAwaitTxIdError, TimeoutWaitingForTxIdError, TimeoutWaitingForMatchError } from "./errors.js";
 import { compileSQL } from "./sql-compiler.js";
-import { isMoveOutMessage, getTagLength, addTagToIndex, removeTagFromIndex, findRowsMatchingPattern, tagMatchesPattern } from "./tag-index.js";
+import { isMoveOutMessage, isMoveInMessage, deriveDisjunctPositions, getTagLength, addTagToIndex, parseTag, removeTagFromIndex, findRowsMatchingPattern, rowVisible, tagMatchesPattern } from "./tag-index.js";
 const debug = DebugModule.debug(`ts/db:electric`);
 const ELECTRIC_TEST_HOOKS = /* @__PURE__ */ Symbol(`electricTestHooks`);
 function isUpToDateMessage(message) {
@@ -399,18 +399,20 @@ function createElectricSync(shapeOptions, options) {
   const MAX_BATCH_MESSAGES = 1e3;
   const relationSchema = new Store(void 0);
   const tagCache = /* @__PURE__ */ new Map();
-  const parseTag = (tag) => {
+  const parseTag$1 = (tag) => {
     const cachedTag = tagCache.get(tag);
     if (cachedTag) {
       return cachedTag;
     }
-    const parsedTag = tag.split(`|`);
+    const parsedTag = parseTag(tag);
     tagCache.set(tag, parsedTag);
     return parsedTag;
   };
   const rowTagSets = /* @__PURE__ */ new Map();
   const tagIndex = [];
   let tagLength = void 0;
+  const rowActiveConditions = /* @__PURE__ */ new Map();
+  let disjunctPositions = void 0;
   const initializeTagIndex = (length) => {
     if (tagIndex.length < length) {
       for (let i = tagIndex.length; i < length; i++) {
@@ -420,7 +422,7 @@ function createElectricSync(shapeOptions, options) {
   };
   const addTagsToRow = (tags, rowId, rowTagSet) => {
     for (const tag of tags) {
-      const parsedTag = parseTag(tag);
+      const parsedTag = parseTag$1(tag);
       if (tagLength === void 0) {
         tagLength = getTagLength(parsedTag);
         initializeTagIndex(tagLength);
@@ -441,29 +443,38 @@ function createElectricSync(shapeOptions, options) {
       return;
     }
     for (const tag of removedTags) {
-      const parsedTag = parseTag(tag);
+      const parsedTag = parseTag$1(tag);
       rowTagSet.delete(tag);
       removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength);
       tagCache.delete(tag);
     }
   };
-  const processTagsForChangeMessage = (tags, removedTags, rowId) => {
+  const processTagsForChangeMessage = (tags, removedTags, rowId, activeConditions) => {
     if (!rowTagSets.has(rowId)) {
       rowTagSets.set(rowId, /* @__PURE__ */ new Set());
     }
     const rowTagSet = rowTagSets.get(rowId);
     if (tags) {
       addTagsToRow(tags, rowId, rowTagSet);
+      if (disjunctPositions === void 0) {
+        const parsedTags = tags.map(parseTag$1);
+        disjunctPositions = deriveDisjunctPositions(parsedTags);
+      }
     }
     if (removedTags) {
       removeTagsFromRow(removedTags, rowId, rowTagSet);
     }
+    if (activeConditions && activeConditions.length > 0) {
+      rowActiveConditions.set(rowId, [...activeConditions]);
+    }
     return rowTagSet;
   };
   const clearTagTrackingState = () => {
     rowTagSets.clear();
     tagIndex.length = 0;
     tagLength = void 0;
+    rowActiveConditions.clear();
+    disjunctPositions = void 0;
   };
   const clearTagsForRow = (rowId) => {
     if (tagLength === void 0) {
@@ -474,7 +485,7 @@ function createElectricSync(shapeOptions, options) {
       return;
     }
     for (const tag of rowTagSet) {
-      const parsedTag = parseTag(tag);
+      const parsedTag = parseTag$1(tag);
       const currentTagLength = getTagLength(parsedTag);
       if (currentTagLength === tagLength) {
         removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength);
@@ -482,14 +493,30 @@ function createElectricSync(shapeOptions, options) {
       tagCache.delete(tag);
     }
     rowTagSets.delete(rowId);
+    rowActiveConditions.delete(rowId);
   };
   const removeMatchingTagsFromRow = (rowId, pattern) => {
     const rowTagSet = rowTagSets.get(rowId);
     if (!rowTagSet) {
       return false;
     }
+    const activeConditions = rowActiveConditions.get(rowId);
+    if (activeConditions && disjunctPositions) {
+      activeConditions[pattern.pos] = false;
+      if (!rowVisible(activeConditions, disjunctPositions)) {
+        for (const tag of rowTagSet) {
+          const parsedTag = parseTag$1(tag);
+          removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength);
+          tagCache.delete(tag);
+        }
+        rowTagSets.delete(rowId);
+        rowActiveConditions.delete(rowId);
+        return true;
+      }
+      return false;
+    }
     for (const tag of rowTagSet) {
-      const parsedTag = parseTag(tag);
+      const parsedTag = parseTag$1(tag);
       if (tagMatchesPattern(parsedTag, pattern)) {
         rowTagSet.delete(tag);
         removeTagFromIndex(parsedTag, rowId, tagIndex, tagLength);
@@ -526,6 +553,23 @@ function createElectricSync(shapeOptions, options) {
     }
     return txStarted;
   };
+  const processMoveInEvent = (patterns) => {
+    if (tagLength === void 0) {
+      debug(
+        `${collectionId ? `[${collectionId}] ` : ``}Received move-in message but no tag length set yet, ignoring`
+      );
+      return;
+    }
+    for (const pattern of patterns) {
+      const affectedRowIds = findRowsMatchingPattern(pattern, tagIndex);
+      for (const rowId of affectedRowIds) {
+        const activeConditions = rowActiveConditions.get(rowId);
+        if (activeConditions) {
+          activeConditions[pattern.pos] = true;
+        }
+      }
+    }
+  };
   const getSyncMetadata = () => {
     const schema = relationSchema.state || `public`;
     return {
@@ -678,6 +722,7 @@ You can provide an 'onError' handler on the shapeOptions to handle this error, a
         const tags = changeMessage.headers.tags;
         const removedTags = changeMessage.headers.removed_tags;
         const hasTags = tags || removedTags;
+        const activeConditions = changeMessage.headers.active_conditions;
         const rowId = collection.getKeyFromItem(changeMessage.value);
         const operation = changeMessage.headers.operation;
         const isDelete = operation === `delete`;
@@ -690,7 +735,12 @@ You can provide an 'onError' handler on the shapeOptions to handle this error, a
         if (isDelete) {
           clearTagsForRow(rowId);
         } else if (hasTags) {
-          processTagsForChangeMessage(tags, removedTags, rowId);
+          processTagsForChangeMessage(
+            tags,
+            removedTags,
+            rowId,
+            activeConditions
+          );
         }
         write({
           type: isDuplicateInsert ? `update` : operation,
@@ -719,7 +769,7 @@ You can provide an 'onError' handler on the shapeOptions to handle this error, a
         let commitPoint = null;
         batchCommitted.setState(() => false);
         for (const message of messages) {
-          if (isChangeMessage(message) || isMoveOutMessage(message)) {
+          if (isChangeMessage(message) || isMoveOutMessage(message) || isMoveInMessage(message)) {
             currentBatchMessages.setState((currentBuffer) => {
               const newBuffer = [...currentBuffer, message];
               if (newBuffer.length > MAX_BATCH_MESSAGES) {
@@ -782,6 +832,12 @@ You can provide an 'onError' handler on the shapeOptions to handle this error, a
                 transactionStarted
               );
             }
+          } else if (isMoveInMessage(message)) {
+            if (isBufferingInitialSync() && !transactionStarted) {
+              bufferedMessages.push(message);
+            } else {
+              processMoveInEvent(message.headers.patterns);
+            }
           } else if (isMustRefetchMessage(message)) {
             debug(
               `${collectionId ? `[${collectionId}] ` : ``}Received must-refetch message, starting transaction with truncate`
@@ -826,6 +882,8 @@ You can provide an 'onError' handler on the shapeOptions to handle this error, a
                   write,
                   transactionStarted
                 );
+              } else if (isMoveInMessage(bufferedMsg)) {
+                processMoveInEvent(bufferedMsg.headers.patterns);
               }
             }
             stageResumeMetadata();