@messenger-box/platform-client 10.0.3-alpha.67 → 10.0.3-alpha.69

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.0.3-alpha.69](https://github.com/CDEBase/messenger-box/compare/v10.0.3-alpha.68...v10.0.3-alpha.69) (2025-08-11)
+
+**Note:** Version bump only for package @messenger-box/platform-client
+
 ## [10.0.3-alpha.67](https://github.com/CDEBase/messenger-box/compare/v10.0.3-alpha.66...v10.0.3-alpha.67) (2025-08-06)
 
 **Note:** Version bump only for package @messenger-box/platform-client

package/lib/graphql/policies/channel-policies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel-policies.d.ts","sourceRoot":"","sources":["../../../src/graphql/policies/channel-policies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,eAAe,EAAE,YA8D7B,CAAC"}
+{"version":3,"file":"channel-policies.d.ts","sourceRoot":"","sources":["../../../src/graphql/policies/channel-policies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAO,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,eAAe,EAAE,YAsJ7B,CAAC"}

package/lib/graphql/policies/channel-policies.js

@@ -1,13 +1,44 @@
-const channelPolicies = {
+import {gql}from'@apollo/client/index.js';const channelPolicies = {
   Query: {
     fields: {
       channelsByUser: {
-        merge(existing = [], incoming) {
-          // Use newer data from server to completely replace existing data
-          return incoming;
+        keyArgs: ['role', 'criteria', 'limit', 'skip', 'sort'],
+        merge(existing = [], incoming = [], {
+          readField
+        }) {
+          // If no existing data, just return incoming
+          if (!existing || existing.length === 0) {
+            return incoming;
+          }
+          // If no incoming data, keep existing
+          if (!incoming || incoming.length === 0) {
+            return existing;
+          }
+          // Create a map for efficient lookup
+          const channelMap = new Map();
+          // Add existing channels to map
+          for (let i = 0; i < existing.length; i++) {
+            const channel = existing[i];
+            if (channel) {
+              const id = readField('id', channel);
+              if (id) {
+                channelMap.set(id, channel);
+              }
+            }
+          }
+          // Merge in incoming channels, overwriting existing ones
+          for (let i = 0; i < incoming.length; i++) {
+            const channel = incoming[i];
+            if (channel) {
+              const id = readField('id', channel);
+              if (id) {
+                channelMap.set(id, channel);
+              }
+            }
+          }
+          // Convert map values back to array
+          return Array.from(channelMap.values());
         },
-        // Enable pagination with keyArgs to correctly identify cache entries
-        keyArgs: ['criteria', 'role', 'limit'],
         // Add a read function for more control over cache reads
         read(existing, {
           args
@@ -48,8 +79,63 @@ const channelPolicies = {
         }
       },
       lastMessage: {
-        read(lastMessage) {
-          return lastMessage || null;
+        merge(existing, incoming, {
+          readField
+        }) {
+          // If no incoming message, keep existing
+          if (!incoming) return existing;
+          // If no existing message, use incoming
+          if (!existing) return incoming;
+          // Compare timestamps to determine which is newer
+          const existingCreatedAt = readField('createdAt', existing);
+          const incomingCreatedAt = readField('createdAt', incoming);
+          if (existingCreatedAt && incomingCreatedAt) {
+            // Use the more recent message
+            return new Date(incomingCreatedAt) > new Date(existingCreatedAt) ? incoming : existing;
+          }
+          // If timestamps are not available, prefer incoming
+          return incoming;
+        },
+        read(lastMessage, {
+          readField,
+          cache,
+          args
+        }) {
+          // If lastMessage is already available, return it
+          if (lastMessage) return lastMessage;
+          // Try to get the channel ID to reference messages cache
+          const channelId = readField('id');
+          if (!channelId) return null;
+          try {
+            // Read messages from cache for this channel
+            const messagesQuery = cache.readQuery({
+              query: gql`
+                                query GetChannelMessages($channelId: String!) {
+                                    messages(channelId: $channelId, skip: 0, limit: 1) {
+                                        data {
+                                            id
+                                            content
+                                            createdAt
+                                            updatedAt
+                                            user {
+                                                id
+                                                username
+                                                displayName
+                                            }
+                                        }
+                                    }
+                                }
+                            `,
+              variables: {
+                channelId
+              }
+            });
+            // Return the first (latest) message if available
+            return messagesQuery?.messages?.data?.[0] || null;
+          } catch (error) {
+            // If messages query fails, return null
+            return null;
+          }
         }
       }
     }

package/lib/graphql/policies/channel-policies.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel-policies.js","sources":["../../../src/graphql/policies/channel-policies.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEa,MAAA,eAAe,GAAiB;AACzC,EAAA,KAAA,EAAK;AACD,IAAA,MAAA,EAAA;AACI,MAAA,cAAA,EAAA;AACI,QAAA,KAAA,CAAA,QAAM,GAAA,EAAA,EAAA,QAAe,EAAQ;;AAEzB,UAAA,OAAA,QAAA;;;AAGJ,QAAA,OAAA,EAAA,CAAA,UAAU,EAAA,MAAU,EAAE,OAAM,CAAE;;AAE9B,QAAA,IAAA,CAAA,QAAK,EAAA;;AAED,SAAA,EAAA;AAAe;AACf,UAAA,IAAA,CAAA,QAAA,EAAA,gBAAgB;iBACnB,QAAA;AACJ;AACJ;AACJ;AACD,GAAA;SACa,EAAA;AACT,IAAA,SAAA,EAAQ,CAAA,IAAA,CAAA;AACJ,IAAA,MAAA,EAAA;AACI,MAAA,OAAA,EAAA;AACI,QAAA,KAAA,CAAA,QAAA,GAAA,EAAO,UAAS,EAAA;iBACnB,QAAA;AACJ;;AAED;AACI,MAAA,KAAA,EAAA;oBACI;iBACH,KAAA,IAAA,EAAA;AACJ;AACD,OAAA;AACI,MAAA,WAAA,EAAA;wBACW,EAAA;iBACV,WAAA,IAAA,EAAA;AACJ;;AAED;AACI,MAAA,WAAA,EAAA;AACI,QAAA,IAAA,CAAA,CAAA,EAAA;AACA,UAAA;;AAEP,UAAA,MAAA,OAAA,GAAA,SAAA,CAAA,SAAA,CAAA;AACD,UAAA,OAAA,OAAa,IAAA,KAAA,CAAA,OAAA,CAAA,OAAA,CAAA,GAAA,OAAA,CAAA,MAAA,GAAA,CAAA;AACT;;iBAEC,EAAA;AACJ,QAAA,IAAA,CAAA,WAAA,EAAA;AACJ,UAAA,OAAA,WAAA,IAAA,IAAA;AACJ;;AAED;;AAEI;AACI,EAAA,aAAA,EAAM;gBACF,IAA6C,CAAA;AAC7C,IAAA,MAAA,EAAA;AACH,MAAA,IAAA,EAAA;AACJ;AACJ,QAAA,KAAA,EAAA;;;;"}
+{"version":3,"file":"channel-policies.js","sources":["../../../src/graphql/policies/channel-policies.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@messenger-box/platform-client",
-    "version": "10.0.3-alpha.67",
+    "version": "10.0.3-alpha.69",
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -21,7 +21,7 @@
     },
     "dependencies": {
         "@container-stack/file-info-client": "^5.4.1-alpha.9",
-        "@messenger-box/core": "10.0.3-alpha.67",
+        "@messenger-box/core": "10.0.3-alpha.69",
         "key-mirror": "1.0.1",
         "moment-timezone": "0.5.33"
     },
@@ -35,5 +35,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "b42ebf67b032d1c370dc0e999f78e015583d2979"
+    "gitHead": "011fbbc8fbbc97043d73323c02c1ac22b2a01bfb"
 }

package/src/graphql/policies/channel-policies.ts

@@ -1,15 +1,49 @@
-import { TypePolicies } from '@apollo/client';
+import { TypePolicies, gql } from '@apollo/client';
 
 export const channelPolicies: TypePolicies = {
     Query: {
         fields: {
             channelsByUser: {
-                merge(existing = [], incoming) {
-                    // Use newer data from server to completely replace existing data
-                    return incoming;
+                keyArgs: ['role', 'criteria', 'limit', 'skip', 'sort'],
+                merge(existing = [], incoming = [], { readField }) {
+                    // If no existing data, just return incoming
+                    if (!existing || existing.length === 0) {
+                        return incoming;
+                    }
+
+                    // If no incoming data, keep existing
+                    if (!incoming || incoming.length === 0) {
+                        return existing;
+                    }
+
+                    // Create a map for efficient lookup
+                    const channelMap = new Map();
+
+                    // Add existing channels to map
+                    for (let i = 0; i < existing.length; i++) {
+                        const channel = existing[i];
+                        if (channel) {
+                            const id = readField('id', channel);
+                            if (id) {
+                                channelMap.set(id, channel);
+                            }
+                        }
+                    }
+
+                    // Merge in incoming channels, overwriting existing ones
+                    for (let i = 0; i < incoming.length; i++) {
+                        const channel = incoming[i];
+                        if (channel) {
+                            const id = readField('id', channel);
+                            if (id) {
+                                channelMap.set(id, channel);
+                            }
+                        }
+                    }
+
+                    // Convert map values back to array
+                    return Array.from(channelMap.values());
                 },
-                // Enable pagination with keyArgs to correctly identify cache entries
-                keyArgs: ['criteria', 'role', 'limit'],
                 // Add a read function for more control over cache reads
                 read(existing, { args }) {
                     // Return undefined to force a network request if data doesn't exist
@@ -46,8 +80,62 @@ export const channelPolicies: TypePolicies = {
                 },
             },
             lastMessage: {
-                read(lastMessage) {
-                    return lastMessage || null;
+                merge(existing, incoming, { readField }) {
+                    // If no incoming message, keep existing
+                    if (!incoming) return existing;
+
+                    // If no existing message, use incoming
+                    if (!existing) return incoming;
+
+                    // Compare timestamps to determine which is newer
+                    const existingCreatedAt = readField('createdAt', existing) as string | number | Date;
+                    const incomingCreatedAt = readField('createdAt', incoming) as string | number | Date;
+
+                    if (existingCreatedAt && incomingCreatedAt) {
+                        // Use the more recent message
+                        return new Date(incomingCreatedAt) > new Date(existingCreatedAt) ? incoming : existing;
+                    }
+
+                    // If timestamps are not available, prefer incoming
+                    return incoming;
+                },
+                read(lastMessage, { readField, cache, args }) {
+                    // If lastMessage is already available, return it
+                    if (lastMessage) return lastMessage;
+
+                    // Try to get the channel ID to reference messages cache
+                    const channelId = readField('id');
+                    if (!channelId) return null;
+
+                    try {
+                        // Read messages from cache for this channel
+                        const messagesQuery = cache.readQuery({
+                            query: gql`
+                                query GetChannelMessages($channelId: String!) {
+                                    messages(channelId: $channelId, skip: 0, limit: 1) {
+                                        data {
+                                            id
+                                            content
+                                            createdAt
+                                            updatedAt
+                                            user {
+                                                id
+                                                username
+                                                displayName
+                                            }
+                                        }
+                                    }
+                                }
+                            `,
+                            variables: { channelId },
+                        }) as any;
+
+                        // Return the first (latest) message if available
+                        return messagesQuery?.messages?.data?.[0] || null;
+                    } catch (error) {
+                        // If messages query fails, return null
+                        return null;
+                    }
                 },
             },
         },