@builder.io/sdk 3.0.2 → 3.0.4

package/dist/index.cjs.js

@@ -126,7 +126,7 @@ function assertAllowedPropertyName(name) {
         throw new Error("Property name \"".concat(name, "\" is not allowed"));
 }
 
-var version = "3.0.2";
+var version = "3.0.4";
 
 var Subscription = /** @class */ (function () {
     function Subscription(listeners, listener) {
@@ -2278,6 +2278,26 @@ var Builder = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Builder.prototype.makeFetchApiCall = function (url, requestOptions) {
+        return getFetch()(url, requestOptions);
+    };
+    Builder.prototype.flattenMongoQuery = function (obj, _current, _res) {
+        if (_res === void 0) { _res = {}; }
+        for (var key in obj) {
+            var value = obj[key];
+            var newKey = _current ? _current + '.' + key : key;
+            if (value &&
+                typeof value === 'object' &&
+                !Array.isArray(value) &&
+                !Object.keys(value).find(function (item) { return item.startsWith('$'); })) {
+                this.flattenMongoQuery(value, newKey, _res);
+            }
+            else {
+                _res[newKey] = value;
+            }
+        }
+        return _res;
+    };
     Builder.prototype.flushGetContentQueue = function (usePastQueue, useQueue) {
         var _this = this;
         if (usePastQueue === void 0) { usePastQueue = false; }
@@ -2296,6 +2316,7 @@ var Builder = /** @class */ (function () {
             return;
         }
         var queue = useQueue || (usePastQueue ? this.priorContentQueue : this.getContentQueue) || [];
+        var apiEndpoint = queue[0].apiEndpoint || 'query';
         // TODO: do this on every request send?
         this.getOverridesFromQueryString();
         var queryParams = tslib.__assign(tslib.__assign({ 
@@ -2372,8 +2393,9 @@ var Builder = /** @class */ (function () {
         }
         for (var _i = 0, queue_2 = queue; _i < queue_2.length; _i++) {
             var options = queue_2[_i];
-            if (options.format) {
-                queryParams.format = options.format;
+            var format_1 = options.format;
+            if (format_1) {
+                queryParams.format = format_1;
             }
             // TODO: remove me and make permodel
             if (options.static) {
@@ -2404,9 +2426,14 @@ var Builder = /** @class */ (function () {
                 var key = properties_1[_a];
                 var value = options[key];
                 if (value !== undefined) {
-                    queryParams.options = queryParams.options || {};
-                    queryParams.options[options.key] = queryParams.options[options.key] || {};
-                    queryParams.options[options.key][key] = JSON.stringify(value);
+                    if (apiEndpoint === 'query') {
+                        queryParams.options = queryParams.options || {};
+                        queryParams.options[options.key] = queryParams.options[options.key] || {};
+                        queryParams.options[options.key][key] = JSON.stringify(value);
+                    }
+                    else {
+                        queryParams[key] = JSON.stringify(value);
+                    }
                 }
             }
         }
@@ -2421,18 +2448,36 @@ var Builder = /** @class */ (function () {
             var params = omit(QueryString.parse(this.overrideParams), 'apiKey');
             assign(queryParams, params);
         }
-        var queryStr = QueryString.stringifyDeep(queryParams);
         var format = queryParams.format;
+        var isApiCallForCodegen = format === 'solid' || format === 'react';
+        var isApiCallForCodegenOrQuery = isApiCallForCodegen || apiEndpoint === 'query';
+        if (apiEndpoint === 'content') {
+            queryParams.enrich = true;
+            if (queue[0].query) {
+                var flattened = this.flattenMongoQuery({ query: queue[0].query });
+                for (var key in flattened) {
+                    queryParams[key] = flattened[key];
+                }
+                delete queryParams.query;
+            }
+        }
+        var queryStr = QueryString.stringifyDeep(queryParams);
         var requestOptions = { headers: {} };
         if (this.authToken) {
             requestOptions.headers = tslib.__assign(tslib.__assign({}, requestOptions.headers), { Authorization: "Bearer ".concat(this.authToken) });
         }
-        var fn = format === 'solid' || format === 'react' ? 'codegen' : 'query';
-        // NOTE: this is a hack to get around the fact that the codegen endpoint is not yet available in v3
-        var apiVersionBasedOnFn = fn === 'query' ? this.apiVersion : 'v1';
-        var url = "".concat(host, "/api/").concat(apiVersionBasedOnFn, "/").concat(fn, "/").concat(this.apiKey, "/").concat(keyNames) +
-            (queryParams && hasParams ? "?".concat(queryStr) : '');
-        var promise = getFetch()(url, requestOptions)
+        var url;
+        if (isApiCallForCodegen) {
+            url = "".concat(host, "/api/v1/codegen/").concat(this.apiKey, "/").concat(keyNames);
+        }
+        else if (apiEndpoint === 'query') {
+            url = "".concat(host, "/api/v3/query/").concat(this.apiKey, "/").concat(keyNames);
+        }
+        else {
+            url = "".concat(host, "/api/v3/content/").concat(queue[0].model);
+        }
+        url = url + (queryParams && hasParams ? "?".concat(queryStr) : '');
+        var promise = this.makeFetchApiCall(url, requestOptions)
             .then(function (res) { return res.json(); })
             .then(function (result) {
             for (var _i = 0, queue_3 = queue; _i < queue_3.length; _i++) {
@@ -2450,7 +2495,7 @@ var Builder = /** @class */ (function () {
                 if (!observer) {
                     return;
                 }
-                var data = result[keyName];
+                var data = isApiCallForCodegenOrQuery ? result[keyName] : result.results;
                 var sorted = data; // sortBy(data, item => item.priority);
                 if (data) {
                     var testModifiedResults = Builder.isServer