@builder.io/sdk-qwik 0.17.1 → 0.17.2

package/lib/node/functions/get-content/generate-content-url.qwik.mjs

@@ -1,7 +1,8 @@
-import { flatten, flattenMongoQuery } from "../../helpers/flatten.qwik.mjs";
+import { flatten, flattenMongoQuery, unflatten } from "../../helpers/flatten.qwik.mjs";
 import { normalizeSearchParams } from "../../helpers/search/search.qwik.mjs";
 import { DEFAULT_API_VERSION } from "../../types/api-version.qwik.mjs";
 import { getBuilderSearchParamsFromWindow } from "../get-builder-search-params/index.qwik.mjs";
+import { isBrowser } from "../is-browser.qwik.mjs";
 const isPositiveNumber = (thing) => typeof thing === "number" && !isNaN(thing) && thing >= 0;
 const generateContentUrl = (options) => {
   const { limit = 30, userAttributes, query, model, apiKey, enrich, locale, apiVersion = DEFAULT_API_VERSION, fields, omit, offset, cacheSeconds, staleCacheSeconds, sort, includeUnpublished, apiHost } = options;
@@ -19,7 +20,7 @@ const generateContentUrl = (options) => {
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
   const finalLocale = locale || (userAttributes == null ? void 0 : userAttributes.locale);
-  let finalUserAttributes = userAttributes;
+  let finalUserAttributes = userAttributes || {};
   if (finalLocale) {
     url.searchParams.set("locale", finalLocale);
     finalUserAttributes = {
@@ -51,10 +52,14 @@ const generateContentUrl = (options) => {
     ...getBuilderSearchParamsFromWindow(),
     ...normalizeSearchParams(options.options || {})
   };
+  finalUserAttributes = {
+    ...finalUserAttributes,
+    ...getUserAttributesAsJSON(queryOptions)
+  };
   const flattened = flatten(queryOptions);
   for (const key in flattened)
     url.searchParams.set(key, String(flattened[key]));
-  if (finalUserAttributes)
+  if (Object.keys(finalUserAttributes).length > 0)
     url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -65,6 +70,25 @@ const generateContentUrl = (options) => {
   }
   return url;
 };
+const getUserAttributesFromQueryOptions = (queryOptions) => {
+  const newUserAttributes = {};
+  for (const key in queryOptions)
+    if (key.startsWith("userAttributes.")) {
+      newUserAttributes[key] = queryOptions[key];
+      delete queryOptions[key];
+    }
+  return newUserAttributes;
+};
+const getUserAttributesAsJSON = (queryOptions) => {
+  if (isBrowser() && queryOptions["preview"] === "BUILDER_STUDIO") {
+    queryOptions["userAttributes.urlPath"] = window.location.pathname;
+    queryOptions["userAttributes.host"] = window.location.host;
+    const queryOptionsForUserAttributes = getUserAttributesFromQueryOptions(queryOptions);
+    const { userAttributes } = unflatten(queryOptionsForUserAttributes);
+    return userAttributes;
+  }
+  return {};
+};
 export {
   generateContentUrl
 };

package/lib/node/functions/get-processed-block.qwik.cjs

@@ -72,19 +72,16 @@ const evaluateBindings = ({ block, context, localState, rootState, rootSetState
   }
   return copied;
 };
-function getProcessedBlock({ block, context, shouldEvaluateBindings, localState, rootState, rootSetState }) {
+function getProcessedBlock({ block, context, localState, rootState, rootSetState }) {
   let transformedBlock = extractLocalizedValues.resolveLocalizedValues(block, rootState.locale);
   transformedBlock = transformBlock.transformBlock(transformedBlock);
-  if (shouldEvaluateBindings)
-    return evaluateBindings({
-      block: transformedBlock,
-      localState,
-      rootState,
-      rootSetState,
-      context
-    });
-  else
-    return transformedBlock;
+  return evaluateBindings({
+    block: transformedBlock,
+    localState,
+    rootState,
+    rootSetState,
+    context
+  });
 }
 exports.deepCloneWithConditions = deepCloneWithConditions;
 exports.getProcessedBlock = getProcessedBlock;

package/lib/node/functions/get-processed-block.qwik.mjs

@@ -70,19 +70,16 @@ const evaluateBindings = ({ block, context, localState, rootState, rootSetState
   }
   return copied;
 };
-function getProcessedBlock({ block, context, shouldEvaluateBindings, localState, rootState, rootSetState }) {
+function getProcessedBlock({ block, context, localState, rootState, rootSetState }) {
   let transformedBlock = resolveLocalizedValues(block, rootState.locale);
   transformedBlock = transformBlock(transformedBlock);
-  if (shouldEvaluateBindings)
-    return evaluateBindings({
-      block: transformedBlock,
-      localState,
-      rootState,
-      rootSetState,
-      context
-    });
-  else
-    return transformedBlock;
+  return evaluateBindings({
+    block: transformedBlock,
+    localState,
+    rootState,
+    rootSetState,
+    context
+  });
 }
 export {
   deepCloneWithConditions,

package/lib/node/helpers/flatten.qwik.cjs

@@ -32,5 +32,23 @@ function flattenMongoQuery(obj, _current, _res = {}) {
   }
   return _res;
 }
+function unflatten(obj) {
+  const result = {};
+  for (const key in obj) {
+    const parts = key.split(".");
+    let current = result;
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
+      if (i === parts.length - 1)
+        current[part] = obj[key];
+      else {
+        current[part] = current[part] || {};
+        current = current[part];
+      }
+    }
+  }
+  return result;
+}
 exports.flatten = flatten;
 exports.flattenMongoQuery = flattenMongoQuery;
+exports.unflatten = unflatten;

package/lib/node/helpers/flatten.qwik.mjs

@@ -30,7 +30,25 @@ function flattenMongoQuery(obj, _current, _res = {}) {
   }
   return _res;
 }
+function unflatten(obj) {
+  const result = {};
+  for (const key in obj) {
+    const parts = key.split(".");
+    let current = result;
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
+      if (i === parts.length - 1)
+        current[part] = obj[key];
+      else {
+        current[part] = current[part] || {};
+        current = current[part];
+      }
+    }
+  }
+  return result;
+}
 export {
   flatten,
-  flattenMongoQuery
+  flattenMongoQuery,
+  unflatten
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-qwik",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "homepage": "https://github.com/BuilderIO/builder/tree/main/packages/sdks/output/qwik",
   "repository": {
     "type": "git",

package/types/src/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.17.1";
+export declare const SDK_VERSION = "0.17.2";

package/types/src/functions/get-block-component-options.d.ts

@@ -1,2 +1,3 @@
+import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
-export declare function getBlockComponentOptions(block: BuilderBlock): any;
+export declare function getBlockComponentOptions(block: BuilderBlock, context: Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>): any;

package/types/src/functions/get-processed-block.d.ts

@@ -1,11 +1,6 @@
 import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
 export declare function deepCloneWithConditions<T = any>(obj: T): T;
-export declare function getProcessedBlock({ block, context, shouldEvaluateBindings, localState, rootState, rootSetState }: {
+export declare function getProcessedBlock({ block, context, localState, rootState, rootSetState }: {
     block: BuilderBlock;
-    /**
-     * In some cases, we want to avoid evaluating bindings and only want framework-specific block transformation. It is
-     * also sometimes too early to consider bindings, e.g. when we might be looking at a repeated block.
-     */
-    shouldEvaluateBindings: boolean;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>): BuilderBlock;

package/types/src/helpers/flatten.d.ts

@@ -14,3 +14,9 @@ export declare function flatten<T extends Record<string, any>>(object: T, path?:
 export declare function flattenMongoQuery(obj: any, _current?: any, _res?: any): {
     [key: string]: string;
 };
+/**
+ * Unflatten a flat object with dot-separated keys back into a nested object.
+ *
+ * { 'foo.bar': 'baz' } -> { foo: { bar: 'baz' }}
+ */
+export declare function unflatten(obj: any): any;

package/types/src/server-index.d.ts

@@ -15,7 +15,7 @@ export type { ContentVariantsPrps as ContentProps } from './components/content-v
 /**
  * General Builder types
  */
-export type { RegisteredComponent } from './context/types';
+export type { BuilderContextInterface, RegisteredComponent, RegisteredComponents } from './context/types';
 export type { BuilderBlock } from './types/builder-block';
 export type { BuilderContent } from './types/builder-content';
 export type { ComponentInfo } from './types/components';