@builder.io/sdk 1.1.27 → 1.1.28-2

package/dist/index.cjs.js

@@ -129,7 +129,7 @@ function assertAllowedPropertyName(name) {
         throw new Error("Property name \"".concat(name, "\" is not allowed"));
 }
 
-var version = "1.1.27-4";
+var version = "1.1.28-1";
 
 var Subscription = /** @class */ (function () {
     function Subscription(listeners, listener) {
@@ -456,13 +456,17 @@ function tinyFetch(url, options) {
         }
     });
 }
-var fetch = typeof global === 'object' && typeof global.fetch === 'function'
-    ? global.fetch
-    : typeof window === 'undefined'
-        ? serverOnlyRequire$1('node-fetch')
-        : typeof window.fetch !== 'undefined'
-            ? window.fetch
-            : tinyFetch;
+var fetch;
+// If fetch is defined, in the browser, via polyfill, or in a Cloudflare worker, use it.
+if (globalThis.fetch) {
+    fetch = globalThis.fetch;
+}
+// If fetch is not defined, in a Node.js environment, use node-fetch.
+if (typeof window === 'undefined') {
+    fetch !== null && fetch !== void 0 ? fetch : (fetch = serverOnlyRequire$1('node-fetch'));
+}
+// Otherwise, use tiny-fetch.
+fetch !== null && fetch !== void 0 ? fetch : (fetch = tinyFetch);
 
 function assign(target) {
     var args = [];
@@ -876,6 +880,70 @@ function uuid() {
     return uuidv4().replace(/-/g, '');
 }
 
+function emptyUrl() {
+    return {
+        query: null,
+        port: null,
+        auth: null,
+        hash: null,
+        host: null,
+        hostname: null,
+        href: null,
+        path: null,
+        pathname: null,
+        protocol: null,
+        search: null,
+        slashes: null,
+    };
+}
+// Replacement for `url.parse` using `URL` global object that works with relative paths.
+// Assumptions: this function operates in a NodeJS environment.
+function parse(url) {
+    var out = emptyUrl();
+    var u;
+    var pathOnly = url === '' || url[0] === '/';
+    if (pathOnly) {
+        u = new URL(url, 'http://0.0.0.0/');
+        out.href = u.href;
+        out.href = out.href.slice(14); // remove 'http://0.0.0.0/'
+    }
+    else {
+        u = new URL(url);
+        out.href = u.href;
+        out.port = u.port === '' ? null : u.port;
+        out.hash = u.hash === '' ? null : u.hash;
+        out.host = u.host;
+        out.hostname = u.hostname;
+        out.href = u.href;
+        out.pathname = u.pathname;
+        out.protocol = u.protocol;
+        out.slashes = url[u.protocol.length] === '/'; // check if the mimetype is proceeded by a slash
+    }
+    out.search = u.search;
+    out.query = u.search.slice(1); // remove '?'
+    out.path = "".concat(u.pathname).concat(u.search);
+    out.pathname = u.pathname;
+    return out;
+}
+
+/**
+ * Safe conversion to error type. Intended to be used in catch blocks where the
+ *  value is not guaranteed to be an error.
+ *
+ *  @example
+ *  try {
+ *    throw new Error('Something went wrong')
+ *  }
+ *  catch (err: unknown) {
+ *    const error: Error = toError(err)
+ *  }
+ */
+function toError(err) {
+    if (err instanceof Error)
+        return err;
+    return new Error(String(err));
+}
+
 function datePlusMinutes(minutes) {
     if (minutes === void 0) { minutes = 30; }
     return new Date(Date.now() + minutes * 60000);
@@ -909,12 +977,24 @@ function getQueryParam(url, variable) {
 }
 var urlParser = {
     parse: function (url) {
-        var parser = document.createElement('a');
-        parser.href = url;
+        var el = document.createElement('a');
+        el.href = url;
         var out = {};
-        var props = 'username password host hostname port protocol origin pathname search hash'.split(' ');
-        for (var i = props.length; i--;) {
-            out[props[i]] = parser[props[i]];
+        var props = [
+            'username',
+            'password',
+            'host',
+            'hostname',
+            'port',
+            'protocol',
+            'origin',
+            'pathname',
+            'search',
+            'hash',
+        ];
+        for (var _i = 0, props_1 = props; _i < props_1.length; _i++) {
+            var prop = props_1[_i];
+            out[prop] = el[prop];
         }
         // IE 11 pathname handling workaround
         // (IE omits preceeding '/', unlike other browsers)
@@ -926,11 +1006,11 @@ var urlParser = {
         return out;
     },
 };
-var parse = isReactNative
-    ? function () { return ({}); }
+var parse$1 = isReactNative
+    ? function () { return emptyUrl(); }
     : typeof window === 'object'
         ? urlParser.parse
-        : serverOnlyRequire$1('url').parse;
+        : parse;
 function setCookie(name$$1, value, expires) {
     try {
         var expiresString = '';
@@ -1033,6 +1113,7 @@ var Builder = /** @class */ (function () {
         this.observersByKey = {};
         this.noEditorUpdates = {};
         this.overrides = {};
+        this.queryOptions = {};
         this.getContentQueue = null;
         this.priorContentQueue = null;
         this.testCookiePrefix = 'builder.tests';
@@ -1644,10 +1725,14 @@ var Builder = /** @class */ (function () {
         var params = QueryString.parseDeep(this.modifySearch(location.search || '').substr(1));
         var builder = params.builder;
         if (builder) {
-            var userAttributes = builder.userAttributes, overrides = builder.overrides, env = builder.env, host = builder.host, api = builder.api, cachebust = builder.cachebust, noCache = builder.noCache, preview = builder.preview, editing = builder.editing, frameEditing = builder.frameEditing, overrideParams = builder.params;
+            var userAttributes = builder.userAttributes, overrides = builder.overrides, env = builder.env, host = builder.host, api = builder.api, cachebust = builder.cachebust, noCache = builder.noCache, preview = builder.preview, editing = builder.editing, frameEditing = builder.frameEditing, options = builder.options, overrideParams = builder.params;
             if (userAttributes) {
                 this.setUserAttributes(userAttributes);
             }
+            if (options) {
+                // picking only locale and includeRefs
+                this.queryOptions = tslib.__assign(tslib.__assign({}, (options.locale && { locale: options.locale })), (options.includeRefs && { includeRefs: options.includeRefs }));
+            }
             if (overrides) {
                 this.overrides = overrides;
             }
@@ -1688,7 +1773,7 @@ var Builder = /** @class */ (function () {
         if (isBrowser) {
             addEventListener('message', function (event) {
                 var _a, _b, _c, _d, _e;
-                var url = parse(event.origin);
+                var url = parse$1(event.origin);
                 var isRestricted = ['builder.register', 'builder.registerComponent'].indexOf((_a = event.data) === null || _a === void 0 ? void 0 : _a.type) === -1;
                 var isTrusted = url.hostname && Builder.isTrustedHost(url.hostname);
                 if (isRestricted && !isTrusted) {
@@ -1830,7 +1915,7 @@ var Builder = /** @class */ (function () {
                                 result = fn.apply(_this, args);
                             }
                             catch (err) {
-                                error = err;
+                                error = toError(err);
                             }
                             if (error) {
                                 (_d = window.parent) === null || _d === void 0 ? void 0 : _d.postMessage({
@@ -1900,14 +1985,15 @@ var Builder = /** @class */ (function () {
     });
     // TODO: allow adding location object as property and/or in constructor
     Builder.prototype.getLocation = function () {
+        var _a;
         var parsedLocation = {};
         // in ssr mode
         if (this.request) {
-            parsedLocation = parse(this.request.url);
+            parsedLocation = parse$1((_a = this.request.url) !== null && _a !== void 0 ? _a : '');
         }
         else if (typeof location === 'object') {
             // in the browser
-            parsedLocation = parse(location.href);
+            parsedLocation = parse$1(location.href);
         }
         // IE11 bug with parsed path being empty string
         // causes issues with our user targeting
@@ -2079,47 +2165,6 @@ var Builder = /** @class */ (function () {
         }
         return observable;
     };
-    Builder.prototype.requestUrl = function (url, options) {
-        if (Builder.isBrowser) {
-            return fetch(url, options).then(function (res) { return res.json(); });
-        }
-        return new Promise(function (resolve, reject) {
-            var parsedUrl = parse(url);
-            var module = parsedUrl.protocol === 'http:' ? serverOnlyRequire$1('http') : serverOnlyRequire$1('https');
-            var requestOptions = {
-                host: parsedUrl.hostname,
-                port: parsedUrl.port,
-                path: parsedUrl.pathname + parsedUrl.search,
-                headers: tslib.__assign({}, options === null || options === void 0 ? void 0 : options.headers),
-            };
-            module
-                .get(requestOptions, function (resp) {
-                var data = '';
-                // We are collecting textual data
-                resp.setEncoding('utf8');
-                // A chunk of data has been recieved.
-                resp.on('data', function (chunk) {
-                    data += chunk;
-                });
-                // The whole response has been received. Print out the result.
-                resp.on('end', function () {
-                    try {
-                        resolve(JSON.parse(data));
-                    }
-                    catch (err) {
-                        if ((err === null || err === void 0 ? void 0 : err.name) === 'SyntaxError') {
-                            var jsonParseError = new Error("[Builder.io] ERROR: invalid response.\nRequest: ".concat(JSON.stringify(requestOptions, null, 2), "\nResponse Data: ").concat(data, "\n"));
-                            reject(jsonParseError);
-                        }
-                        reject(err);
-                    }
-                });
-            })
-                .on('error', function (error) {
-                reject(error);
-            });
-        });
-    };
     Object.defineProperty(Builder.prototype, "host", {
         get: function () {
             switch (this.env) {
@@ -2159,9 +2204,9 @@ var Builder = /** @class */ (function () {
         var queue = useQueue || (usePastQueue ? this.priorContentQueue : this.getContentQueue) || [];
         // TODO: do this on every request send?
         this.getOverridesFromQueryString();
-        var queryParams = tslib.__assign({ 
+        var queryParams = tslib.__assign(tslib.__assign({ 
             // TODO: way to force a request to be in a separate queue. or just lower queue limit to be 1 by default
-            omit: queue[0].omit || 'meta.componentsUsed', apiKey: this.apiKey }, queue[0].options);
+            omit: queue[0].omit || 'meta.componentsUsed', apiKey: this.apiKey }, queue[0].options), this.queryOptions);
         if (queue[0].fields) {
             queryParams.fields = queue[0].fields;
         }
@@ -2281,7 +2326,12 @@ var Builder = /** @class */ (function () {
         if (this.authToken) {
             requestOptions.headers = tslib.__assign(tslib.__assign({}, requestOptions.headers), { Authorization: "Bearer ".concat(this.authToken) });
         }
-        var promise = this.requestUrl("".concat(host, "/api/v1/").concat(format === 'solid' || format === 'react' ? 'codegen' : 'query', "/").concat(this.apiKey, "/").concat(keyNames) + (queryParams && hasParams ? "?".concat(queryStr) : ''), requestOptions).then(function (result) {
+        var fn = format === 'solid' || format === 'react' ? 'codegen' : 'query';
+        var url = "".concat(host, "/api/v1/").concat(fn, "/").concat(this.apiKey, "/").concat(keyNames) +
+            (queryParams && hasParams ? "?".concat(queryStr) : '');
+        var promise = fetch(url, requestOptions)
+            .then(function (res) { return res.json(); })
+            .then(function (result) {
             for (var _i = 0, queue_3 = queue; _i < queue_3.length; _i++) {
                 var options = queue_3[_i];
                 var keyName = options.key;