Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: move embed template into ai (#5148)

Bogdan Chadkin395a6b9e72dc
diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
index a8c311c0ef..d91ee8c188 100644
--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts
+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
@@ -4,6 +4,7 @@ import {
operations,
handleAiRequest,
commandDetect,
+ WsEmbedTemplate,
} from "@webstudio-is/ai";
import { createRegularStyleSheet } from "@webstudio-is/css-engine";
import {
@@ -13,7 +14,6 @@ import {
componentAttribute,
} from "@webstudio-is/react-sdk";
import {
- type WsEmbedTemplate,
Instance,
createScope,
findTreeInstanceIds,
diff --git a/apps/builder/app/builder/features/ai/apply-operations.ts b/apps/builder/app/builder/features/ai/apply-operations.ts
index 7230694891..269b709d32 100644
--- a/apps/builder/app/builder/features/ai/apply-operations.ts
+++ b/apps/builder/app/builder/features/ai/apply-operations.ts
@@ -5,7 +5,6 @@ import {
isComponentDetachable,
type StyleSource,
} from "@webstudio-is/sdk";
-import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
import type { copywriter, operations } from "@webstudio-is/ai";
import { serverSyncStore } from "~/shared/sync";
import { isBaseBreakpoint } from "~/shared/breakpoints";
@@ -29,6 +28,7 @@ import {
import type { InstanceSelector } from "~/shared/tree-utils";
import { $selectedInstance, getInstancePath } from "~/shared/awareness";
import { isRichTextTree } from "~/shared/content-model";
+import { generateDataFromEmbedTemplate } from "./embed-template";
export const applyOperations = (operations: operations.WsOperations) => {
for (const operation of operations) {
diff --git a/packages/react-sdk/src/embed-template.test.tsx b/apps/builder/app/builder/features/ai/embed-template.test.tsx
similarity index 99%
rename from packages/react-sdk/src/embed-template.test.tsx
rename to apps/builder/app/builder/features/ai/embed-template.test.tsx
index 94a0336f53..01e70259ad 100644
--- a/packages/react-sdk/src/embed-template.test.tsx
+++ b/apps/builder/app/builder/features/ai/embed-template.test.tsx
@@ -1,6 +1,6 @@
import { expect, test } from "vitest";
+import { showAttribute } from "@webstudio-is/react-sdk";
import { generateDataFromEmbedTemplate } from "./embed-template";
-import { showAttribute } from "./props";
const expectString = expect.any(String);
diff --git a/packages/react-sdk/src/embed-template.ts b/apps/builder/app/builder/features/ai/embed-template.ts
similarity index 98%
rename from packages/react-sdk/src/embed-template.ts
rename to apps/builder/app/builder/features/ai/embed-template.ts
index cfee38e62c..711689e8bb 100644
--- a/packages/react-sdk/src/embed-template.ts
+++ b/apps/builder/app/builder/features/ai/embed-template.ts
@@ -8,14 +8,13 @@ import type {
Breakpoint,
DataSource,
WebstudioFragment,
- EmbedTemplateVariable,
- WsEmbedTemplate,
WsComponentMeta,
} from "@webstudio-is/sdk";
import {
encodeDataSourceVariable,
transpileExpression,
} from "@webstudio-is/sdk";
+import type { EmbedTemplateVariable, WsEmbedTemplate } from "@webstudio-is/ai";
const getVariablValue = (
value: EmbedTemplateVariable["initialValue"]
diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
index 2c43a233a6..ed7918f675 100644
--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
@@ -41,7 +41,7 @@ const astTypeComponentMap: Record<string, Instance["component"]> = {
thematicBreak: "Separator",
};
-type Options = { generateId?: typeof nanoid };
+type Options = { generateId?: typeof nanoid<string> };
type Root = ReturnType<typeof fromMarkdown>;
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 7e1afe91fe..8273550794 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -98,7 +98,7 @@
"micromark": "^4.0.2",
"micromark-extension-gfm": "^3.0.0",
"nanoevents": "^9.1.0",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"nanostores": "^0.11.3",
"picocolors": "^1.1.1",
"pretty-bytes": "^6.1.1",
diff --git a/packages/ai/src/chains/operations/edit-styles.ts b/packages/ai/src/chains/operations/edit-styles.ts
index bfff682454..5fc536da48 100644
--- a/packages/ai/src/chains/operations/edit-styles.ts
+++ b/packages/ai/src/chains/operations/edit-styles.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-import { EmbedTemplateStyleDecl } from "@webstudio-is/sdk";
import { idAttribute } from "@webstudio-is/react-sdk";
+import { EmbedTemplateStyleDecl } from "@webstudio-is/jsx-utils";
export const name = "edit-styles";
diff --git a/packages/ai/src/chains/operations/generate-insert-template.ts b/packages/ai/src/chains/operations/generate-insert-template.ts
index 4466bd7fb8..293c31a362 100644
--- a/packages/ai/src/chains/operations/generate-insert-template.ts
+++ b/packages/ai/src/chains/operations/generate-insert-template.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-import { WsEmbedTemplate } from "@webstudio-is/sdk";
import { idAttribute } from "@webstudio-is/react-sdk";
+import { WsEmbedTemplate } from "@webstudio-is/jsx-utils";
// Currently this operation is used is a separate LLM call after the main one has returned an insert-instance operation. This is to produce better results.
// Effectively the aiOperation from this module is not used. The separate chain will call the LLM and we use the resulting completion to construct an aiOperation by hand
diff --git a/packages/ai/src/chains/template-generator/chain.server.ts b/packages/ai/src/chains/template-generator/chain.server.ts
index 7c94a2f47a..8cc0bd10d8 100644
--- a/packages/ai/src/chains/template-generator/chain.server.ts
+++ b/packages/ai/src/chains/template-generator/chain.server.ts
@@ -1,8 +1,8 @@
+import type { WsEmbedTemplate } from "@webstudio-is/jsx-utils";
import type { Model as BaseModel, ModelMessage, Chain } from "../../types";
import { formatPrompt } from "../../utils/format-prompt";
import { prompt as promptSystemTemplate } from "./__generated__/template-generator.system.prompt";
import { prompt as promptUserTemplate } from "./__generated__/template-generator.user.prompt";
-import { WsEmbedTemplate } from "@webstudio-is/sdk";
import {
jsxToTemplate,
postProcessTemplate,
diff --git a/packages/ai/src/chains/template-generator/schema.ts b/packages/ai/src/chains/template-generator/schema.ts
index 4b740b9460..8d6acd54ee 100644
--- a/packages/ai/src/chains/template-generator/schema.ts
+++ b/packages/ai/src/chains/template-generator/schema.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { WsEmbedTemplate } from "@webstudio-is/sdk";
+import { WsEmbedTemplate } from "@webstudio-is/jsx-utils";
export const name = "template-generator";
diff --git a/packages/ai/src/image.ts b/packages/ai/src/image.ts
index 12236dab65..44e0b0a5ea 100644
--- a/packages/ai/src/image.ts
+++ b/packages/ai/src/image.ts
@@ -2,7 +2,7 @@ import type {
EmbedTemplateInstance,
EmbedTemplateProp,
WsEmbedTemplate,
-} from "@webstudio-is/sdk";
+} from "@webstudio-is/jsx-utils";
const isRemoteImageGeneratedByAi = (url: string) => {
// wsai search param is added when image is queried by ai
diff --git a/packages/ai/src/index.ts b/packages/ai/src/index.ts
index 3105f5f932..7db5334fc1 100644
--- a/packages/ai/src/index.ts
+++ b/packages/ai/src/index.ts
@@ -13,3 +13,8 @@ export * from "./utils/remix-streaming-text-response";
export * from "./types";
export * from "./image";
+export {
+ WsEmbedTemplate,
+ EmbedTemplateProp,
+ EmbedTemplateVariable,
+} from "@webstudio-is/jsx-utils";
diff --git a/packages/ai/src/utils/jsx-to-template.server.ts b/packages/ai/src/utils/jsx-to-template.server.ts
index c618753171..f69539fee4 100644
--- a/packages/ai/src/utils/jsx-to-template.server.ts
+++ b/packages/ai/src/utils/jsx-to-template.server.ts
@@ -3,8 +3,8 @@ import {
jsxToWSEmbedTemplate,
tailwindToWebstudio,
traverseTemplate,
+ WsEmbedTemplate,
} from "@webstudio-is/jsx-utils";
-import { WsEmbedTemplate } from "@webstudio-is/sdk";
export const jsxToTemplate = async (jsx: string) => {
const template = await jsxToWSEmbedTemplate(jsx);
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 0a9ec40716..7e61a13b7c 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -18,7 +18,7 @@
"fontkit": "^2.0.4",
"image-meta": "^0.2.1",
"immer": "^10.1.1",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"warn-once": "^0.1.1"
},
"devDependencies": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cc0041f1e1..4c31fbf30b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -38,7 +38,7 @@
"change-case": "^5.4.4",
"deepmerge": "^4.3.1",
"env-paths": "^3.0.0",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"p-limit": "^6.2.0",
"parse5": "7.2.1",
"picocolors": "^1.1.1",
diff --git a/packages/domain/package.json b/packages/domain/package.json
index 4a8ddcff67..dcea2c064c 100644
--- a/packages/domain/package.json
+++ b/packages/domain/package.json
@@ -14,7 +14,7 @@
"@webstudio-is/project-build": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"type-fest": "^4.37.0",
"zod": "^3.24.2"
},
diff --git a/packages/jsx-utils/package.json b/packages/jsx-utils/package.json
index 0cc86031ee..1b2f23b757 100644
--- a/packages/jsx-utils/package.json
+++ b/packages/jsx-utils/package.json
@@ -28,10 +28,13 @@
"sideEffects": false,
"dependencies": {
"@webstudio-is/css-data": "workspace:*",
+ "@webstudio-is/css-engine": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
+ "@webstudio-is/react-sdk": "workspace:*",
"acorn": "^8.14.1",
"acorn-jsx": "^5.3.2",
"json5": "^2.2.3",
+ "nanoid": "^5.1.5",
"zod": "^3.24.2"
}
}
diff --git a/packages/sdk/src/schema/embed-template.ts b/packages/jsx-utils/src/embed-template.ts
similarity index 100%
rename from packages/sdk/src/schema/embed-template.ts
rename to packages/jsx-utils/src/embed-template.ts
diff --git a/packages/jsx-utils/src/heroicons/index.ts b/packages/jsx-utils/src/heroicons/index.ts
index 3665a0ef4c..93bc970c97 100644
--- a/packages/jsx-utils/src/heroicons/index.ts
+++ b/packages/jsx-utils/src/heroicons/index.ts
@@ -1,4 +1,4 @@
-import type { WsEmbedTemplate } from "@webstudio-is/sdk";
+import type { WsEmbedTemplate } from "../embed-template";
import { traverseTemplate } from "../traverse-template";
import { getIcon } from "./get-icon";
diff --git a/packages/jsx-utils/src/index.ts b/packages/jsx-utils/src/index.ts
index 44b81031c0..c9331ad2e1 100644
--- a/packages/jsx-utils/src/index.ts
+++ b/packages/jsx-utils/src/index.ts
@@ -1,3 +1,4 @@
+export * from "./embed-template";
export * from "./traverse-template";
export { jsxToWSEmbedTemplate } from "./jsx";
export { heroiconsToSvgEmbed } from "./heroicons";
diff --git a/packages/jsx-utils/src/jsx.test.ts b/packages/jsx-utils/src/jsx.test.ts
index b562c8e932..3100330cb7 100644
--- a/packages/jsx-utils/src/jsx.test.ts
+++ b/packages/jsx-utils/src/jsx.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, test } from "vitest";
-import { EmbedTemplateProp, WsEmbedTemplate } from "@webstudio-is/sdk";
import { jsxToWSEmbedTemplate } from "./jsx";
import { traverseTemplate } from "./traverse-template";
+import { EmbedTemplateProp, WsEmbedTemplate } from "./embed-template";
describe("jsx", () => {
test("valid template", async () => {
diff --git a/packages/jsx-utils/src/jsx.ts b/packages/jsx-utils/src/jsx.ts
index af65a51aae..ff0c53b21e 100644
--- a/packages/jsx-utils/src/jsx.ts
+++ b/packages/jsx-utils/src/jsx.ts
@@ -1,8 +1,8 @@
-import { WsEmbedTemplate, type EmbedTemplateProp } from "@webstudio-is/sdk";
import JSON5 from "json5";
import type { JsonObject } from "type-fest";
import type { JSXElement, JSXOpeningElement, JSXText } from "./parser";
import { parseExpression } from "./parser";
+import { EmbedTemplateProp, WsEmbedTemplate } from "./embed-template";
export const jsxToWSEmbedTemplate = async (
code: string
diff --git a/packages/jsx-utils/src/traverse-template.ts b/packages/jsx-utils/src/traverse-template.ts
index 96609aab3c..4497ecbadb 100644
--- a/packages/jsx-utils/src/traverse-template.ts
+++ b/packages/jsx-utils/src/traverse-template.ts
@@ -1,4 +1,4 @@
-import { WsEmbedTemplate } from "@webstudio-is/sdk";
+import type { WsEmbedTemplate } from "./embed-template";
type ElementType<T> = T extends (infer U)[] ? U : never;
diff --git a/packages/jsx-utils/src/tw-to-webstudio.ts b/packages/jsx-utils/src/tw-to-webstudio.ts
index abd8963c1f..d64da35ba1 100644
--- a/packages/jsx-utils/src/tw-to-webstudio.ts
+++ b/packages/jsx-utils/src/tw-to-webstudio.ts
@@ -1,9 +1,9 @@
-import type { WsEmbedTemplate } from "@webstudio-is/sdk";
import {
camelCaseProperty,
parseTailwindToWebstudio,
} from "@webstudio-is/css-data";
import { traverseTemplateAsync } from "./traverse-template";
+import type { WsEmbedTemplate } from "./embed-template";
export const tailwindToWebstudio = async (template: WsEmbedTemplate) => {
return traverseTemplateAsync(template, async (node) => {
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index c197b0e19a..b3f4cd354f 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -23,7 +23,7 @@
"license": "AGPL-3.0-or-later",
"private": true,
"dependencies": {
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"tinyexec": "^0.3.2",
"umzug": "^3.2.1"
},
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 1edf0f5c8b..99eaf6d0e6 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -25,7 +25,7 @@
"@webstudio-is/postrest": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"zod": "^3.24.2"
},
"devDependencies": {
diff --git a/packages/project/package.json b/packages/project/package.json
index 674036e9d2..429901a79f 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -13,7 +13,7 @@
"@webstudio-is/asset-uploader": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "nanoid": "^5.0.9",
+ "nanoid": "^5.1.5",
"slugify": "^1.6.6",
"type-fest": "^4.37.0",
"zod": "^3.24.2"
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index ee7d65091a..9e84d44bbd 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -36,7 +36,7 @@
"@webstudio-is/sdk": "workspace:*",
"change-case": "^5.4.4",
"html-tags": "^4.0.0",
- "nanoid": "^5.0.9"
+ "nanoid": "^5.1.5"
},
"exports": {
".": {
diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.ts
index f63d24970f..b3ace3ac91 100644
--- a/packages/react-sdk/src/index.ts
+++ b/packages/react-sdk/src/index.ts
@@ -1,6 +1,5 @@
export * from "./remix";
export * from "./components/components-utils";
-export * from "./embed-template";
export * from "./props";
export type * from "./context";
export type * from "./hook";
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index 1d25fe2ca2..418b60d841 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -11,7 +11,6 @@ export * from "./schema/styles";
export * from "./schema/deployment";
export * from "./schema/webstudio";
export * from "./schema/prop-meta";
-export * from "./schema/embed-template";
export * from "./schema/component-meta";
export * from "./core-metas";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d26907508c..c5fcd294e4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -359,8 +359,8 @@ importers:
specifier: ^9.1.0
version: 9.1.0
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
nanostores:
specifier: ^0.11.3
version: 0.11.3
@@ -1004,8 +1004,8 @@ importers:
specifier: ^10.1.1
version: 10.1.1
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
warn-once:
specifier: ^0.1.1
version: 0.1.1
@@ -1066,8 +1066,8 @@ importers:
specifier: ^3.0.0
version: 3.0.0
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
p-limit:
specifier: ^6.2.0
version: 6.2.0
@@ -1476,8 +1476,8 @@ importers:
specifier: workspace:*
version: link:../trpc-interface
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
type-fest:
specifier: ^4.37.0
version: 4.37.0
@@ -1611,6 +1611,12 @@ importers:
'@webstudio-is/css-data':
specifier: workspace:*
version: link:../css-data
+ '@webstudio-is/css-engine':
+ specifier: workspace:*
+ version: link:../css-engine
+ '@webstudio-is/react-sdk':
+ specifier: workspace:*
+ version: link:../react-sdk
'@webstudio-is/sdk':
specifier: workspace:*
version: link:../sdk
@@ -1623,6 +1629,9 @@ importers:
json5:
specifier: ^2.2.3
version: 2.2.3
+ nanoid:
+ specifier: ^5.1.5
+ version: 5.1.5
zod:
specifier: ^3.24.2
version: 3.24.2
@@ -1653,8 +1662,8 @@ importers:
packages/prisma-client:
dependencies:
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
tinyexec:
specifier: ^0.3.2
version: 0.3.2
@@ -1690,8 +1699,8 @@ importers:
specifier: workspace:*
version: link:../trpc-interface
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
slugify:
specifier: ^1.6.6
version: 1.6.6
@@ -1721,8 +1730,8 @@ importers:
specifier: workspace:*
version: link:../trpc-interface
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
zod:
specifier: ^3.24.2
version: 3.24.2
@@ -1758,8 +1767,8 @@ importers:
specifier: ^4.0.0
version: 4.0.0
nanoid:
- specifier: ^5.0.9
- version: 5.0.9
+ specifier: ^5.1.5
+ version: 5.1.5
devDependencies:
'@types/react':
specifier: ^18.2.70
@@ -7553,8 +7562,8 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
- resolution: {integrity: sha512-Aooyr6MXU6HpvvWXKoVoXwKMs/KyVakWwg7xQfv5/S/RIgJMy0Ifa45H9qqYy7pTCszrHzP21Uk4PZq2HpEM8Q==}
+ resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
engines: {node: ^18 || >=20}
hasBin: true
@@ -14178,7 +14187,7 @@ snapshots:
dependencies:
immer: 10.1.1
- nanoid: 5.0.9
+ nanoid: 5.1.5
dependencies:
@@ -15351,7 +15360,7 @@ snapshots: