@salesforce/lds-network-nimbus 1.332.0-dev3 → 1.333.0

package/dist/main.js

@@ -618,7 +618,7 @@ function calculateEstimatedTotalUrlLength(request) {
 }
 
 const RECORD_ENDPOINT_REGEX = /^\/ui-api\/records\/?(([a-zA-Z0-9]+))?$/;
-const referenceId$3 = 'LDS_Records_AggregateUi';
+const referenceId$1 = 'LDS_Records_AggregateUi';
 /**
  * Export to facilitate unit tests
  * Merge the second getRecord result into the first one.
@@ -646,7 +646,7 @@ function makeNetworkChunkFieldsGetRecord(networkAdapter, instrumentationSink) {
         if (batchRequestInfo === undefined) {
             return networkAdapter(resourceRequest, resourceRequestContext);
         }
-        const compositeRequest = buildCompositeRequestByFields(referenceId$3, resourceRequest, batchRequestInfo);
+        const compositeRequest = buildCompositeRequestByFields(referenceId$1, resourceRequest, batchRequestInfo);
         const aggregateRequest = createAggregateUiRequest(resourceRequest, compositeRequest);
         return networkAdapter(aggregateRequest, resourceRequestContext).then((response) => {
             return mergeAggregateUiResponse(response, mergeGetRecordResult);
@@ -655,145 +655,19 @@ function makeNetworkChunkFieldsGetRecord(networkAdapter, instrumentationSink) {
 }
 
 const RECORDS_BATCH_ENDPOINT_REGEX = /^\/ui-api\/records\/batch\/?(([a-zA-Z0-9|,]+))?$/;
-const referenceId$2 = 'LDS_Records_Batch_AggregateUi';
+const referenceId = 'LDS_Records_Batch_AggregateUi';
 function makeNetworkChunkFieldsGetRecordsBatch(networkAdapter, intrumentationSink) {
     return (resourceRequest, resourceRequestContext) => {
         const batchRequestInfo = createAggregateBatchRequestInfo(resourceRequest, RECORDS_BATCH_ENDPOINT_REGEX, intrumentationSink);
         if (batchRequestInfo === undefined) {
             return networkAdapter(resourceRequest, resourceRequestContext);
         }
-        const compositeRequest = buildCompositeRequestByFields(referenceId$2, resourceRequest, batchRequestInfo);
-        const aggregateRequest = createAggregateUiRequest(resourceRequest, compositeRequest);
-        return networkAdapter(aggregateRequest, resourceRequestContext).then((response) => {
-            return mergeAggregateUiResponse(response, (first, second) => {
-                return mergeBatchRecordsFields(first, second, (a, b) => {
-                    return mergeRecordFields(a, b);
-                });
-            });
-        });
-    };
-}
-
-const RELATED_LIST_RECORDS_ENDPOINT_REGEX = /^\/ui-api\/related-list-records\/?(([a-zA-Z0-9]+))?\/?(([a-zA-Z0-9]+))?$/;
-const referenceId$1 = 'LDS_Related_List_Records_AggregateUi';
-const QUERY_KEY_FIELDS = 'fields';
-const QUERY_KEY_OPTIONAL_FIELDS = 'optionalFields';
-/**
- * Merge the second related list record collection into first one and return it.
- * It checks both collections should have exaction same records, otherwise error.
- * Exports it for unit tests
- */
-function mergeRelatedRecordsFields(first, second) {
-    const { records: targetRecords } = first;
-    const { records: sourceRecords } = second;
-    if (sourceRecords.length === targetRecords.length &&
-        recordIdsAllMatch(targetRecords, sourceRecords)) {
-        first.fields = first.fields.concat(second.fields);
-        first.optionalFields = first.optionalFields.concat(second.optionalFields);
-        for (let i = 0, len = sourceRecords.length; i < len; i += 1) {
-            const targetRecord = targetRecords[i];
-            const sourceRecord = sourceRecords[i];
-            mergeRecordFields(targetRecord, sourceRecord);
-        }
-        mergePageUrls(first, second);
-        return first;
-    }
-    else {
-        // Throw error due to two collection are about different set of records
-        // eslint-disable-next-line @salesforce/lds/no-error-in-production
-        throw new Error('Aggregate UI response is invalid');
-    }
-}
-function makeNetworkChunkFieldsGetRelatedListRecords(networkAdapter, instrumentationSink) {
-    return (resourceRequest, resourceRequestContext) => {
-        const batchRequestInfo = createAggregateBatchRequestInfo(resourceRequest, RELATED_LIST_RECORDS_ENDPOINT_REGEX, instrumentationSink);
-        if (batchRequestInfo === undefined) {
-            return networkAdapter(resourceRequest, resourceRequestContext);
-        }
-        const compositeRequest = buildCompositeRequestByFields(referenceId$1, resourceRequest, batchRequestInfo);
-        const aggregateRequest = createAggregateUiRequest(resourceRequest, compositeRequest);
-        return networkAdapter(aggregateRequest, resourceRequestContext).then((response) => {
-            return mergeAggregateUiResponse(response, mergeRelatedRecordsFields);
-        });
-    };
-}
-/**
- * merge the second related list record collection into first one and return it
- */
-function mergePageUrls(first, second) {
-    first.currentPageUrl = mergeUrl(first.currentPageUrl, second.currentPageUrl);
-    first.previousPageUrl = mergeUrl(first.previousPageUrl, second.previousPageUrl);
-    first.nextPageUrl = mergeUrl(first.nextPageUrl, second.nextPageUrl);
-}
-/**
- * merge to paging url with different set of fields or optional fields as combined one
- * the paging url is like
- * /services/data/v63.0/ui-api/related-list-records/001R0000006l1xKIAQ/Contacts
- * ?fields=Id%2CName&optionalFields=Contact.Id%2CContact.Name&pageSize=50&pageToken=0
- * @param path1 url path and query parmeter without domain
- * @param path2 url path and query parmeter without domain
- *
- * Export to unit test
- */
-function mergeUrl(path1, path2) {
-    if (path1 === null)
-        return path2;
-    if (path2 === null)
-        return path1;
-    // new Url(...) need the path1, path2 to be prefix-ed with this fake domain
-    const domain = 'http://c.com';
-    const url1 = new URL(domain + path1);
-    const url2 = new URL(domain + path2);
-    const searchParams1 = url1.searchParams;
-    const fields = mergeFields(url1, url2, QUERY_KEY_FIELDS);
-    if (fields && searchParams1.get(QUERY_KEY_FIELDS) !== fields) {
-        searchParams1.set(QUERY_KEY_FIELDS, fields);
-    }
-    const optionalFields = mergeFields(url1, url2, QUERY_KEY_OPTIONAL_FIELDS);
-    if (optionalFields && searchParams1.get(QUERY_KEY_OPTIONAL_FIELDS) !== optionalFields) {
-        searchParams1.set(QUERY_KEY_OPTIONAL_FIELDS, optionalFields);
-    }
-    from(searchParams1.keys())
-        .sort()
-        .forEach((key) => {
-        const value = searchParams1.get(key);
-        searchParams1.delete(key);
-        searchParams1.append(key, value);
-    });
-    return url1.toString().substr(domain.length);
-}
-function mergeFields(url1, url2, name) {
-    const fields1 = ScopedFieldsCollection.fromQueryParameterValue(url1.searchParams.get(name));
-    const fields2 = ScopedFieldsCollection.fromQueryParameterValue(url2.searchParams.get(name));
-    fields1.merge(fields2);
-    return fields1.toQueryParameterValue();
-}
-/**
- * Checks that all records ids exist in both arrays
- * @param first batch of first array or records
- * @param second batch of second array or records
- * @returns
- */
-function recordIdsAllMatch(first, second) {
-    const firstIds = first.map((record) => record.id);
-    const secondIds = second.map((record) => record.id);
-    return firstIds.every((id) => secondIds.includes(id));
-}
-
-const RELATED_LIST_RECORDS_BATCH_ENDPOINT_REGEX = /^\/ui-api\/related-list-records\/batch\/?(([a-zA-Z0-9]+))?\//;
-const referenceId = 'LDS_Related_List_Records_AggregateUi';
-function makeNetworkChunkFieldsGetRelatedListRecordsBatch(networkAdapter, instrumentationSink) {
-    return (resourceRequest, resourceRequestContext) => {
-        const batchRequestInfo = createAggregateBatchRequestInfo(resourceRequest, RELATED_LIST_RECORDS_BATCH_ENDPOINT_REGEX, instrumentationSink);
-        if (batchRequestInfo === undefined) {
-            return networkAdapter(resourceRequest, resourceRequestContext);
-        }
         const compositeRequest = buildCompositeRequestByFields(referenceId, resourceRequest, batchRequestInfo);
         const aggregateRequest = createAggregateUiRequest(resourceRequest, compositeRequest);
         return networkAdapter(aggregateRequest, resourceRequestContext).then((response) => {
             return mergeAggregateUiResponse(response, (first, second) => {
                 return mergeBatchRecordsFields(first, second, (a, b) => {
-                    return mergeRelatedRecordsFields(a, b);
+                    return mergeRecordFields(a, b);
                 });
             });
         });
@@ -809,12 +683,7 @@ function makeNetworkChunkFieldsGetRelatedListRecordsBatch(networkAdapter, instru
  */
 function makeNetworkAdapterChunkRecordFields(networkAdapter, instrumentationSink) {
     // endpoint handlers that support aggregate-ui field batching
-    const batchHandlers = [
-        makeNetworkChunkFieldsGetRecord,
-        makeNetworkChunkFieldsGetRecordsBatch,
-        makeNetworkChunkFieldsGetRelatedListRecords,
-        makeNetworkChunkFieldsGetRelatedListRecordsBatch,
-    ];
+    const batchHandlers = [makeNetworkChunkFieldsGetRecord, makeNetworkChunkFieldsGetRecordsBatch];
     return batchHandlers.reduce((network, handler) => {
         return handler(network, instrumentationSink);
     }, networkAdapter);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-network-nimbus",
-    "version": "1.332.0-dev3",
+    "version": "1.333.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "A nimbus-plugin-based implementation of the Luvio NetworkAdapter.",
     "main": "dist/main.js",
@@ -26,12 +26,12 @@
     },
     "dependencies": {
         "@luvio/engine": "0.156.5",
-        "@salesforce/lds-instrumentation": "^1.332.0-dev3",
+        "@salesforce/lds-instrumentation": "^1.333.0",
         "o11y": "250.7.0"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.332.0-dev3",
-        "@salesforce/nimbus-plugin-lds": "^1.332.0-dev3"
+        "@salesforce/lds-adapters-uiapi": "^1.333.0",
+        "@salesforce/nimbus-plugin-lds": "^1.333.0"
     },
     "luvioBundlesize": [
         {

package/dist/types/network/record-field-batching/makeNetworkChunkFieldsGetRelatedListRecords.d.ts

@@ -1,22 +0,0 @@
-import type { NetworkAdapter } from '@luvio/engine';
-import type { AggregateResponse, InstrumentationSink } from './utils';
-import type { RelatedListRecordCollectionRepresentation } from '@salesforce/lds-adapters-uiapi';
-export type RelatedListAggregateResponse = AggregateResponse<RelatedListRecordCollectionRepresentation>;
-/**
- * Merge the second related list record collection into first one and return it.
- * It checks both collections should have exaction same records, otherwise error.
- * Exports it for unit tests
- */
-export declare function mergeRelatedRecordsFields(first: RelatedListRecordCollectionRepresentation, second: RelatedListRecordCollectionRepresentation): RelatedListRecordCollectionRepresentation;
-export declare function makeNetworkChunkFieldsGetRelatedListRecords(networkAdapter: NetworkAdapter, instrumentationSink: InstrumentationSink): NetworkAdapter;
-/**
- * merge to paging url with different set of fields or optional fields as combined one
- * the paging url is like
- * /services/data/v63.0/ui-api/related-list-records/001R0000006l1xKIAQ/Contacts
- * ?fields=Id%2CName&optionalFields=Contact.Id%2CContact.Name&pageSize=50&pageToken=0
- * @param path1 url path and query parmeter without domain
- * @param path2 url path and query parmeter without domain
- *
- * Export to unit test
- */
-export declare function mergeUrl(path1: string | null, path2: string | null): string | null;

package/dist/types/network/record-field-batching/makeNetworkChunkFieldsGetRelatedListRecordsBatch.d.ts

@@ -1,6 +0,0 @@
-import type { FetchResponse, NetworkAdapter } from '@luvio/engine';
-import type { AggregateResponse, InstrumentationSink } from './utils';
-import type { RelatedListRecordCollectionBatchRepresentation } from '@salesforce/lds-adapters-uiapi';
-export type RelatedListBatchAggregateResponse = AggregateResponse<RelatedListRecordCollectionBatchRepresentation>;
-export type RelatedListBatchResponse = FetchResponse<RelatedListRecordCollectionBatchRepresentation>;
-export declare function makeNetworkChunkFieldsGetRelatedListRecordsBatch(networkAdapter: NetworkAdapter, instrumentationSink: InstrumentationSink): NetworkAdapter;