@tldraw/tlschema 5.2.0-next.ee0fa4d6244f → 5.2.1

package/src/records/TLPresence.ts

@@ -13,6 +13,7 @@ import { cursorTypeValidator, TLCursor } from '../misc/TLCursor'
 import { scribbleValidator, TLScribble } from '../misc/TLScribble'
 import { TLPageId } from './TLPage'
 import { TLShapeId } from './TLShape'
+import { TLUserId, userIdValidator } from './TLUser'
 
 /**
  * Represents the presence state of a user in a collaborative tldraw session.
@@ -39,7 +40,7 @@ import { TLShapeId } from './TLShape'
  * @public
  */
 export interface TLInstancePresence extends BaseRecord<'instance_presence', TLInstancePresenceID> {
-	userId: string
+	userId: TLUserId
 	userName: string
 	lastActivityTimestamp: number | null
 	color: string // can be any hex color
@@ -49,7 +50,7 @@ export interface TLInstancePresence extends BaseRecord<'instance_presence', TLIn
 	brush: BoxModel | null
 	scribbles: TLScribble[]
 	screenBounds: BoxModel | null
-	followingUserId: string | null
+	followingUserId: TLUserId | null
 	cursor: {
 		x: number
 		y: number
@@ -101,10 +102,10 @@ export const instancePresenceValidator: T.Validator<TLInstancePresence> = T.mode
 	T.object({
 		typeName: T.literal('instance_presence'),
 		id: idValidator<TLInstancePresenceID>('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,

package/src/shapes/TLDrawShape.ts

@@ -1,5 +1,5 @@
 import { T } from '@tldraw/validate'
-import { b64Vecs } from '../misc/b64Vecs'
+import { DIM_2D, DIM_3D, b64Vecs } from '../misc/b64Vecs'
 import { VecModel } from '../misc/geometry-types'
 import { createShapePropsMigrationIds, createShapePropsMigrationSequence } from '../records/TLShape'
 import { RecordProps } from '../recordsWithProps'
@@ -22,6 +22,12 @@ export interface TLDrawShapeSegment {
 	 * First point stored as Float32 (12 bytes) for precision, subsequent points as Float16 deltas (6 bytes each).
 	 */
 	path: string
+	/**
+	 * Encoding dimension of `path`. `2` means (x, y) only — the constant 0.5 pressure
+	 * was omitted, for input from devices that don't report pressure. `3` or absent
+	 * (the legacy default) means (x, y, z). Added in the `OmitNonPressureZ` migration.
+	 */
+	dim?: 2 | 3
 }
 
 /**
@@ -32,6 +38,7 @@ export interface TLDrawShapeSegment {
 export const DrawShapeSegment: T.ObjectValidator<TLDrawShapeSegment> = T.object({
 	type: T.literalEnum('free', 'straight'),
 	path: T.string,
+	dim: T.literalEnum(DIM_2D, DIM_3D).optional(),
 })
 
 /**
@@ -138,6 +145,7 @@ const Versions = createShapePropsMigrationIds('draw', {
 	AddScale: 2,
 	Base64: 3,
 	LegacyPointsConversion: 4,
+	OmitNonPressureZ: 5,
 })
 
 /**
@@ -239,6 +247,27 @@ export const drawShapeMigrations = createShapePropsMigrationSequence({
 				// handled by the previous down migration
 			},
 		},
+		{
+			id: Versions.OmitNonPressureZ,
+			up: (_props) => {
+				// No-op. Pre-existing segments have no `dim` field, which is exactly how
+				// the new schema reads them (3D). The validator now accepts the optional
+				// `dim`, so newer 2D segments validate as well — nothing to rewrite here.
+			},
+			down: (props) => {
+				// Older clients only understand 3D paths and reject the unknown `dim` field.
+				// Strip `dim` from every segment that carries it; a 2D segment is also
+				// re-encoded back to 3D (decode supplies z = 0.5), while a `dim: 3` segment
+				// already has a 3D path so we just drop the field.
+				props.segments = props.segments.map((segment: any) => {
+					if (segment.dim === undefined) return segment
+					const { dim, ...rest } = segment
+					return dim === DIM_2D
+						? { ...rest, path: b64Vecs.encodePoints(b64Vecs.decodePoints(segment.path, DIM_2D)) }
+						: rest
+				})
+			},
+		},
 	],
 })
 

package/src/shapes/TLHighlightShape.ts

@@ -1,5 +1,5 @@
 import { T } from '@tldraw/validate'
-import { b64Vecs } from '../misc/b64Vecs'
+import { DIM_2D, b64Vecs } from '../misc/b64Vecs'
 import { createShapePropsMigrationIds, createShapePropsMigrationSequence } from '../records/TLShape'
 import { RecordProps } from '../recordsWithProps'
 import { DefaultColorStyle, TLDefaultColorStyle } from '../styles/TLColorStyle'
@@ -105,6 +105,7 @@ const Versions = createShapePropsMigrationIds('highlight', {
 	AddScale: 1,
 	Base64: 2,
 	LegacyPointsConversion: 3,
+	OmitNonPressureZ: 4,
 })
 
 /**
@@ -182,5 +183,22 @@ export const highlightShapeMigrations = createShapePropsMigrationSequence({
 				// handled by the previous down migration
 			},
 		},
+		{
+			id: Versions.OmitNonPressureZ,
+			up: (_props) => {
+				// No-op — see the matching draw-shape migration. Absent `dim` reads as 3D.
+			},
+			down: (props) => {
+				// Strip `dim` from every segment that carries it (older clients reject the
+				// unknown field); 2D segments are re-encoded to 3D, dim: 3 just loses the field.
+				props.segments = props.segments.map((segment: any) => {
+					if (segment.dim === undefined) return segment
+					const { dim, ...rest } = segment
+					return dim === DIM_2D
+						? { ...rest, path: b64Vecs.encodePoints(b64Vecs.decodePoints(segment.path, DIM_2D)) }
+						: rest
+				})
+			},
+		},
 	],
 })

package/src/shapes/TLNoteShape.ts

@@ -64,8 +64,8 @@ export interface TLNoteShapeProps {
 	richText: TLRichText
 	/** Scale factor applied to the note shape for display */
 	scale: number
-	/** User ID of the person who first edited the note text */
-	textFirstEditedBy: string | null
+	/** User ID of the person who last edited the note text */
+	textLastEditedBy: string | null
 }
 
 /**
@@ -132,7 +132,7 @@ export const noteShapeProps: RecordProps<TLNoteShape> = {
 	url: T.linkUrl,
 	richText: richTextValidator,
 	scale: T.nonZeroNumber,
-	textFirstEditedBy: T.string.nullable(),
+	textLastEditedBy: T.string.nullable(),
 }
 
 const Versions = createShapePropsMigrationIds('note', {
@@ -148,6 +148,7 @@ const Versions = createShapePropsMigrationIds('note', {
 	AddRichTextAttrs: 10,
 	AddFirstEditedBy: 11,
 	MakeFontSizeAdjustmentRatio: 12,
+	RenameFirstEditedByToLast: 13,
 })
 
 /**
@@ -292,5 +293,16 @@ export const noteShapeMigrations = createShapePropsMigrationSequence({
 				props.fontSizeAdjustment = 0
 			},
 		},
+		{
+			id: Versions.RenameFirstEditedByToLast,
+			up: (props) => {
+				props.textLastEditedBy = props.textFirstEditedBy ?? null
+				delete props.textFirstEditedBy
+			},
+			down: (props) => {
+				props.textFirstEditedBy = props.textLastEditedBy ?? null
+				delete props.textLastEditedBy
+			},
+		},
 	],
 })