@ibodr/schema 0.2.6 → 0.2.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { structuredClone, sortByIndex, objectMapFromEntries, getIndices, objectMapEntries, registerDrawLibraryVersion, mapObjectMapValues, uniqueId, safeParseUrl, assert, filterEntries, objectMapValues, annotateError } from '@ibodr/utils';
+import { structuredClone, sortByIndex, objectMapFromEntries, getIndices, objectMapEntries, registerDrawLibraryVersion, mapObjectMapValues, uniqueId, safeParseUrl, filterEntries, objectMapValues, annotateError, assert } from '@ibodr/utils';
 import { T } from '@ibodr/validate';
 import { createMigrationIds, createRecordMigrationSequence, createMigrationSequence, createRecordType, StoreSchema, RecordType } from '@ibodr/store';
 import { computed } from '@ibodr/state';
@@ -1046,6 +1046,49 @@ var arrowBindingMigrations = createBindingPropsMigrationSequence({
     }
   ]
 });
+var assetVersions = createMigrationIds("com.draw.asset", {
+  AddMeta: 1
+});
+var assetMigrations = createRecordMigrationSequence({
+  sequenceId: "com.draw.asset",
+  recordType: "asset",
+  sequence: [
+    {
+      id: assetVersions.AddMeta,
+      up: (record) => {
+        record.meta = {};
+      }
+    }
+  ]
+});
+function createAssetRecordType(assets) {
+  return createRecordType("asset", {
+    scope: "document",
+    validator: T.model(
+      "asset",
+      T.union(
+        "type",
+        mapObjectMapValues(
+          assets,
+          (type, { props, meta }) => createAssetValidator(type, props, meta)
+        )
+      )
+    )
+  }).withDefaultProperties(() => ({
+    meta: {}
+  }));
+}
+var AssetRecordType = createRecordType("asset", {
+  scope: "document"
+}).withDefaultProperties(() => ({
+  meta: {}
+}));
+function createAssetPropsMigrationSequence(migrations) {
+  return migrations;
+}
+function createAssetPropsMigrationIds(assetType, ids) {
+  return mapObjectMapValues(ids, (_k, v) => `com.draw.asset.${assetType}/${v}`);
+}
 var cameraValidator = T.model(
   "camera",
   T.object({
@@ -1083,11 +1126,132 @@ var CameraRecordType = createRecordType("camera", {
     meta: {}
   })
 );
+function createCustomRecordType(typeName, config) {
+  return createRecordType(typeName, {
+    scope: config.scope,
+    validator: config.validator
+  }).withDefaultProperties(config.createDefaultProperties ?? (() => ({})));
+}
+function processCustomRecordMigrations(records) {
+  const result = [];
+  for (const [typeName, config] of Object.entries(records)) {
+    const sequenceId = `com.draw.${typeName}`;
+    const { migrations } = config;
+    if (!migrations) {
+      result.push(
+        createMigrationSequence({
+          sequenceId,
+          retroactive: true,
+          sequence: []
+        })
+      );
+    } else if ("sequenceId" in migrations) {
+      assert(
+        sequenceId === migrations.sequenceId,
+        `sequenceId mismatch for ${typeName} custom record migrations. Expected '${sequenceId}', got '${migrations.sequenceId}'`
+      );
+      result.push(migrations);
+    } else if ("sequence" in migrations) {
+      result.push(
+        createMigrationSequence({
+          sequenceId,
+          retroactive: true,
+          sequence: migrations.sequence.map((m) => {
+            if (!("id" in m)) return m;
+            return {
+              id: m.id,
+              dependsOn: m.dependsOn,
+              scope: "record",
+              filter: (r) => r.typeName === typeName,
+              up: (record) => {
+                const result2 = m.up(record);
+                if (result2) return result2;
+              },
+              down: typeof m.down === "function" ? (record) => {
+                const result2 = m.down(record);
+                if (result2) return result2;
+              } : void 0
+            };
+          })
+        })
+      );
+    }
+  }
+  return result;
+}
+function createCustomRecordMigrationIds(recordType, ids) {
+  return mapObjectMapValues(ids, (_k, v) => `com.draw.${recordType}/${v}`);
+}
+function createCustomRecordMigrationSequence(migrations) {
+  return migrations;
+}
+function createCustomRecordId(typeName, id) {
+  return `${typeName}:${id ?? uniqueId()}`;
+}
+function isCustomRecordId(typeName, id) {
+  if (!id) return false;
+  return id.startsWith(`${typeName}:`);
+}
+function isCustomRecord(typeName, record) {
+  if (!record) return false;
+  return record.typeName === typeName;
+}
+var documentValidator = T.model(
+  "document",
+  T.object({
+    typeName: T.literal("document"),
+    id: T.literal("document:document"),
+    gridSize: T.number,
+    name: T.string,
+    meta: T.jsonValue
+  })
+);
+function isDocument(record) {
+  if (!record) return false;
+  return record.typeName === "document";
+}
+var documentVersions = createMigrationIds("com.draw.document", {
+  AddName: 1,
+  AddMeta: 2
+});
+var documentMigrations = createRecordMigrationSequence({
+  sequenceId: "com.draw.document",
+  recordType: "document",
+  sequence: [
+    {
+      id: documentVersions.AddName,
+      up: (document) => {
+        document.name = "";
+      },
+      down: (document) => {
+        delete document.name;
+      }
+    },
+    {
+      id: documentVersions.AddMeta,
+      up: (record) => {
+        record.meta = {};
+      }
+    }
+  ]
+});
+var DocumentRecordType = createRecordType("document", {
+  validator: documentValidator,
+  scope: "document"
+}).withDefaultProperties(
+  () => ({
+    gridSize: 10,
+    name: "",
+    meta: {}
+  })
+);
+var DrDOCUMENT_ID = DocumentRecordType.createId("document");
 var TL_CURSOR_TYPES = /* @__PURE__ */ new Set([
   "none",
   "default",
   "pointer",
   "cross",
+  "comment",
   "grab",
   "rotate",
   "grabbing",
@@ -1173,9 +1337,80 @@ var PageRecordType = createRecordType("page", {
 }).withDefaultProperties(() => ({
   meta: {}
 }));
+function isPage(record) {
+  if (!record) return false;
+  return record.typeName === "page";
+}
 function isPageId(id) {
   return PageRecordType.isId(id);
 }
+var userIdValidator = idValidator("user");
+var userVersions = createMigrationIds("com.draw.user", {
+  Initial: 1
+});
+var userMigrations = createRecordMigrationSequence({
+  sequenceId: "com.draw.user",
+  recordType: "user",
+  sequence: [
+    {
+      id: userVersions.Initial,
+      up: (_record) => {
+      }
+    }
+  ]
+});
+function createUserRecordType(config) {
+  const metaConfig = config?.meta;
+  const metaValidator = metaConfig ? T.object(
+    Object.fromEntries(
+      Object.entries(metaConfig).map(([key, v]) => [
+        key,
+        new T.Validator((value) => {
+          if (value === void 0) return void 0;
+          return v.validate(value);
+        })
+      ])
+    )
+  ).allowUnknownProperties() : T.jsonValue;
+  const validator = T.model(
+    "user",
+    T.object({
+      typeName: T.literal("user"),
+      id: userIdValidator,
+      name: T.string,
+      color: T.string,
+      imageUrl: T.string,
+      meta: metaValidator
+    })
+  );
+  return createRecordType("user", {
+    validator,
+    scope: "document"
+  }).withDefaultProperties(() => ({
+    name: "",
+    color: "",
+    imageUrl: "",
+    meta: {}
+  }));
+}
+T.model(
+  "user",
+  T.object({
+    typeName: T.literal("user"),
+    id: userIdValidator,
+    name: T.string,
+    color: T.string,
+    imageUrl: T.string,
+    meta: T.jsonValue
+  })
+);
+var UserRecordType = createUserRecordType();
+function isUserId(id) {
+  return UserRecordType.isId(id);
+}
+function createUserId(id) {
+  return UserRecordType.createId(id);
+}
 
 // src/records/DrInstance.ts
 var DR_BOARD_BACKGROUND_TYPES = [
@@ -1272,7 +1507,7 @@ function createInstanceRecordType(stylesById) {
       typeName: T.literal("instance"),
       id: idValidator("instance"),
       currentPageId: pageIdValidator,
-      followingUserId: T.string.nullable(),
+      followingUserId: userIdValidator.nullable(),
       brush: boxModelValidator.nullable(),
       opacityForNextShape: opacityValidator,
       stylesForNextShape: T.object(stylesForNextShapeValidators),
@@ -1290,7 +1525,7 @@ function createInstanceRecordType(stylesById) {
       backgroundType: T.literalEnum(...DR_BOARD_BACKGROUND_TYPES),
       chatMessage: T.string,
       isChatting: T.boolean,
-      highlightedUserIds: T.arrayOf(T.string),
+      highlightedUserIds: T.arrayOf(userIdValidator),
       isFocused: T.boolean,
       devicePixelRatio: T.number,
       isCoarsePointer: T.boolean,
@@ -1356,7 +1591,7 @@ function createInstanceRecordType(stylesById) {
         rotation: 0
       },
       isFocusMode: false,
-      exportBackground: false,
+      exportBackground: true,
       isDebugMode: false,
       isToolLocked: false,
       screenBounds: { x: 0, y: 0, w: 1080, h: 720 },
@@ -1788,7 +2023,11 @@ var InstancePageStateRecordType = createRecordType(
     ephemeralKeys: {
       pageId: false,
       selectedShapeIds: false,
-      editingShapeId: false,
+      // editingShapeId is set with `history: 'ignore'`, so entering the editing
+      // state is never undoable. Marking it ephemeral keeps undo/redo from
+      // reapplying a stale editingShapeId (e.g. after a shape it pointed at was
+      // deleted), which could leave the editor pointing at a missing shape.
+      editingShapeId: true,
       croppingShapeId: false,
       meta: false,
       hintingShapeIds: true,
@@ -1852,10 +2091,10 @@ var instancePresenceValidator = T.model(
   T.object({
     typeName: T.literal("instance_presence"),
     id: idValidator("instance_presence"),
-    userId: T.string,
+    userId: userIdValidator,
     userName: T.string,
     lastActivityTimestamp: T.number.nullable(),
-    followingUserId: T.string.nullable(),
+    followingUserId: userIdValidator.nullable(),
     cursor: T.object({
       x: T.number,
       y: T.number,
@@ -1898,350 +2137,68 @@ var instancePresenceMigrations = createRecordMigrationSequence({
       }
     },
     {
-      id: instancePresenceVersions.RemoveInstanceId,
-      up: (instance) => {
-        delete instance.instanceId;
-      }
-    },
-    {
-      id: instancePresenceVersions.AddChatMessage,
-      up: (instance) => {
-        instance.chatMessage = "";
-      }
-    },
-    {
-      id: instancePresenceVersions.AddMeta,
-      up: (record) => {
-        record.meta = {};
-      }
-    },
-    {
-      id: instancePresenceVersions.RenameSelectedShapeIds,
-      up: (_record) => {
-      }
-    },
-    {
-      id: instancePresenceVersions.NullableCameraCursor,
-      up: (_record) => {
-      },
-      down: (record) => {
-        if (record.camera === null) {
-          record.camera = { x: 0, y: 0, z: 1 };
-        }
-        if (record.lastActivityTimestamp === null) {
-          record.lastActivityTimestamp = 0;
-        }
-        if (record.cursor === null) {
-          record.cursor = { type: "default", x: 0, y: 0, rotation: 0 };
-        }
-        if (record.screenBounds === null) {
-          record.screenBounds = { x: 0, y: 0, w: 1, h: 1 };
-        }
-      }
-    }
-  ]
-});
-var InstancePresenceRecordType = createRecordType(
-  "instance_presence",
-  {
-    validator: instancePresenceValidator,
-    scope: "presence"
-  }
-).withDefaultProperties(() => ({
-  lastActivityTimestamp: null,
-  followingUserId: null,
-  color: "#FF0000",
-  camera: null,
-  cursor: null,
-  screenBounds: null,
-  selectedShapeIds: [],
-  brush: null,
-  scribbles: [],
-  chatMessage: "",
-  meta: {}
-}));
-
-// src/createPresenceStateDerivation.ts
-function createPresenceStateDerivation($user, opts) {
-  const { instanceId, getUserPresence: _getUserPresence } = opts ?? {};
-  const getUserPresence = _getUserPresence ?? getDefaultUserPresence;
-  return (store) => {
-    return computed("instancePresence", () => {
-      const user = $user.get();
-      if (!user) return null;
-      const state = getUserPresence(store, user);
-      if (!state) return null;
-      return InstancePresenceRecordType.create({
-        ...state,
-        id: instanceId ?? InstancePresenceRecordType.createId(store.id)
-      });
-    });
-  };
-}
-function getDefaultUserPresence(store, user) {
-  const instance = store.get(DrINSTANCE_ID);
-  const pageState = store.get(InstancePageStateRecordType.createId(instance?.currentPageId));
-  const camera = store.get(CameraRecordType.createId(instance?.currentPageId));
-  const pointer = store.get(DrPOINTER_ID);
-  if (!pageState || !instance || !camera || !pointer) {
-    return null;
-  }
-  return {
-    selectedShapeIds: pageState.selectedShapeIds,
-    brush: instance.brush,
-    scribbles: instance.scribbles,
-    userId: user.id,
-    userName: user.name,
-    followingUserId: instance.followingUserId,
-    camera: {
-      x: camera.x,
-      y: camera.y,
-      z: camera.z
-    },
-    color: user.color || "#FF0000",
-    currentPageId: instance.currentPageId,
-    cursor: {
-      x: pointer.x,
-      y: pointer.y,
-      rotation: instance.cursor.rotation,
-      type: instance.cursor.type
-    },
-    lastActivityTimestamp: pointer.lastActivityTimestamp,
-    screenBounds: instance.screenBounds,
-    chatMessage: instance.chatMessage,
-    meta: {}
-  };
-}
-var assetVersions = createMigrationIds("com.draw.asset", {
-  AddMeta: 1
-});
-var assetMigrations = createRecordMigrationSequence({
-  sequenceId: "com.draw.asset",
-  recordType: "asset",
-  sequence: [
-    {
-      id: assetVersions.AddMeta,
-      up: (record) => {
-        record.meta = {};
-      }
-    }
-  ]
-});
-function createAssetRecordType(assets) {
-  return createRecordType("asset", {
-    scope: "document",
-    validator: T.model(
-      "asset",
-      T.union(
-        "type",
-        mapObjectMapValues(
-          assets,
-          (type, { props, meta }) => createAssetValidator(type, props, meta)
-        )
-      )
-    )
-  }).withDefaultProperties(() => ({
-    meta: {}
-  }));
-}
-var AssetRecordType = createRecordType("asset", {
-  scope: "document"
-}).withDefaultProperties(() => ({
-  meta: {}
-}));
-function createAssetPropsMigrationSequence(migrations) {
-  return migrations;
-}
-function createAssetPropsMigrationIds(assetType, ids) {
-  return mapObjectMapValues(ids, (_k, v) => `com.draw.asset.${assetType}/${v}`);
-}
-function createCustomRecordType(typeName, config) {
-  return createRecordType(typeName, {
-    scope: config.scope,
-    validator: config.validator
-  }).withDefaultProperties(config.createDefaultProperties ?? (() => ({})));
-}
-function processCustomRecordMigrations(records) {
-  const result = [];
-  for (const [typeName, config] of Object.entries(records)) {
-    const sequenceId = `com.draw.${typeName}`;
-    const { migrations } = config;
-    if (!migrations) {
-      result.push(
-        createMigrationSequence({
-          sequenceId,
-          retroactive: true,
-          sequence: []
-        })
-      );
-    } else if ("sequenceId" in migrations) {
-      assert(
-        sequenceId === migrations.sequenceId,
-        `sequenceId mismatch for ${typeName} custom record migrations. Expected '${sequenceId}', got '${migrations.sequenceId}'`
-      );
-      result.push(migrations);
-    } else if ("sequence" in migrations) {
-      result.push(
-        createMigrationSequence({
-          sequenceId,
-          retroactive: true,
-          sequence: migrations.sequence.map((m) => {
-            if (!("id" in m)) return m;
-            return {
-              id: m.id,
-              dependsOn: m.dependsOn,
-              scope: "record",
-              filter: (r) => r.typeName === typeName,
-              up: (record) => {
-                const result2 = m.up(record);
-                if (result2) return result2;
-              },
-              down: typeof m.down === "function" ? (record) => {
-                const result2 = m.down(record);
-                if (result2) return result2;
-              } : void 0
-            };
-          })
-        })
-      );
-    }
-  }
-  return result;
-}
-function createCustomRecordMigrationIds(recordType, ids) {
-  return mapObjectMapValues(ids, (_k, v) => `com.draw.${recordType}/${v}`);
-}
-function createCustomRecordMigrationSequence(migrations) {
-  return migrations;
-}
-function createCustomRecordId(typeName, id) {
-  return `${typeName}:${id ?? uniqueId()}`;
-}
-function isCustomRecordId(typeName, id) {
-  if (!id) return false;
-  return id.startsWith(`${typeName}:`);
-}
-function isCustomRecord(typeName, record) {
-  if (!record) return false;
-  return record.typeName === typeName;
-}
-var documentValidator = T.model(
-  "document",
-  T.object({
-    typeName: T.literal("document"),
-    id: T.literal("document:document"),
-    gridSize: T.number,
-    name: T.string,
-    meta: T.jsonValue
-  })
-);
-function isDocument(record) {
-  if (!record) return false;
-  return record.typeName === "document";
-}
-var documentVersions = createMigrationIds("com.draw.document", {
-  AddName: 1,
-  AddMeta: 2
-});
-var documentMigrations = createRecordMigrationSequence({
-  sequenceId: "com.draw.document",
-  recordType: "document",
-  sequence: [
-    {
-      id: documentVersions.AddName,
-      up: (document) => {
-        document.name = "";
-      },
-      down: (document) => {
-        delete document.name;
-      }
-    },
-    {
-      id: documentVersions.AddMeta,
-      up: (record) => {
-        record.meta = {};
-      }
-    }
-  ]
-});
-var DocumentRecordType = createRecordType("document", {
-  validator: documentValidator,
-  scope: "document"
-}).withDefaultProperties(
-  () => ({
-    gridSize: 10,
-    name: "",
-    meta: {}
-  })
-);
-var DrDOCUMENT_ID = DocumentRecordType.createId("document");
-var userIdValidator = idValidator("user");
-var userVersions = createMigrationIds("com.draw.user", {
-  Initial: 1
-});
-var userMigrations = createRecordMigrationSequence({
-  sequenceId: "com.draw.user",
-  recordType: "user",
-  sequence: [
+      id: instancePresenceVersions.RemoveInstanceId,
+      up: (instance) => {
+        delete instance.instanceId;
+      }
+    },
     {
-      id: userVersions.Initial,
+      id: instancePresenceVersions.AddChatMessage,
+      up: (instance) => {
+        instance.chatMessage = "";
+      }
+    },
+    {
+      id: instancePresenceVersions.AddMeta,
+      up: (record) => {
+        record.meta = {};
+      }
+    },
+    {
+      id: instancePresenceVersions.RenameSelectedShapeIds,
+      up: (_record) => {
+      }
+    },
+    {
+      id: instancePresenceVersions.NullableCameraCursor,
       up: (_record) => {
+      },
+      down: (record) => {
+        if (record.camera === null) {
+          record.camera = { x: 0, y: 0, z: 1 };
+        }
+        if (record.lastActivityTimestamp === null) {
+          record.lastActivityTimestamp = 0;
+        }
+        if (record.cursor === null) {
+          record.cursor = { type: "default", x: 0, y: 0, rotation: 0 };
+        }
+        if (record.screenBounds === null) {
+          record.screenBounds = { x: 0, y: 0, w: 1, h: 1 };
+        }
       }
     }
   ]
 });
-function createUserRecordType(config) {
-  const metaConfig = config?.meta;
-  const metaValidator = metaConfig ? T.object(
-    Object.fromEntries(
-      Object.entries(metaConfig).map(([key, v]) => [
-        key,
-        new T.Validator((value) => {
-          if (value === void 0) return void 0;
-          return v.validate(value);
-        })
-      ])
-    )
-  ).allowUnknownProperties() : T.jsonValue;
-  const validator = T.model(
-    "user",
-    T.object({
-      typeName: T.literal("user"),
-      id: userIdValidator,
-      name: T.string,
-      color: T.string,
-      imageUrl: T.string,
-      meta: metaValidator
-    })
-  );
-  return createRecordType("user", {
-    validator,
-    scope: "document"
-  }).withDefaultProperties(() => ({
-    name: "",
-    color: "",
-    imageUrl: "",
-    meta: {}
-  }));
-}
-T.model(
-  "user",
-  T.object({
-    typeName: T.literal("user"),
-    id: userIdValidator,
-    name: T.string,
-    color: T.string,
-    imageUrl: T.string,
-    meta: T.jsonValue
-  })
-);
-var UserRecordType = createUserRecordType();
-function isUserId(id) {
-  return UserRecordType.isId(id);
-}
-function createUserId(id) {
-  return UserRecordType.createId(id);
-}
+var InstancePresenceRecordType = createRecordType(
+  "instance_presence",
+  {
+    validator: instancePresenceValidator,
+    scope: "presence"
+  }
+).withDefaultProperties(() => ({
+  lastActivityTimestamp: null,
+  followingUserId: null,
+  color: "#FF0000",
+  camera: null,
+  cursor: null,
+  screenBounds: null,
+  selectedShapeIds: [],
+  brush: null,
+  scribbles: [],
+  chatMessage: "",
+  meta: {}
+}));
 var bookmarkShapeProps = {
   w: T.nonZeroNumber,
   h: T.nonZeroNumber,
@@ -2275,12 +2232,20 @@ var bookmarkShapeMigrations = createShapePropsMigrationSequence({
     }
   ]
 });
+
+// src/misc/b64Vecs.ts
 var FIRST_POINT_B64_LENGTH = 16;
+var FIRST_POINT_2D_B64_LENGTH = 12;
+var DEFAULT_PRESSURE = 0.5;
+var DIM_2D = 2;
+var DIM_3D = 3;
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 var B64_LOOKUP = new Uint8Array(128);
 for (let i = 0; i < 64; i++) {
   B64_LOOKUP[BASE64_CHARS.charCodeAt(i)] = i;
 }
+var SIX_BIT_MASK = 63;
+var PADDING_CHAR_CODE = "=".charCodeAt(0);
 var POW2 = new Float64Array(31);
 for (let i = 0; i < 31; i++) {
   POW2[i] = Math.pow(2, i - 15);
@@ -2308,10 +2273,19 @@ function nativeBase64ToUint8Array(base64) {
   return Uint8Array.fromBase64(base64);
 }
 function fallbackBase64ToUint8Array(base64) {
-  const numBytes = Math.floor(base64.length * 3 / 4);
+  const paddedLength = base64.length;
+  let padding = 0;
+  if (paddedLength > 0 && base64.charCodeAt(paddedLength - 1) === PADDING_CHAR_CODE) {
+    padding++;
+    if (paddedLength > 1 && base64.charCodeAt(paddedLength - 2) === PADDING_CHAR_CODE) {
+      padding++;
+    }
+  }
+  const numBytes = Math.floor(paddedLength * 3 / 4) - padding;
   const bytes = new Uint8Array(numBytes);
   let byteIndex = 0;
-  for (let i = 0; i < base64.length; i += 4) {
+  const fullGroups = Math.floor((paddedLength - padding) / 4) * 4;
+  for (let i = 0; i < fullGroups; i += 4) {
     const c0 = B64_LOOKUP[base64.charCodeAt(i)];
     const c1 = B64_LOOKUP[base64.charCodeAt(i + 1)];
     const c2 = B64_LOOKUP[base64.charCodeAt(i + 2)];
@@ -2321,20 +2295,45 @@ function fallbackBase64ToUint8Array(base64) {
     bytes[byteIndex++] = bitmap >> 8 & 255;
     bytes[byteIndex++] = bitmap & 255;
   }
+  if (padding === 1) {
+    const c0 = B64_LOOKUP[base64.charCodeAt(fullGroups)];
+    const c1 = B64_LOOKUP[base64.charCodeAt(fullGroups + 1)];
+    const c2 = B64_LOOKUP[base64.charCodeAt(fullGroups + 2)];
+    const bitmap = c0 << 18 | c1 << 12 | c2 << 6;
+    bytes[byteIndex++] = bitmap >> 16 & 255;
+    bytes[byteIndex++] = bitmap >> 8 & 255;
+  } else if (padding === 2) {
+    const c0 = B64_LOOKUP[base64.charCodeAt(fullGroups)];
+    const c1 = B64_LOOKUP[base64.charCodeAt(fullGroups + 1)];
+    const bitmap = c0 << 18 | c1 << 12;
+    bytes[byteIndex++] = bitmap >> 16 & 255;
+  }
   return bytes;
 }
 function nativeUint8ArrayToBase64(uint8Array) {
   return uint8Array.toBase64();
 }
 function fallbackUint8ArrayToBase64(uint8Array) {
-  assert(uint8Array.length % 3 === 0, "Uint8Array length must be a multiple of 3");
+  const len = uint8Array.length;
+  const fullGroups = Math.floor(len / 3) * 3;
   let result = "";
-  for (let i = 0; i < uint8Array.length; i += 3) {
+  for (let i = 0; i < fullGroups; i += 3) {
     const byte1 = uint8Array[i];
     const byte2 = uint8Array[i + 1];
     const byte3 = uint8Array[i + 2];
     const bitmap = byte1 << 16 | byte2 << 8 | byte3;
-    result += BASE64_CHARS[bitmap >> 18 & 63] + BASE64_CHARS[bitmap >> 12 & 63] + BASE64_CHARS[bitmap >> 6 & 63] + BASE64_CHARS[bitmap & 63];
+    result += BASE64_CHARS[bitmap >> 18 & SIX_BIT_MASK] + // bits 23–18 (top sextet)
+    BASE64_CHARS[bitmap >> 12 & SIX_BIT_MASK] + // bits 17–12
+    BASE64_CHARS[bitmap >> 6 & SIX_BIT_MASK] + // bits 11–6
+    BASE64_CHARS[bitmap & SIX_BIT_MASK];
+  }
+  const remaining = len - fullGroups;
+  if (remaining === 1) {
+    const bitmap = uint8Array[fullGroups] << 16;
+    result += BASE64_CHARS[bitmap >> 18 & SIX_BIT_MASK] + BASE64_CHARS[bitmap >> 12 & SIX_BIT_MASK] + "==";
+  } else if (remaining === 2) {
+    const bitmap = uint8Array[fullGroups] << 16 | uint8Array[fullGroups + 1] << 8;
+    result += BASE64_CHARS[bitmap >> 18 & SIX_BIT_MASK] + BASE64_CHARS[bitmap >> 12 & SIX_BIT_MASK] + BASE64_CHARS[bitmap >> 6 & SIX_BIT_MASK] + "=";
   }
   return result;
 }
@@ -2381,7 +2380,7 @@ function numberToFloat16Bits(value) {
   }
   return sign << 15 | expBiased << 10 | frac;
 }
-var b64Vecs = class {
+var b64Vecs = class _b64Vecs {
   /**
    * Encode a single point (x, y, z) to 8 base64 characters using legacy Float16 encoding.
    * Each coordinate is encoded as a Float16 value, resulting in 6 bytes total.
@@ -2455,10 +2454,12 @@ var b64Vecs = class {
    * - Delta points: 3 Float16 values each = 6 bytes = 8 base64 chars each
    *
    * @param points - An array of VecModel objects to encode
+   * @param dim - Encoding dimension; `2` routes through the 2D variant (drops z), `3` (default) keeps x, y, z
    * @returns A base64-encoded string containing delta-encoded points
    * @public
    */
-  static encodePoints(points) {
+  static encodePoints(points, dim) {
+    if (dim === DIM_2D) return _b64Vecs.encodePoints2D(points);
     if (points.length === 0) return "";
     const firstPointBytes = 12;
     const deltaBytes = (points.length - 1) * 6;
@@ -2491,10 +2492,12 @@ var b64Vecs = class {
    * Float16 deltas that are accumulated to reconstruct absolute positions.
    *
    * @param base64 - The base64-encoded string containing delta-encoded point data
+   * @param dim - Encoding dimension; `2` expects x/y only (z supplied as 0.5), `3` (default) expects x/y/z
    * @returns An array of VecModel objects with absolute coordinates
    * @public
    */
-  static decodePoints(base64) {
+  static decodePoints(base64, dim) {
+    if (dim === DIM_2D) return _b64Vecs.decodePoints2D(base64);
     if (base64.length === 0) return [];
     const bytes = base64ToUint8Array(base64);
     const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
@@ -2517,10 +2520,12 @@ var b64Vecs = class {
    * The first point is stored as Float32 for full precision.
    *
    * @param b64Points - The delta-encoded base64 string
+   * @param dim - Encoding dimension; `2` expects x/y only (z supplied as 0.5), `3` (default) expects x/y/z
    * @returns The first point as a VecModel, or null if the string is too short
    * @public
    */
-  static decodeFirstPoint(b64Points) {
+  static decodeFirstPoint(b64Points, dim) {
+    if (dim === DIM_2D) return _b64Vecs.decodeFirstPoint2D(b64Points);
     if (b64Points.length < FIRST_POINT_B64_LENGTH) return null;
     const bytes = base64ToUint8Array(b64Points.slice(0, FIRST_POINT_B64_LENGTH));
     const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
@@ -2535,10 +2540,12 @@ var b64Vecs = class {
    * Requires decoding all points to accumulate deltas.
    *
    * @param b64Points - The delta-encoded base64 string
+   * @param dim - Encoding dimension; `2` expects x/y only (z supplied as 0.5), `3` (default) expects x/y/z
    * @returns The last point as a VecModel, or null if the string is too short
    * @public
    */
-  static decodeLastPoint(b64Points) {
+  static decodeLastPoint(b64Points, dim) {
+    if (dim === DIM_2D) return _b64Vecs.decodeLastPoint2D(b64Points);
     if (b64Points.length < FIRST_POINT_B64_LENGTH) return null;
     const bytes = base64ToUint8Array(b64Points);
     const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
@@ -2553,12 +2560,129 @@ var b64Vecs = class {
     }
     return { x, y, z };
   }
+  /**
+   * Encode an array of VecModels as 2D delta-encoded points, dropping z entirely.
+   * Use for draw shapes from devices that don't report pressure, where z is a
+   * constant 0.5 and storing it wastes ~33% of per-point bytes.
+   *
+   * Format:
+   * - First point: 2 Float32 values (x, y) = 8 bytes
+   * - Delta points: 2 Float16 values (dx, dy) = 4 bytes each
+   *
+   * @param points - An array of VecModel objects to encode (z is discarded)
+   * @returns A base64-encoded string containing 2D delta-encoded points
+   * @public
+   */
+  static encodePoints2D(points) {
+    if (points.length === 0) return "";
+    const firstPointBytes = 8;
+    const deltaBytes = (points.length - 1) * 4;
+    const buffer = new Uint8Array(firstPointBytes + deltaBytes);
+    const dataView = new DataView(buffer.buffer);
+    const first = points[0];
+    dataView.setFloat32(0, first.x, true);
+    dataView.setFloat32(4, first.y, true);
+    let prevX = first.x;
+    let prevY = first.y;
+    for (let i = 1; i < points.length; i++) {
+      const p = points[i];
+      const offset = firstPointBytes + (i - 1) * 4;
+      setFloat16(dataView, offset, p.x - prevX);
+      setFloat16(dataView, offset + 2, p.y - prevY);
+      prevX = p.x;
+      prevY = p.y;
+    }
+    return uint8ArrayToBase64(buffer);
+  }
+  /**
+   * Decode a 2D delta-encoded base64 string back to an array of absolute VecModels.
+   * The z coordinate is always set to 0.5 (the default pressure value) so downstream
+   * consumers don't need a separate code path.
+   *
+   * @param base64 - The base64-encoded string containing 2D delta-encoded point data
+   * @returns An array of VecModel objects with absolute (x, y) and z = 0.5
+   * @public
+   */
+  static decodePoints2D(base64) {
+    if (base64.length === 0) return [];
+    const bytes = base64ToUint8Array(base64);
+    const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    const result = [];
+    let x = dataView.getFloat32(0, true);
+    let y = dataView.getFloat32(4, true);
+    result.push({ x, y, z: DEFAULT_PRESSURE });
+    const firstPointBytes = 8;
+    for (let offset = firstPointBytes; offset < bytes.length; offset += 4) {
+      x += getFloat16(dataView, offset);
+      y += getFloat16(dataView, offset + 2);
+      result.push({ x, y, z: DEFAULT_PRESSURE });
+    }
+    return result;
+  }
+  /**
+   * Get the first point from a 2D delta-encoded base64 string.
+   *
+   * @param b64Points - The 2D delta-encoded base64 string
+   * @returns The first point with z = 0.5, or null if the string is too short
+   * @public
+   */
+  static decodeFirstPoint2D(b64Points) {
+    if (b64Points.length < FIRST_POINT_2D_B64_LENGTH) return null;
+    const bytes = base64ToUint8Array(b64Points.slice(0, FIRST_POINT_2D_B64_LENGTH));
+    const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    return {
+      x: dataView.getFloat32(0, true),
+      y: dataView.getFloat32(4, true),
+      z: DEFAULT_PRESSURE
+    };
+  }
+  /**
+   * Get the last point from a 2D delta-encoded base64 string.
+   * Requires decoding all points to accumulate deltas.
+   *
+   * @param b64Points - The 2D delta-encoded base64 string
+   * @returns The last point with z = 0.5, or null if the string is too short
+   * @public
+   */
+  static decodeLastPoint2D(b64Points) {
+    if (b64Points.length < FIRST_POINT_2D_B64_LENGTH) return null;
+    const bytes = base64ToUint8Array(b64Points);
+    const dataView = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    let x = dataView.getFloat32(0, true);
+    let y = dataView.getFloat32(4, true);
+    const firstPointBytes = 8;
+    for (let offset = firstPointBytes; offset < bytes.length; offset += 4) {
+      x += getFloat16(dataView, offset);
+      y += getFloat16(dataView, offset + 2);
+    }
+    return { x, y, z: DEFAULT_PRESSURE };
+  }
+  /**
+   * Whether an encoded path contains only a single point (a "dot"), inferred from
+   * the encoded length without decoding — cheap enough for the render path.
+   *
+   * The single-point length depends on the encoding dimension, so this takes the
+   * segment's `dim`: a one-point path is `FIRST_POINT_B64_LENGTH` chars (3D) or
+   * `FIRST_POINT_2D_B64_LENGTH` chars (2D). Keeping this beside the layout constants
+   * is deliberate — it is the single source of truth for "how long is one point", so
+   * callers never hard-code a length threshold (which silently breaks when a new
+   * encoding is added).
+   *
+   * @param b64Points - The encoded path string
+   * @param dim - Encoding dimension; `2` for (x, y), `3` (default) for (x, y, z)
+   * @returns true if the path encodes exactly one point
+   * @public
+   */
+  static isSinglePoint(b64Points, dim) {
+    return b64Points.length <= (dim === DIM_2D ? FIRST_POINT_2D_B64_LENGTH : FIRST_POINT_B64_LENGTH);
+  }
 };
 
 // src/shapes/DrDrawShape.ts
 var DrawShapeSegment = T.object({
   type: T.literalEnum("free", "straight"),
-  path: T.string
+  path: T.string,
+  dim: T.literalEnum(DIM_2D, DIM_3D).optional()
 });
 var drawShapeProps = {
   color: DefaultColorStyle,
@@ -2577,7 +2701,8 @@ var Versions5 = createShapePropsMigrationIds("draw", {
   AddInPen: 1,
   AddScale: 2,
   Base64: 3,
-  LegacyPointsConversion: 4
+  LegacyPointsConversion: 4,
+  OmitNonPressureZ: 5
 });
 var drawShapeMigrations = createShapePropsMigrationSequence({
   sequence: [
@@ -2648,6 +2773,18 @@ var drawShapeMigrations = createShapePropsMigrationSequence({
       },
       down: (_props) => {
       }
+    },
+    {
+      id: Versions5.OmitNonPressureZ,
+      up: (_props) => {
+      },
+      down: (props) => {
+        props.segments = props.segments.map((segment) => {
+          if (segment.dim === void 0) return segment;
+          const { dim, ...rest } = segment;
+          return dim === DIM_2D ? { ...rest, path: b64Vecs.encodePoints(b64Vecs.decodePoints(segment.path, DIM_2D)) } : rest;
+        });
+      }
     }
   ]
 });
@@ -3168,7 +3305,8 @@ var highlightShapeProps = {
 var Versions8 = createShapePropsMigrationIds("highlight", {
   AddScale: 1,
   Base64: 2,
-  LegacyPointsConversion: 3
+  LegacyPointsConversion: 3,
+  OmitNonPressureZ: 4
 });
 var highlightShapeMigrations = createShapePropsMigrationSequence({
   sequence: [
@@ -3223,6 +3361,18 @@ var highlightShapeMigrations = createShapePropsMigrationSequence({
       },
       down: (_props) => {
       }
+    },
+    {
+      id: Versions8.OmitNonPressureZ,
+      up: (_props) => {
+      },
+      down: (props) => {
+        props.segments = props.segments.map((segment) => {
+          if (segment.dim === void 0) return segment;
+          const { dim, ...rest } = segment;
+          return dim === DIM_2D ? { ...rest, path: b64Vecs.encodePoints(b64Vecs.decodePoints(segment.path, DIM_2D)) } : rest;
+        });
+      }
     }
   ]
 });
@@ -3440,7 +3590,7 @@ var noteShapeProps = {
   url: T.linkUrl,
   richText: richTextValidator,
   scale: T.nonZeroNumber,
-  textFirstEditedBy: T.string.nullable()
+  textLastEditedBy: T.string.nullable()
 };
 var Versions10 = createShapePropsMigrationIds("note", {
   AddUrlProp: 1,
@@ -3454,7 +3604,8 @@ var Versions10 = createShapePropsMigrationIds("note", {
   AddRichText: 9,
   AddRichTextAttrs: 10,
   AddFirstEditedBy: 11,
-  MakeFontSizeAdjustmentRatio: 12
+  MakeFontSizeAdjustmentRatio: 12,
+  RenameFirstEditedByToLast: 13
 });
 var noteShapeMigrations = createShapePropsMigrationSequence({
   sequence: [
@@ -3573,6 +3724,17 @@ var noteShapeMigrations = createShapePropsMigrationSequence({
       down: (props) => {
         props.fontSizeAdjustment = 0;
       }
+    },
+    {
+      id: Versions10.RenameFirstEditedByToLast,
+      up: (props) => {
+        props.textLastEditedBy = props.textFirstEditedBy ?? null;
+        delete props.textFirstEditedBy;
+      },
+      down: (props) => {
+        props.textFirstEditedBy = props.textLastEditedBy ?? null;
+        delete props.textLastEditedBy;
+      }
     }
   ]
 });
@@ -3863,8 +4025,7 @@ function createIntegrityChecker(store) {
       store.put([
         store.schema.types.instance.create({
           id: DrINSTANCE_ID,
-          currentPageId: getFirstPageId(),
-          exportBackground: true
+          currentPageId: getFirstPageId()
         })
       ]);
       return ensureStoreIsUsable();
@@ -4045,6 +4206,56 @@ function createDrSchema({
     }
   );
 }
+function createPresenceStateDerivation($user, opts) {
+  const { instanceId, getUserPresence: _getUserPresence } = opts ?? {};
+  const getUserPresence = _getUserPresence ?? getDefaultUserPresence;
+  return (store) => {
+    return computed("instancePresence", () => {
+      const user = $user.get();
+      if (!user) return null;
+      const state = getUserPresence(store, user);
+      if (!state) return null;
+      return InstancePresenceRecordType.create({
+        ...state,
+        id: instanceId ?? InstancePresenceRecordType.createId(store.id)
+      });
+    });
+  };
+}
+function getDefaultUserPresence(store, user) {
+  const instance = store.get(DrINSTANCE_ID);
+  const pageState = store.get(InstancePageStateRecordType.createId(instance?.currentPageId));
+  const camera = store.get(CameraRecordType.createId(instance?.currentPageId));
+  const pointer = store.get(DrPOINTER_ID);
+  if (!pageState || !instance || !camera || !pointer) {
+    return null;
+  }
+  return {
+    selectedShapeIds: pageState.selectedShapeIds,
+    brush: instance.brush,
+    scribbles: instance.scribbles,
+    userId: user.id,
+    userName: user.name,
+    followingUserId: instance.followingUserId,
+    camera: {
+      x: camera.x,
+      y: camera.y,
+      z: camera.z
+    },
+    color: user.color || "#FF0000",
+    currentPageId: instance.currentPageId,
+    cursor: {
+      x: pointer.x,
+      y: pointer.y,
+      rotation: instance.cursor.rotation,
+      type: instance.cursor.type
+    },
+    lastActivityTimestamp: pointer.lastActivityTimestamp,
+    screenBounds: instance.screenBounds,
+    chatMessage: instance.chatMessage,
+    meta: {}
+  };
+}
 
 // src/misc/DrHandle.ts
 var TL_HANDLE_TYPES = /* @__PURE__ */ new Set(["vertex", "virtual", "create", "clone"]);
@@ -4143,10 +4354,10 @@ function getSupportedLocale(locale) {
 // src/index.ts
 registerDrawLibraryVersion(
   "@ibodr/schema",
-  "0.2.6",
+  "0.2.7",
   "esm"
 );
 
-export { ArrowShapeArrowheadEndStyle, ArrowShapeArrowheadStartStyle, ArrowShapeKindStyle, AssetRecordType, CameraRecordType, DR_BOARD_BACKGROUND_TYPES, DefaultColorStyle, DefaultDashStyle, DefaultFillStyle, DefaultFontFamilies, DefaultFontStyle, DefaultHorizontalAlignStyle, DefaultLabelColorStyle, DefaultSizeStyle, DefaultTextAlignStyle, DefaultVerticalAlignStyle, DocumentRecordType, DrDOCUMENT_ID, DrINSTANCE_ID, DrPOINTER_ID, ElbowArrowSnap, EnumStyleProp, GeoShapeGeoStyle, ImageShapeCrop, InstancePageStateRecordType, InstancePresenceRecordType, LANGUAGES, LineShapeSplineStyle, PageRecordType, PointerRecordType, StyleProp, TL_CANVAS_UI_COLOR_TYPES, TL_CURSOR_TYPES, TL_HANDLE_TYPES, TL_SCRIBBLE_STATES, UserRecordType, arrowBindingMigrations, arrowBindingProps, arrowBindingVersions, arrowShapeMigrations, arrowShapeProps, arrowShapeVersions, assetIdValidator, assetMigrations, b64Vecs, bindingIdValidator, bookmarkAssetMigrations, bookmarkAssetProps, bookmarkShapeMigrations, bookmarkShapeProps, boxModelValidator, canvasUiColorTypeValidator, compressLegacySegments, createAssetPropsMigrationIds, createAssetPropsMigrationSequence, createAssetRecordType, createAssetValidator, createBindingId, createBindingPropsMigrationIds, createBindingPropsMigrationSequence, createBindingValidator, createCachedUserResolve, createCustomRecordId, createCustomRecordMigrationIds, createCustomRecordMigrationSequence, createDrSchema, createPresenceStateDerivation, createShapeId, createShapePropsMigrationIds, createShapePropsMigrationSequence, createShapeValidator, createUserId, createUserRecordType, defaultAssetSchemas, defaultBindingSchemas, defaultShapeSchemas, drawShapeMigrations, drawShapeProps, embedShapeMigrations, embedShapeProps, frameShapeMigrations, frameShapeProps, geoShapeMigrations, geoShapeProps, getDefaultTranslationLocale, getDefaultUserPresence, getShapePropKeysByStyle, groupShapeMigrations, groupShapeProps, highlightShapeMigrations, highlightShapeProps, idValidator, imageAssetMigrations, imageAssetProps, imageShapeMigrations, imageShapeProps, isBinding, isBindingId, isCssHexColor, isCustomRecord, isCustomRecordId, isDocument, isFontEntry, isPageId, isShape, isShapeId, isUserId, lineShapeMigrations, lineShapeProps, noteShapeMigrations, noteShapeProps, opacityValidator, pageIdValidator, parentIdValidator, pluckPreservingValues, registerColorsFromThemes, registerFontsFromThemes, richTextValidator, rootBindingMigrations, rootShapeMigrations, scribbleValidator, shapeIdValidator, textShapeMigrations, textShapeProps, toRichText, userIdValidator, vecModelValidator, videoAssetMigrations, videoAssetProps, videoShapeMigrations, videoShapeProps };
+export { ArrowShapeArrowheadEndStyle, ArrowShapeArrowheadStartStyle, ArrowShapeKindStyle, AssetRecordType, CameraRecordType, DIM_2D, DIM_3D, DR_BOARD_BACKGROUND_TYPES, DefaultColorStyle, DefaultDashStyle, DefaultFillStyle, DefaultFontFamilies, DefaultFontStyle, DefaultHorizontalAlignStyle, DefaultLabelColorStyle, DefaultSizeStyle, DefaultTextAlignStyle, DefaultVerticalAlignStyle, DocumentRecordType, DrDOCUMENT_ID, DrINSTANCE_ID, DrPOINTER_ID, ElbowArrowSnap, EnumStyleProp, GeoShapeGeoStyle, ImageShapeCrop, InstancePageStateRecordType, InstancePresenceRecordType, LANGUAGES, LineShapeSplineStyle, PageRecordType, PointerRecordType, StyleProp, TL_CANVAS_UI_COLOR_TYPES, TL_CURSOR_TYPES, TL_HANDLE_TYPES, TL_SCRIBBLE_STATES, UserRecordType, arrowBindingMigrations, arrowBindingProps, arrowBindingVersions, arrowShapeMigrations, arrowShapeProps, arrowShapeVersions, assetIdValidator, assetMigrations, b64Vecs, bindingIdValidator, bookmarkAssetMigrations, bookmarkAssetProps, bookmarkShapeMigrations, bookmarkShapeProps, boxModelValidator, canvasUiColorTypeValidator, compressLegacySegments, createAssetPropsMigrationIds, createAssetPropsMigrationSequence, createAssetRecordType, createAssetValidator, createBindingId, createBindingPropsMigrationIds, createBindingPropsMigrationSequence, createBindingValidator, createCachedUserResolve, createCustomRecordId, createCustomRecordMigrationIds, createCustomRecordMigrationSequence, createDrSchema, createPresenceStateDerivation, createShapeId, createShapePropsMigrationIds, createShapePropsMigrationSequence, createShapeValidator, createUserId, createUserRecordType, defaultAssetSchemas, defaultBindingSchemas, defaultShapeSchemas, drawShapeMigrations, drawShapeProps, embedShapeMigrations, embedShapeProps, frameShapeMigrations, frameShapeProps, geoShapeMigrations, geoShapeProps, getDefaultTranslationLocale, getDefaultUserPresence, getShapePropKeysByStyle, groupShapeMigrations, groupShapeProps, highlightShapeMigrations, highlightShapeProps, idValidator, imageAssetMigrations, imageAssetProps, imageShapeMigrations, imageShapeProps, isBinding, isBindingId, isCssHexColor, isCustomRecord, isCustomRecordId, isDocument, isFontEntry, isPage, isPageId, isShape, isShapeId, isUserId, lineShapeMigrations, lineShapeProps, noteShapeMigrations, noteShapeProps, opacityValidator, pageIdValidator, parentIdValidator, pluckPreservingValues, registerColorsFromThemes, registerFontsFromThemes, richTextValidator, rootBindingMigrations, rootShapeMigrations, scribbleValidator, shapeIdValidator, textShapeMigrations, textShapeProps, toRichText, userIdValidator, vecModelValidator, videoAssetMigrations, videoAssetProps, videoShapeMigrations, videoShapeProps };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map