@luvio/environments 0.160.2 → 0.160.3

package/dist/environments.js

@@ -22,7 +22,7 @@ const RedirectDurableSegment = 'REDIRECT_KEYS';
 const MessagingDurableSegment = 'MESSAGING';
 const MessageNotifyStoreUpdateAvailable = 'notifyStoreUpdateAvailable';
 
-const { keys, create, assign, freeze } = Object;
+const { keys, create, assign, freeze, isFrozen } = Object;
 
 //Durable store error instrumentation key
 const DURABLE_STORE_ERROR = 'durable-store-error';
@@ -109,6 +109,74 @@ function publishDurableStoreEntries(durableRecords, put, publishMetadata) {
     }
     return { revivedKeys, hadUnexpectedShape };
 }
+/**
+ * Extracts field filtering configuration from the selection.
+ */
+function extractFieldFilteringConfig(select, recordId, baseEnvironment) {
+    const rootRecordKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(recordId));
+    let topLevelFields;
+    let nestedFieldRequirements;
+    if (select &&
+        select.node.kind === 'Fragment' &&
+        'selections' in select.node &&
+        select.node.selections) {
+        topLevelFields = extractRequestedFieldNames(select.node.selections);
+        nestedFieldRequirements = extractNestedFieldRequirements(select.node.selections);
+    }
+    // Merge all nested field requirements into a single set
+    let nestedFields;
+    if (nestedFieldRequirements && nestedFieldRequirements.size > 0) {
+        nestedFields = new Set();
+        for (const fieldSet of nestedFieldRequirements.values()) {
+            for (const field of fieldSet) {
+                nestedFields.add(field);
+            }
+        }
+    }
+    return { rootRecordKey, topLevelFields, nestedFields };
+}
+/**
+ * Categorizes keys into different fetch strategies based on filtering requirements.
+ */
+function categorizeKeysForL2Fetch(keysToRevive, config, baseEnvironment, shouldFilterFields) {
+    const unfilteredKeys = [];
+    const rootKeysWithTopLevelFields = [];
+    const nestedKeysWithNestedFields = [];
+    const canFilter = config.topLevelFields !== undefined && config.topLevelFields.size > 0;
+    for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
+        const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
+        if (!shouldFilterFields(canonicalKey) || !canFilter) {
+            unfilteredKeys.push(canonicalKey);
+            continue;
+        }
+        const isRootRecord = canonicalKey === config.rootRecordKey;
+        if (isRootRecord) {
+            rootKeysWithTopLevelFields.push(canonicalKey);
+        }
+        else if (config.nestedFields !== undefined && config.nestedFields.size > 0) {
+            nestedKeysWithNestedFields.push(canonicalKey);
+        }
+        else {
+            unfilteredKeys.push(canonicalKey);
+        }
+    }
+    return { unfilteredKeys, rootKeysWithTopLevelFields, nestedKeysWithNestedFields };
+}
+/**
+ * Builds L2 fetch promises for different key categories.
+ */
+function buildL2FetchPromises(categorizedKeys, config, durableStore) {
+    const promises = [
+        durableStore.getEntries(categorizedKeys.unfilteredKeys, DefaultDurableSegment),
+    ];
+    if (config.topLevelFields && categorizedKeys.rootKeysWithTopLevelFields.length > 0) {
+        promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.rootKeysWithTopLevelFields, config.topLevelFields, DefaultDurableSegment));
+    }
+    if (config.nestedFields && categorizedKeys.nestedKeysWithNestedFields.length > 0) {
+        promises.push(durableStore.getEntriesWithSpecificFields(categorizedKeys.nestedKeysWithNestedFields, config.nestedFields, DefaultDurableSegment));
+    }
+    return promises;
+}
 /**
  * This method returns a Promise to a snapshot that is revived from L2 cache.  If
  * L2 does not have the entries necessary to fulfill the snapshot then this method
@@ -144,53 +212,41 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
     const keysToRevive = keysToReviveSet.keysAsArray();
     const start = Date.now();
     const { l2Trips } = reviveMetrics;
-    // Extract requested fields first to determine if filtering is possible
-    let requestedFields;
-    if (select.node.kind === 'Fragment' && 'selections' in select.node && select.node.selections) {
-        requestedFields = extractRequestedFieldNames(select.node.selections);
-    }
-    const canonicalKeys = [];
-    const filteredCanonicalKeys = [];
-    for (let i = 0, len = keysToRevive.length; i < len; i += 1) {
-        const canonicalKey = serializeStructuredKey(baseEnvironment.storeGetCanonicalKey(keysToRevive[i]));
-        // Only filter if we have fields to filter and shouldFilterFields returns true
-        if (requestedFields !== undefined &&
-            requestedFields.size > 0 &&
-            shouldFilterFields(canonicalKey)) {
-            filteredCanonicalKeys.push(canonicalKey);
-        }
-        else {
-            canonicalKeys.push(canonicalKey);
-        }
-    }
-    const fetchPromises = [
-        durableStore.getEntries(canonicalKeys, DefaultDurableSegment),
-    ];
-    if (requestedFields !== undefined &&
-        requestedFields.size > 0 &&
-        filteredCanonicalKeys.length > 0) {
-        fetchPromises.push(durableStore.getEntriesWithSpecificFields(filteredCanonicalKeys, requestedFields, DefaultDurableSegment));
-    }
-    return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords]) => {
+    // Extract field filtering requirements from the selection
+    const fieldFilteringConfig = extractFieldFilteringConfig(select, recordId, baseEnvironment);
+    // Categorize keys by how they should be fetched from L2
+    const categorizedKeys = categorizeKeysForL2Fetch(keysToRevive, fieldFilteringConfig, baseEnvironment, shouldFilterFields);
+    // Build fetch promises for each category
+    const fetchPromises = buildL2FetchPromises(categorizedKeys, fieldFilteringConfig, durableStore);
+    return Promise.all(fetchPromises).then(([durableRecords, filteredDurableRecords, nestedFilteredDurableRecords]) => {
+        const totalKeysRequested = categorizedKeys.unfilteredKeys.length +
+            categorizedKeys.rootKeysWithTopLevelFields.length +
+            categorizedKeys.nestedKeysWithNestedFields.length;
         l2Trips.push({
             duration: Date.now() - start,
-            keysRequestedCount: canonicalKeys.length + filteredCanonicalKeys.length,
+            keysRequestedCount: totalKeysRequested,
         });
-        // Process both normal and filtered records in a single pass
+        // Process all three categories of records
         const revivedKeys = new StoreKeySet();
         let hadUnexpectedShape = false;
-        // Process normal records
+        // Process normal records (all fields)
         if (durableRecords !== undefined) {
             const normalResult = publishDurableStoreEntries(durableRecords, baseEnvironment.storePut.bind(baseEnvironment), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
             revivedKeys.merge(normalResult.revivedKeys);
             hadUnexpectedShape = hadUnexpectedShape || normalResult.hadUnexpectedShape;
         }
-        // Process filtered records with merging
+        // Process filtered records (root with top-level fields) with merging
         if (filteredDurableRecords !== undefined) {
             const filteredResult = publishDurableStoreEntries(filteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
             revivedKeys.merge(filteredResult.revivedKeys);
             hadUnexpectedShape = hadUnexpectedShape || filteredResult.hadUnexpectedShape;
         }
+        // Process nested filtered records with merging
+        if (nestedFilteredDurableRecords !== undefined) {
+            const nestedFilteredResult = publishDurableStoreEntries(nestedFilteredDurableRecords, createMergeFilteredPut((key) => baseEnvironment.store.readEntry(key), baseEnvironment.storePut.bind(baseEnvironment)), baseEnvironment.publishStoreMetadata.bind(baseEnvironment));
+            revivedKeys.merge(nestedFilteredResult.revivedKeys);
+            hadUnexpectedShape = hadUnexpectedShape || nestedFilteredResult.hadUnexpectedShape;
+        }
         // if the data coming back from DS had an unexpected shape then just
         // return the L1 snapshot
         if (hadUnexpectedShape === true) {
@@ -236,6 +292,54 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
         return { snapshot: unavailableSnapshot, metrics: reviveMetrics };
     });
 }
+/**
+ * Filters out null fields from a fields object (null indicates field doesn't exist in L2).
+ * Returns a new object without null values, or the original if no filtering needed.
+ */
+function filterNullFields(fields) {
+    const keys$1 = keys(fields);
+    let hasNull = false;
+    // Check if any nulls exist before allocating new object
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        if (fields[keys$1[i]] === null) {
+            hasNull = true;
+            break;
+        }
+    }
+    if (!hasNull) {
+        return fields;
+    }
+    const cleaned = {};
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        const key = keys$1[i];
+        if (fields[key] !== null) {
+            cleaned[key] = fields[key];
+        }
+    }
+    return cleaned;
+}
+/**
+ * Merges new fields into existing fields object, skipping null values.
+ * Creates a new object to avoid mutations.
+ */
+function mergeFieldsObjects(existing, incoming) {
+    const merged = { ...existing };
+    const keys$1 = keys(incoming);
+    for (let i = 0, len = keys$1.length; i < len; i += 1) {
+        const key = keys$1[i];
+        // Skip null values - they indicate the field doesn't exist in L2
+        if (incoming[key] !== null) {
+            merged[key] = incoming[key];
+        }
+    }
+    return merged;
+}
+/**
+ * Type guard to check if value is a non-null object.
+ */
+function isObject(value) {
+    return typeof value === 'object' && value !== null;
+}
 /**
  * Creates a put function that merges filtered fields with existing L1 records instead of replacing them.
  * This is used when reviving filtered fields from L2 to preserve existing data in L1.
@@ -243,28 +347,36 @@ function reviveSnapshot(baseEnvironment, durableStore, unavailableSnapshot, dura
 function createMergeFilteredPut(readEntry, storePut) {
     return (key, filteredData) => {
         const existingRecord = readEntry(key);
-        if (existingRecord !== undefined &&
-            existingRecord !== null &&
-            typeof filteredData === 'object' &&
-            filteredData !== null &&
-            typeof existingRecord === 'object') {
-            const filteredFields = filteredData;
-            const existingObj = existingRecord;
-            // Check if object is frozen (can happen after deepFreeze)
-            // If frozen, create a shallow copy to merge fields into
-            let targetObj = existingObj;
-            if (Object.isFrozen(existingObj)) {
-                targetObj = { ...existingObj };
-            }
-            const keys = Object.keys(filteredFields);
-            for (let i = 0, len = keys.length; i < len; i += 1) {
-                const fieldKey = keys[i];
-                targetObj[fieldKey] = filteredFields[fieldKey];
+        // Merge with existing record if both are objects
+        if (isObject(existingRecord) && isObject(filteredData)) {
+            // Create target object (copy if frozen to avoid mutation errors)
+            const targetObj = isFrozen(existingRecord)
+                ? { ...existingRecord }
+                : existingRecord;
+            const keys$1 = keys(filteredData);
+            for (let i = 0, len = keys$1.length; i < len; i += 1) {
+                const fieldKey = keys$1[i];
+                const incomingValue = filteredData[fieldKey];
+                // Special handling for 'fields' property to merge rather than replace
+                if (fieldKey === 'fields' &&
+                    isObject(incomingValue) &&
+                    isObject(targetObj[fieldKey])) {
+                    targetObj[fieldKey] = mergeFieldsObjects(targetObj[fieldKey], incomingValue);
+                }
+                else {
+                    targetObj[fieldKey] = incomingValue;
+                }
             }
             storePut(key, targetObj);
         }
         else {
-            // No existing record, just put the filtered data
+            // No existing record - clean null fields before storing
+            if (isObject(filteredData) && 'fields' in filteredData) {
+                const fields = filteredData.fields;
+                if (isObject(fields)) {
+                    filteredData.fields = filterNullFields(fields);
+                }
+            }
             storePut(key, filteredData);
         }
     };
@@ -278,16 +390,101 @@ function extractRequestedFieldNames(selections) {
         return undefined;
     }
     // Find the 'fields' ObjectSelection
-    const fieldsSelection = selections.find((sel) => sel.kind === 'Object' && sel.name === 'fields');
-    if (!fieldsSelection || !fieldsSelection.selections) {
+    let fieldsSelection;
+    for (let i = 0, len = selections.length; i < len; i += 1) {
+        const sel = selections[i];
+        if (sel.kind === 'Object' && sel.name === 'fields') {
+            fieldsSelection = sel;
+            break;
+        }
+    }
+    if (!fieldsSelection ||
+        !fieldsSelection.selections ||
+        fieldsSelection.selections.length === 0) {
         return undefined;
     }
     // Extract all field names from the fields selections
+    const fieldSelections = fieldsSelection.selections;
     const fieldNames = new Set();
-    for (const fieldSel of fieldsSelection.selections) {
-        fieldNames.add(fieldSel.name);
+    for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+        fieldNames.add(fieldSelections[i].name);
+    }
+    return fieldNames;
+}
+/**
+ * Extracts nested field requirements for spanning fields.
+ * For spanning fields like Case.CreatedBy.Name, we need to extract what fields
+ * are requested from the nested record (User in this case).
+ * The structure is: fields { CreatedBy { value (Link with fragment) { fields { Name } } } }
+ */
+function extractNestedFieldRequirements(selections) {
+    if (!selections) {
+        return undefined;
+    }
+    // Find the 'fields' ObjectSelection
+    let fieldsSelection;
+    for (let i = 0, len = selections.length; i < len; i += 1) {
+        const sel = selections[i];
+        if (sel.kind === 'Object' && sel.name === 'fields') {
+            fieldsSelection = sel;
+            break;
+        }
+    }
+    if (!fieldsSelection || !fieldsSelection.selections) {
+        return undefined;
+    }
+    let nestedFieldsMap;
+    // Look for ObjectSelections within fields (these are spanning fields)
+    const fieldSelections = fieldsSelection.selections;
+    for (let i = 0, len = fieldSelections.length; i < len; i += 1) {
+        const fieldSel = fieldSelections[i];
+        if (fieldSel.kind !== 'Object') {
+            continue;
+        }
+        const objSel = fieldSel;
+        if (!objSel.selections) {
+            continue;
+        }
+        // Look for the 'value' Link selection
+        let valueLinkSelection;
+        for (let j = 0, jlen = objSel.selections.length; j < jlen; j += 1) {
+            const sel = objSel.selections[j];
+            if (sel.kind === 'Link' && sel.name === 'value') {
+                valueLinkSelection = sel;
+                break;
+            }
+        }
+        if (!valueLinkSelection || !('fragment' in valueLinkSelection)) {
+            continue;
+        }
+        const fragment = valueLinkSelection.fragment;
+        if (!fragment || !fragment.selections) {
+            continue;
+        }
+        // Look for the 'fields' selection within the fragment
+        let nestedFieldsSelection;
+        for (let j = 0, jlen = fragment.selections.length; j < jlen; j += 1) {
+            const sel = fragment.selections[j];
+            if (sel.kind === 'Object' && sel.name === 'fields') {
+                nestedFieldsSelection = sel;
+                break;
+            }
+        }
+        if (nestedFieldsSelection && nestedFieldsSelection.selections) {
+            const nestedFields = new Set();
+            for (const nestedFieldSel of nestedFieldsSelection.selections) {
+                nestedFields.add(nestedFieldSel.name);
+            }
+            if (nestedFields.size > 0) {
+                // Lazy initialize map only if we have nested fields
+                if (!nestedFieldsMap) {
+                    nestedFieldsMap = new Map();
+                }
+                nestedFieldsMap.set(fieldSel.name, nestedFields);
+            }
+        }
     }
-    return fieldNames.size > 0 ? fieldNames : undefined;
+    return nestedFieldsMap;
 }
 
 const TTL_DURABLE_SEGMENT = 'TTL_DURABLE_SEGMENT';

