teamplay 0.4.0-alpha.77 → 0.4.0-alpha.79

package/orm/Compat/SignalCompat.js

@@ -13,7 +13,7 @@ import { publicOnly, fetchOnly, setFetchOnly } from '../connection.js'
 import { docSubscriptions } from '../Doc.js'
 import { IS_QUERY, getQuerySignal, querySubscriptions } from '../Query.js'
 import { IS_AGGREGATION, aggregationSubscriptions, getAggregationSignal } from '../Aggregation.js'
-import { getIdFieldsForSegments, isIdFieldPath, normalizeIdFields, isPlainObject } from '../idFields.js'
+import { getIdFieldsForSegments, isIdFieldPath, isPublicDocPath, normalizeIdFields, isPlainObject } from '../idFields.js'
 import {
   del as _del,
   setReplace as _setReplace,
@@ -1015,7 +1015,7 @@ function setReplacePrivateCompatSync ($signal, value) {
   if (segments.length === 0) throw Error('Can\'t set the root signal data')
   const idFields = getIdFieldsForSegments(segments)
   if (isIdFieldPath(segments, idFields)) return
-  if (segments.length === 2) {
+  if (isPublicDocPath(segments)) {
     value = normalizeIdFields(value, idFields, segments[1])
   }
   _setReplace(segments, value)
@@ -1065,7 +1065,7 @@ async function setReplaceOnSignal ($signal, value) {
   if (segments.length === 0) throw Error('Can\'t set the root signal data')
   const idFields = getIdFieldsForSegments(segments)
   if (isIdFieldPath(segments, idFields)) return
-  if (segments.length === 2) {
+  if (isPublicDocPath(segments)) {
     value = normalizeIdFields(value, idFields, segments[1])
   }
   if (isPublicCollection(segments[0])) {

package/orm/SignalBase.js

@@ -45,7 +45,15 @@ import { IS_QUERY, HASH, QUERIES } from './Query.js'
 import { AGGREGATIONS, IS_AGGREGATION, getAggregationCollectionName, getAggregationDocId } from './Aggregation.js'
 import { ROOT_FUNCTION, getRoot } from './Root.js'
 import { publicOnly } from './connection.js'
-import { DEFAULT_ID_FIELDS, getIdFieldsForSegments, isIdFieldPath, normalizeIdFields } from './idFields.js'
+import {
+  DEFAULT_ID_FIELDS,
+  getIdFieldsForSegments,
+  isIdFieldPath,
+  isPublicDocPath,
+  normalizeIdFields,
+  prepareAddPayload,
+  resolveAddDocId
+} from './idFields.js'
 import { isCompatEnv } from './compatEnv.js'
 import { resolveRefSegmentsSafe, resolveRefSignalSafe } from './Compat/refFallback.js'
 import { compatStartOnRoot, compatStopOnRoot, joinScopePath } from './Compat/startStopCompat.js'
@@ -262,7 +270,7 @@ export class Signal extends Function {
     if (this[SEGMENTS].length === 0) throw Error('Can\'t set the root signal data')
     const idFields = getIdFieldsForSegments(this[SEGMENTS])
     if (isIdFieldPath(this[SEGMENTS], idFields)) return
-    if (this[SEGMENTS].length === 2) {
+    if (isPublicDocPath(this[SEGMENTS])) {
       value = normalizeIdFields(value, idFields, this[SEGMENTS][1])
     }
     if (isPublicCollection(this[SEGMENTS][0])) {
@@ -424,24 +432,9 @@ export class Signal extends Function {
 
   async add (value) {
     if (arguments.length > 1) throw Error('Signal.add() expects a single argument')
-    if (!value || typeof value !== 'object') throw Error('Signal.add() expects an object argument')
-    const hasId = value.id != null
-    const hasUnderscoreId = value._id != null
-    if (hasId && hasUnderscoreId && value.id !== value._id) {
-      throw Error(
-        `Signal.add() got conflicting "id" (${JSON.stringify(value.id)}) and "_id" (${JSON.stringify(value._id)})`
-      )
-    }
-    let id = value.id ?? value._id
-    id ??= uuid()
+    const id = resolveAddDocId(value, uuid)
     const idFields = getIdFieldsForSegments([this[SEGMENTS][0], id])
-    if (idFields.includes('_id')) value._id = id
-    if (idFields.includes('id')) {
-      value.id = id
-    } else if (value.id === id) {
-      delete value.id
-    }
-    await this[id].set(value)
+    await this[id].set(prepareAddPayload(value, idFields, id))
     return id
   }
 

package/orm/dataTree.js

@@ -3,7 +3,7 @@ import jsonDiff from 'json0-ot-diff'
 import diffMatchPatch from 'diff-match-patch'
 import { getConnection } from './connection.js'
 import setDiffDeep from '../utils/setDiffDeep.js'
-import { getIdFieldsForSegments, injectIdFields, stripIdFields, isPlainObject } from './idFields.js'
+import { getIdFieldsForSegments, injectIdFields, stripIdFields, isPlainObject, isIdFieldPath } from './idFields.js'
 import { emitModelChange, isModelEventsEnabled } from './Compat/modelEvents.js'
 import { isSilentContextActive } from './Compat/silentContext.js'
 import { isCompatEnv } from './compatEnv.js'
@@ -158,7 +158,7 @@ export async function setPublicDoc (segments, value, deleteValue = false) {
   if (docId === 'undefined') throw Error(ERRORS.publicDocIdUndefined(segments))
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const idFields = getIdFieldsForSegments([collection, docId])
-  if (segments.length >= 3 && idFields.includes(segments[segments.length - 1])) return
+  if (isIdFieldPath(segments, idFields)) return
   const doc = getConnection().get(collection, docId)
   let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
   if (!docState.exists && segments.length > 2) {
@@ -177,7 +177,10 @@ export async function setPublicDoc (segments, value, deleteValue = false) {
     value = undefined
   } else {
     value = JSON.parse(JSON.stringify(value))
-    value = stripIdFields(value, idFields)
+    // Only strip doc identity fields when writing the whole doc.
+    // Nested payloads like `fields.fieldId.media = { id: ... }` must preserve
+    // their own `id/_id` keys.
+    if (segments.length === 2) value = stripIdFields(value, idFields)
   }
   if (segments.length === 2 && !docState.exists) {
     // > create a new doc. Full doc data is provided
@@ -247,7 +250,7 @@ export async function setPublicDocReplace (segments, value) {
   if (docId === 'undefined') throw Error(ERRORS.publicDocIdUndefined(segments))
   if (!(collection && docId)) throw Error(ERRORS.publicDoc(segments))
   const idFields = getIdFieldsForSegments([collection, docId])
-  if (segments.length >= 3 && idFields.includes(segments[segments.length - 1])) return
+  if (isIdFieldPath(segments, idFields)) return
   const doc = getConnection().get(collection, docId)
   let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true })
   if (!docState.exists && segments.length > 2) {
@@ -263,7 +266,9 @@ export async function setPublicDocReplace (segments, value) {
   value = raw(value)
   if (value != null) {
     value = JSON.parse(JSON.stringify(value))
-    value = stripIdFields(value, idFields)
+    // Same contract as setPublicDoc(): only doc-root writes should strip the
+    // identity fields of the target document itself.
+    if (segments.length === 2) value = stripIdFields(value, idFields)
   }
 
   if (!docState.exists) {
@@ -296,7 +301,9 @@ export async function setPublicDocReplace (segments, value) {
 
   const relativePath = segments.slice(2)
   const previous = getRaw(segments)
-  const normalizedPrevious = normalizeUndefined(stripIdFields(previous, idFields))
+  const normalizedPrevious = normalizeUndefined(
+    relativePath.length === 0 ? stripIdFields(previous, idFields) : previous
+  )
   const normalizedValue = normalizeUndefined(value)
   let op
   if (relativePath.length === 0) {

package/orm/idFields.js

@@ -50,8 +50,39 @@ export function stripIdFields (value, idFields) {
   return next
 }
 
+export function resolveAddDocId (value, getDefaultId) {
+  if (!value || typeof value !== 'object') throw Error('Signal.add() expects an object argument')
+  const hasId = value.id != null
+  const hasUnderscoreId = value._id != null
+  if (hasId && hasUnderscoreId && value.id !== value._id) {
+    throw Error(
+      `Signal.add() got conflicting "id" (${JSON.stringify(value.id)}) and "_id" (${JSON.stringify(value._id)})`
+    )
+  }
+  return value.id ?? value._id ?? getDefaultId()
+}
+
+export function prepareAddPayload (value, idFields, docId) {
+  if (idFields.includes('_id')) value._id = docId
+  if (idFields.includes('id')) {
+    value.id = docId
+  } else if (value.id === docId) {
+    delete value.id
+  }
+  return value
+}
+
+export function isPublicDocPath (segments) {
+  if (!Array.isArray(segments) || segments.length !== 2) return false
+  const [collection, docId] = segments
+  if (typeof collection !== 'string' || !collection) return false
+  if (collection[0] === '_' || collection[0] === '$') return false
+  return docId != null
+}
+
 export function isIdFieldPath (segments, idFields) {
-  if (segments.length < 3) return false
-  const last = segments[segments.length - 1]
+  if (!Array.isArray(segments) || segments.length !== 3) return false
+  if (!isPublicDocPath(segments.slice(0, 2))) return false
+  const last = segments[2]
   return idFields.includes(last)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.4.0-alpha.77",
+  "version": "0.4.0-alpha.79",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -83,5 +83,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "53f8b825a4c028c7b853d335402e402dbdd287af"
+  "gitHead": "d01896f3f43e3ef7a96a514ae7b870041fee2ed4"
 }