@webstudio-is/react-sdk 0.131.0 → 0.133.0

package/lib/index.js

@@ -787,6 +787,7 @@ var decodeDataSourceVariable = (name) => {
 var generateExpression = ({
   expression,
   dataSources,
+  usedDataSources,
   scope
 }) => {
   return validateExpression(expression, {
@@ -798,6 +799,7 @@ var generateExpression = ({
       const depId = decodeDataSourceVariable(identifier);
       const dep = depId ? dataSources.get(depId) : void 0;
       if (dep) {
+        usedDataSources?.set(dep.id, dep);
         return scope.getName(dep.id, dep.name);
       }
       return identifier;
@@ -1763,25 +1765,33 @@ var generateResourcesLoader = ({
 };
 
 // src/page-meta-generator.ts
+import {
+  createScope
+} from "@webstudio-is/sdk";
 var generatePageMeta = ({
-  scope,
+  globalScope,
   page,
   dataSources
 }) => {
+  const localScope = createScope(["params", "resources"]);
+  const usedDataSources = /* @__PURE__ */ new Map();
   const titleExpression = generateExpression({
     expression: page.title,
     dataSources,
-    scope
+    usedDataSources,
+    scope: localScope
   });
   const descriptionExpression = generateExpression({
     expression: page.meta.description ?? "undefined",
     dataSources,
-    scope
+    usedDataSources,
+    scope: localScope
   });
   const excludePageFromSearchExpression = generateExpression({
     expression: page.meta.excludePageFromSearch ?? "undefined",
     dataSources,
-    scope
+    usedDataSources,
+    scope: localScope
   });
   const socialImageAssetIdExpression = JSON.stringify(
     page.meta.socialImageAssetId
@@ -1789,10 +1799,53 @@ var generatePageMeta = ({
   const socialImageUrlExpression = generateExpression({
     expression: page.meta.socialImageUrl ?? "undefined",
     dataSources,
-    scope
+    usedDataSources,
+    scope: localScope
+  });
+  const statusExpression = generateExpression({
+    expression: page.meta.status ?? "undefined",
+    dataSources,
+    usedDataSources,
+    scope: localScope
+  });
+  const redirectExpression = generateExpression({
+    expression: page.meta.redirect ?? "undefined",
+    dataSources,
+    usedDataSources,
+    scope: localScope
   });
+  let customExpression = "";
+  customExpression += `[
+`;
+  for (const customMeta of page.meta.custom ?? []) {
+    if (customMeta.property.trim().length === 0) {
+      continue;
+    }
+    const propertyExpression = JSON.stringify(customMeta.property);
+    const contentExpression = generateExpression({
+      expression: customMeta.content,
+      dataSources,
+      usedDataSources,
+      scope: localScope
+    });
+    customExpression += `      {
+`;
+    customExpression += `        property: ${propertyExpression},
+`;
+    customExpression += `        content: ${contentExpression},
+`;
+    customExpression += `      },
+`;
+  }
+  customExpression += `    ]`;
   let generated = "";
-  generated += `export const getPageMeta = ({}: {
+  generated += `export const getPageMeta = ({
+`;
+  generated += `  params,
+`;
+  generated += `  resources,
+`;
+  generated += `}: {
 `;
   generated += `  params: Record<string, undefined | string>;
 `;
@@ -1800,6 +1853,33 @@ var generatePageMeta = ({
 `;
   generated += `}): PageMeta => {
 `;
+  for (const dataSource of usedDataSources.values()) {
+    if (dataSource.type === "variable") {
+      const valueName = localScope.getName(dataSource.id, dataSource.name);
+      const initialValueString = JSON.stringify(dataSource.value.value);
+      generated += `  let ${valueName} = ${initialValueString}
+`;
+      continue;
+    }
+    if (dataSource.type === "parameter") {
+      if (dataSource.id === page.pathVariableId) {
+        const valueName = localScope.getName(dataSource.id, dataSource.name);
+        generated += `  let ${valueName} = params
+`;
+      }
+      continue;
+    }
+    if (dataSource.type === "resource") {
+      const valueName = localScope.getName(dataSource.id, dataSource.name);
+      const resourceName = globalScope.getName(
+        dataSource.resourceId,
+        dataSource.name
+      );
+      generated += `  let ${valueName} = resources.${resourceName}
+`;
+      continue;
+    }
+  }
   generated += `  return {
 `;
   generated += `    title: ${titleExpression},
@@ -1812,30 +1892,11 @@ var generatePageMeta = ({
 `;
   generated += `    socialImageUrl: ${socialImageUrlExpression},
 `;
-  generated += `    custom: [
+  generated += `    status: ${statusExpression},
 `;
-  if (page.meta.custom) {
-    for (const customMeta of page.meta.custom) {
-      if (customMeta.property.trim().length === 0) {
-        continue;
-      }
-      const propertyExpression = JSON.stringify(customMeta.property);
-      const contentExpression = generateExpression({
-        scope,
-        dataSources,
-        expression: customMeta.content
-      });
-      generated += `      {
+  generated += `    redirect: ${redirectExpression},
 `;
-      generated += `        property: ${propertyExpression},
-`;
-      generated += `        content: ${contentExpression},
-`;
-      generated += `      },
-`;
-    }
-  }
-  generated += `    ],
+  generated += `    custom: ${customExpression},
 `;
   generated += `  };
 `;

package/lib/types/expression.d.ts

@@ -14,7 +14,7 @@ export declare const validateExpression: (code: string, options?: {
 }) => string;
 export declare const encodeDataSourceVariable: (id: string) => string;
 export declare const decodeDataSourceVariable: (name: string) => string | undefined;
-export declare const generateExpression: ({ expression, dataSources, scope, }: {
+export declare const generateExpression: ({ expression, dataSources, usedDataSources, scope, }: {
     expression: string;
     dataSources: Map<string, {
         value: {
@@ -49,6 +49,39 @@ export declare const generateExpression: ({ expression, dataSources, scope, }: {
         resourceId: string;
         scopeInstanceId?: string | undefined;
     }>;
+    usedDataSources?: Map<string, {
+        value: {
+            value: number;
+            type: "number";
+        } | {
+            value: string;
+            type: "string";
+        } | {
+            value: boolean;
+            type: "boolean";
+        } | {
+            value: string[];
+            type: "string[]";
+        } | {
+            type: "json";
+            value?: unknown;
+        };
+        type: "variable";
+        name: string;
+        id: string;
+        scopeInstanceId?: string | undefined;
+    } | {
+        type: "parameter";
+        name: string;
+        id: string;
+        scopeInstanceId?: string | undefined;
+    } | {
+        type: "resource";
+        name: string;
+        id: string;
+        resourceId: string;
+        scopeInstanceId?: string | undefined;
+    }> | undefined;
     scope: Scope;
 }) => string;
 export declare const executeExpression: (expression: undefined | string) => any;

package/lib/types/page-meta-generator.d.ts

@@ -1,17 +1,19 @@
-import type { Asset, DataSources, Page, Scope } from "@webstudio-is/sdk";
+import { type Asset, type DataSources, type Page, type Scope } from "@webstudio-is/sdk";
 export type PageMeta = {
     title: string;
     description?: string;
     excludePageFromSearch?: boolean;
     socialImageAssetId?: Asset["id"];
     socialImageUrl?: string;
+    status?: number;
+    redirect?: string;
     custom: Array<{
         property: string;
         content: string;
     }>;
 };
-export declare const generatePageMeta: ({ scope, page, dataSources, }: {
-    scope: Scope;
+export declare const generatePageMeta: ({ globalScope, page, dataSources, }: {
+    globalScope: Scope;
     page: Page;
     dataSources: Map<string, {
         value: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/react-sdk",
-  "version": "0.131.0",
+  "version": "0.133.0",
   "description": "Webstudio JavaScript / TypeScript API",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -33,11 +33,11 @@
     "jsep": "^1.3.8",
     "nanoid": "^5.0.1",
     "title-case": "^4.1.0",
-    "@webstudio-is/icons": "^0.131.0",
-    "@webstudio-is/fonts": "0.131.0",
-    "@webstudio-is/sdk": "0.131.0",
-    "@webstudio-is/image": "0.131.0",
-    "@webstudio-is/css-engine": "0.131.0"
+    "@webstudio-is/css-engine": "0.133.0",
+    "@webstudio-is/fonts": "0.133.0",
+    "@webstudio-is/icons": "^0.133.0",
+    "@webstudio-is/image": "0.133.0",
+    "@webstudio-is/sdk": "0.133.0"
   },
   "exports": {
     ".": {