@builder.io/sdk 1.1.34 → 1.1.36-0

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export { Builder, BuilderComponent, isBrowser, Input, Component, GetContentOptio
 export { BehaviorSubject, Subscription } from './src/classes/observable.class';
 export { BuilderElement } from './src/types/element';
 export { BuilderContent, BuilderContentVariation } from './src/types/content';
+export { ApiVersion } from './src/types/api-version';
 export { builder } from './src/constants/builder';

package/dist/index.esm.js

@@ -123,7 +123,7 @@ function assertAllowedPropertyName(name) {
         throw new Error("Property name \"".concat(name, "\" is not allowed"));
 }
 
-var version = "1.1.34-2";
+var version = "1.1.36-0";
 
 var Subscription = /** @class */ (function () {
     function Subscription(listeners, listener) {
@@ -473,10 +473,6 @@ function getFetch() {
 }
 
 function assign(target) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
     var to = Object(target);
     for (var index = 1; index < arguments.length; index++) {
         var nextSource = arguments[index];
@@ -917,7 +913,7 @@ function emptyUrl() {
 }
 // Replacement for `url.parse` using `URL` global object that works with relative paths.
 // Assumptions: this function operates in a NodeJS environment.
-function parse(url) {
+function parse$1(url) {
     var out = emptyUrl();
     var u;
     var pathOnly = url === '' || url[0] === '/';
@@ -963,6 +959,8 @@ function toError(err) {
     return new Error(String(err));
 }
 
+var DEFAULT_API_VERSION = 'v1';
+
 function datePlusMinutes(minutes) {
     if (minutes === void 0) { minutes = 30; }
     return new Date(Date.now() + minutes * 60000);
@@ -1025,12 +1023,12 @@ var urlParser = {
         return out;
     },
 };
-var parse$1 = isReactNative
+var parse = isReactNative
     ? function () { return emptyUrl(); }
     : typeof window === 'object'
         ? urlParser.parse
-        : parse;
-function setCookie(name$$1, value, expires) {
+        : parse$1;
+function setCookie(name, value, expires) {
     try {
         var expiresString = '';
         // TODO: need to know if secure server side
@@ -1039,7 +1037,7 @@ function setCookie(name$$1, value, expires) {
         }
         var secure = isBrowser ? location.protocol === 'https:' : true;
         document.cookie =
-            name$$1 +
+            name +
                 '=' +
                 (value || '') +
                 expiresString +
@@ -1051,10 +1049,10 @@ function setCookie(name$$1, value, expires) {
         console.warn('Could not set cookie', err);
     }
 }
-function getCookie(name$$1) {
+function getCookie(name) {
     try {
         return (decodeURIComponent(document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' +
-            encodeURIComponent(name$$1).replace(/[\-\.\+\*]/g, '\\$&') +
+            encodeURIComponent(name).replace(/[\-\.\+\*]/g, '\\$&') +
             '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1')) || null);
     }
     catch (err) {
@@ -1085,7 +1083,7 @@ function BuilderComponent(info) {
     return Builder.Component(info);
 }
 var Builder = /** @class */ (function () {
-    function Builder(apiKey, request, response, forceNewInstance, authToken) {
+    function Builder(apiKey, request, response, forceNewInstance, authToken, apiVersion) {
         if (apiKey === void 0) { apiKey = null; }
         if (forceNewInstance === void 0) { forceNewInstance = false; }
         if (authToken === void 0) { authToken = null; }
@@ -1110,6 +1108,7 @@ var Builder = /** @class */ (function () {
         this.overrideParams = '';
         this.noCache = false;
         this.preview = false;
+        this.apiVersion$ = new BehaviorSubject(undefined);
         this.canTrack$ = new BehaviorSubject(!this.browserTrackingDisabled);
         this.apiKey$ = new BehaviorSubject(null);
         this.authToken$ = new BehaviorSubject(null);
@@ -1149,6 +1148,9 @@ var Builder = /** @class */ (function () {
         if (apiKey) {
             this.apiKey = apiKey;
         }
+        if (apiVersion) {
+            this.apiVersion = apiVersion;
+        }
         if (authToken) {
             this.authToken = authToken;
         }
@@ -1260,7 +1262,11 @@ var Builder = /** @class */ (function () {
         this.trustedHosts.push(host);
     };
     Builder.isTrustedHost = function (hostname) {
-        return (this.trustedHosts.findIndex(function (trustedHost) { return trustedHost === hostname || hostname.endsWith(".".concat(trustedHost)); }) > -1);
+        return (this.trustedHosts.findIndex(function (trustedHost) {
+            return trustedHost.startsWith('*.')
+                ? hostname.endsWith(trustedHost.slice(1))
+                : trustedHost === hostname;
+        }) > -1);
     };
     Builder.runAction = function (action) {
         // TODO
@@ -1269,11 +1275,11 @@ var Builder = /** @class */ (function () {
             throw new Error("Action not found: ".concat(action));
         }
     };
-    Builder.fields = function (name$$1, fields) {
+    Builder.fields = function (name, fields) {
         var _a;
         (_a = window.parent) === null || _a === void 0 ? void 0 : _a.postMessage({
             type: 'builder.fields',
-            data: { name: name$$1, fields: fields },
+            data: { name: name, fields: fields },
         }, '*');
     };
     /**
@@ -1457,6 +1463,18 @@ var Builder = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(Builder.prototype, "apiVersion", {
+        get: function () {
+            return this.apiVersion$.value;
+        },
+        set: function (apiVersion) {
+            if (this.apiVersion !== apiVersion) {
+                this.apiVersion$.next(apiVersion);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(Builder.prototype, "editingMode", {
         get: function () {
             return this.editingMode$.value;
@@ -1754,7 +1772,7 @@ 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, options = builder.options, overrideParams = builder.params;
+            var userAttributes = builder.userAttributes, overrides = builder.overrides, env = builder.env; builder.host; var 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);
             }
@@ -1802,7 +1820,7 @@ var Builder = /** @class */ (function () {
         if (isBrowser) {
             addEventListener('message', function (event) {
                 var _a, _b, _c, _d, _e;
-                var url = parse$1(event.origin);
+                var url = parse(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) {
@@ -1988,7 +2006,7 @@ var Builder = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Builder.prototype.init = function (apiKey, canTrack, req, res, authToken) {
+    Builder.prototype.init = function (apiKey, canTrack, req, res, authToken, apiVersion) {
         if (canTrack === void 0) { canTrack = this.defaultCanTrack; }
         if (req) {
             this.request = req;
@@ -2001,6 +2019,9 @@ var Builder = /** @class */ (function () {
         if (authToken) {
             this.authToken = authToken;
         }
+        if (apiVersion) {
+            this.apiVersion = apiVersion;
+        }
         return this;
     };
     Object.defineProperty(Builder.prototype, "previewingModel", {
@@ -2018,11 +2039,11 @@ var Builder = /** @class */ (function () {
         var parsedLocation = {};
         // in ssr mode
         if (this.request) {
-            parsedLocation = parse$1((_a = this.request.url) !== null && _a !== void 0 ? _a : '');
+            parsedLocation = parse((_a = this.request.url) !== null && _a !== void 0 ? _a : '');
         }
         else if (typeof location === 'object') {
             // in the browser
-            parsedLocation = parse$1(location.href);
+            parsedLocation = parse(location.href);
         }
         // IE11 bug with parsed path being empty string
         // causes issues with our user targeting
@@ -2083,16 +2104,21 @@ var Builder = /** @class */ (function () {
         if (options === void 0) { options = {}; }
         var instance = this;
         if (!Builder.isBrowser) {
-            instance = new Builder(options.apiKey || this.apiKey, options.req, options.res, undefined, options.authToken || this.authToken);
+            instance = new Builder(options.apiKey || this.apiKey, options.req, options.res, undefined, options.authToken || this.authToken, options.apiVersion || this.apiVersion);
             instance.setUserAttributes(this.getUserAttributes());
         }
         else {
+            // NOTE: All these are when .init is not called and the customer
+            // directly calls .get on the singleton instance of Builder
             if (options.apiKey && !this.apiKey) {
                 this.apiKey = options.apiKey;
             }
             if (options.authToken && !this.authToken) {
                 this.authToken = options.authToken;
             }
+            if (options.apiVersion && !this.apiVersion) {
+                this.apiVersion = options.apiVersion;
+            }
         }
         return instance.queueGetContent(modelName, options).map(
         /* map( */ function (matches) {
@@ -2233,6 +2259,14 @@ var Builder = /** @class */ (function () {
         if (!this.apiKey) {
             throw new Error("Fetching content failed, expected apiKey to be defined instead got: ".concat(this.apiKey));
         }
+        if (this.apiVersion) {
+            if (!['v1', 'v3'].includes(this.apiVersion)) {
+                throw new Error("Invalid apiVersion: expected 'v1' or 'v3', received '".concat(this.apiVersion, "'"));
+            }
+        }
+        else {
+            this.apiVersion = DEFAULT_API_VERSION;
+        }
         if (!usePastQueue && !this.getContentQueue) {
             return;
         }
@@ -2250,7 +2284,7 @@ var Builder = /** @class */ (function () {
         }
         var pageQueryParams = typeof location !== 'undefined'
             ? QueryString.parseDeep(location.search.substr(1))
-            : undefined || {};
+            : {};
         var userAttributes = 
         // FIXME: HACK: only checks first in queue for user attributes overrides, should check all
         // TODO: merge user attributes provided here with defaults and current user attiributes (?)
@@ -2362,7 +2396,9 @@ var Builder = /** @class */ (function () {
             requestOptions.headers = __assign(__assign({}, requestOptions.headers), { Authorization: "Bearer ".concat(this.authToken) });
         }
         var fn = format === 'solid' || format === 'react' ? 'codegen' : 'query';
-        var url = "".concat(host, "/api/v1/").concat(fn, "/").concat(this.apiKey, "/").concat(keyNames) +
+        // 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)
             .then(function (res) { return res.json(); })
@@ -2466,20 +2502,20 @@ var Builder = /** @class */ (function () {
         future.setDate(future.getDate() + 30);
         return this.setCookie("".concat(this.testCookiePrefix, ".").concat(contentId), variationId, future);
     };
-    Builder.prototype.getCookie = function (name$$1) {
+    Builder.prototype.getCookie = function (name) {
         if (this.cookies) {
-            return this.cookies.get(name$$1);
+            return this.cookies.get(name);
         }
-        return Builder.isBrowser && getCookie(name$$1);
+        return Builder.isBrowser && getCookie(name);
     };
-    Builder.prototype.setCookie = function (name$$1, value, expires) {
+    Builder.prototype.setCookie = function (name, value, expires) {
         if (this.cookies && !(Builder.isServer && Builder.isStatic)) {
-            return this.cookies.set(name$$1, value, {
+            return this.cookies.set(name, value, {
                 expires: expires,
                 secure: this.getLocation().protocol === 'https:',
             });
         }
-        return Builder.isBrowser && setCookie(name$$1, value, expires);
+        return Builder.isBrowser && setCookie(name, value, expires);
     };
     Builder.prototype.getContent = function (modelName, options) {
         if (options === void 0) { options = {}; }
@@ -2492,17 +2528,22 @@ var Builder = /** @class */ (function () {
         if (options === void 0) { options = {}; }
         var instance = this;
         if (!Builder.isBrowser) {
-            instance = new Builder(options.apiKey || this.apiKey, options.req, options.res);
+            instance = new Builder(options.apiKey || this.apiKey, options.req, options.res, false, null, options.apiVersion);
             instance.setUserAttributes(this.getUserAttributes());
         }
         else {
+            // NOTE: All these are when .init is not called and the customer
+            // directly calls .get on the singleton instance of Builder
             if (options.apiKey && !this.apiKey) {
                 this.apiKey = options.apiKey;
             }
+            if (options.apiVersion && !this.apiVersion) {
+                this.apiVersion = options.apiVersion;
+            }
         }
         return instance
             .getContent(modelName, __assign(__assign({ limit: 30 }, options), { key: options.key ||
-                // Make the key include all options so we don't reuse cache for the same conent fetched
+                // Make the key include all options, so we don't reuse cache for the same content fetched
                 // with different options
                 Builder.isBrowser
                 ? "".concat(modelName, ":").concat(hash(omit(options, 'initialContent', 'req', 'res')))
@@ -2527,7 +2568,13 @@ var Builder = /** @class */ (function () {
     Builder.nextTick = nextTick;
     Builder.throttle = throttle;
     Builder.editors = [];
-    Builder.trustedHosts = ['builder.io', 'localhost'];
+    Builder.trustedHosts = [
+        '*.beta.builder.io',
+        'beta.builder.io',
+        'builder.io',
+        'localhost',
+        'qa.builder.io',
+    ];
     Builder.plugins = [];
     Builder.actions = [];
     Builder.registry = {};
@@ -2557,5 +2604,5 @@ var Builder = /** @class */ (function () {
 var builder = new Builder(null, undefined, undefined, true);
 Builder.singletonInstance = builder;
 
-export { Builder, BuilderComponent, isBrowser, BehaviorSubject, Subscription, builder };
+export { BehaviorSubject, Builder, BuilderComponent, Subscription, builder, isBrowser };
 //# sourceMappingURL=index.esm.js.map