package/dist/types/utils/language.d.ts

@@ -15,7 +15,7 @@ declare const keys: {
         [idx: string]: object | U | null | undefined;
     }, U extends string | number | bigint | boolean | symbol>(o: T_1): Readonly<T_1>;
     <T_2>(o: T_2): Readonly<T_2>;
-};
+}, isFrozen: (o: any) => boolean;
 declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare const isArray: (arg: any) => arg is any[];
-export { create as ObjectCreate, keys as ObjectKeys, assign as ObjectAssign, freeze as ObjectFreeze, hasOwnProperty as ObjectPrototypeHasOwnProperty, isArray as ArrayIsArray, };
+export { create as ObjectCreate, keys as ObjectKeys, assign as ObjectAssign, freeze as ObjectFreeze, isFrozen as ObjectIsFrozen, hasOwnProperty as ObjectPrototypeHasOwnProperty, isArray as ArrayIsArray, };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.160.2",
+    "version": "0.160.3",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -27,7 +27,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "^0.160.2"
+        "@luvio/engine": "^0.160.3"
     },
     "volta": {
         "extends": "../../../package.json"
@@ -36,9 +36,9 @@
         {
             "path": "./dist/environments.js",
             "maxSize": {
-                "none": "55.0 kB",
-                "min": "15.5 kB",
-                "compressed": "10.5 kB"
+                "none": "62.0 kB",
+                "min": "18.0 kB",
+                "compressed": "11.5 kB"
             }
         }
     ],