@aws-amplify/api-graphql 4.0.1-api-v6-models.3eb7748.0 → 4.0.1-api-v6-models.9493d4d.0

package/lib/internals/APIClient.js

@@ -147,7 +147,7 @@ exports.graphQLOperationsInfo = {
     ONDELETE: { operationPrefix: 'onDelete', usePlural: false },
 };
 var graphQLDocumentsCache = new Map();
-var SELECTION_SET_ALL_NESTED = '*';
+var SELECTION_SET_WILDCARD = '*';
 function defaultSelectionSetForModel(modelDefinition) {
     // fields that are explicitly part of the graphql schema; not
     // inferred from owner auth rules.
@@ -184,71 +184,54 @@ var FIELD_IR = '';
  * ```
  */
 function customSelectionSetToIR(modelIntrospection, modelName, selectionSet) {
-    var e_2, _a;
-    var _b, _c, _d, _e;
     var modelDefinition = modelIntrospection[modelName];
-    var fields = modelDefinition.fields;
-    var intermediateSelectionSet = {};
-    try {
-        for (var selectionSet_1 = tslib_1.__values(selectionSet), selectionSet_1_1 = selectionSet_1.next(); !selectionSet_1_1.done; selectionSet_1_1 = selectionSet_1.next()) {
-            var f = selectionSet_1_1.value;
-            var nested = f.includes('.');
-            if (nested) {
-                var _f = tslib_1.__read(f.split('.'), 2), modelFieldName = _f[0], selectedField = _f[1];
-                var relatedModel = (_c = (_b = fields[modelFieldName]) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.model;
-                if (!relatedModel) {
-                    // TODO: may need to change this to support custom types
-                    throw Error("".concat(modelFieldName, " is not a model field"));
-                }
-                if (selectedField === SELECTION_SET_ALL_NESTED) {
-                    var relatedModelDefinition = modelIntrospection[relatedModel];
-                    var defaultSelectionSet = defaultSelectionSetForModel(relatedModelDefinition);
-                    var reduced = defaultSelectionSet.reduce(function (acc, curVal) {
-                        acc[curVal] = FIELD_IR;
-                        return acc;
-                    }, {});
-                    if ((_d = fields[modelFieldName]) === null || _d === void 0 ? void 0 : _d.isArray) {
-                        intermediateSelectionSet[modelFieldName] = {
-                            items: reduced,
-                        };
-                    }
-                    else {
-                        intermediateSelectionSet[modelFieldName] = reduced;
-                    }
-                }
-                else {
-                    var getNestedSelSet = customSelectionSetToIR(modelIntrospection, relatedModel, [selectedField]);
-                    if ((_e = fields[modelFieldName]) === null || _e === void 0 ? void 0 : _e.isArray) {
-                        var existing = intermediateSelectionSet[modelFieldName] || { items: {} };
-                        var merged = tslib_1.__assign(tslib_1.__assign({}, existing.items), getNestedSelSet);
-                        intermediateSelectionSet[modelFieldName] = { items: merged };
-                    }
-                    else {
-                        var existingItems = intermediateSelectionSet[modelFieldName] || {};
-                        var merged = tslib_1.__assign(tslib_1.__assign({}, existingItems), getNestedSelSet);
-                        intermediateSelectionSet[modelFieldName] = merged;
-                    }
-                }
+    var modelFields = modelDefinition.fields;
+    return selectionSet.reduce(function (resultObj, path) {
+        var _a, _b, _c;
+        var _d = tslib_1.__read(path.split('.')), fieldName = _d[0], nested = _d[1], rest = _d.slice(2);
+        if (nested) {
+            var relatedModel = (_b = (_a = modelFields[fieldName]) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.model;
+            if (!relatedModel) {
+                // TODO: may need to change this to support custom types
+                throw Error("".concat(fieldName, " is not a model field"));
             }
-            else {
-                var exists = Boolean(fields[f]);
-                if (!exists) {
-                    throw Error("".concat(f, " is not a field of model ").concat(modelName));
-                }
-                intermediateSelectionSet[f] = FIELD_IR;
+            var relatedModelDefinition = modelIntrospection[relatedModel];
+            var selectionSet_1 = nested === SELECTION_SET_WILDCARD
+                ? defaultSelectionSetIR(relatedModelDefinition)
+                : // if we have a path like 'field.anotherField' recursively build up selection set IR
+                    customSelectionSetToIR(modelIntrospection, relatedModel, [
+                        tslib_1.__spreadArray([nested], tslib_1.__read(rest), false).join('.'),
+                    ]);
+            if ((_c = modelFields[fieldName]) === null || _c === void 0 ? void 0 : _c.isArray) {
+                var existing = resultObj[fieldName] || {
+                    items: {},
+                };
+                var merged_1 = tslib_1.__assign(tslib_1.__assign({}, existing.items), selectionSet_1);
+                resultObj[fieldName] = { items: merged_1 };
+                return resultObj;
             }
+            var existingItems = resultObj[fieldName] || {};
+            var merged = tslib_1.__assign(tslib_1.__assign({}, existingItems), selectionSet_1);
+            resultObj[fieldName] = merged;
+            return resultObj;
         }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (selectionSet_1_1 && !selectionSet_1_1.done && (_a = selectionSet_1.return)) _a.call(selectionSet_1);
+        var exists = Boolean(modelFields[fieldName]);
+        if (!exists) {
+            throw Error("".concat(fieldName, " is not a field of model ").concat(modelName));
         }
-        finally { if (e_2) throw e_2.error; }
-    }
-    return intermediateSelectionSet;
+        resultObj[fieldName] = FIELD_IR;
+        return resultObj;
+    }, {});
 }
 exports.customSelectionSetToIR = customSelectionSetToIR;
+var defaultSelectionSetIR = function (relatedModelDefinition) {
+    var defaultSelectionSet = defaultSelectionSetForModel(relatedModelDefinition);
+    var reduced = defaultSelectionSet.reduce(function (acc, curVal) {
+        acc[curVal] = FIELD_IR;
+        return acc;
+    }, {});
+    return reduced;
+};
 /**
  * Stringifies selection set IR
  * * @example