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: rename instances slice to webstudio fragment (#2925)

Bogdan Chadkin3863abec2a2d
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
index 331673c2b5..80a221f082 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
@@ -21,8 +21,8 @@ import {
import { removeByMutable } from "~/shared/array-utils";
import {
deleteInstanceMutable,
- getInstancesSlice,
- insertInstancesSliceCopy,
+ extractWebstudioFragment,
+ insertWebstudioFragmentCopy,
updateWebstudioData,
} from "~/shared/instance-utils";
import {
@@ -377,11 +377,11 @@ export const duplicatePage = (pageId: Page["id"]) => {
page.name.match(/^(?<name>.+) \((?<copyNumber>\d+)\)$/)?.groups ?? {};
const newName = `${name} (${Number(copyNumber ?? "0") + 1})`;
- const slice = getInstancesSlice(page.rootInstanceId);
+ const fragment = extractWebstudioFragment(page.rootInstanceId);
updateWebstudioData((data) => {
- const { newInstanceIds, newDataSourceIds } = insertInstancesSliceCopy({
+ const { newInstanceIds, newDataSourceIds } = insertWebstudioFragmentCopy({
data,
- slice,
+ fragment,
availableDataSources: new Set(),
});
const newRootInstanceId = newInstanceIds.get(page.rootInstanceId);
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
index 9e78347fd6..04c0b031a6 100644
--- a/apps/builder/app/builder/shared/commands.ts
+++ b/apps/builder/app/builder/shared/commands.ts
@@ -13,8 +13,8 @@ import {
import {
deleteInstanceMutable,
findAvailableDataSources,
- getInstancesSlice,
- insertInstancesSliceCopy,
+ extractWebstudioFragment,
+ insertWebstudioFragmentCopy,
isInstanceDetachable,
updateWebstudioData,
} from "~/shared/instance-utils";
@@ -185,11 +185,11 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({
// so clipboard always have at least two level instance selector
const [targetInstanceId, parentInstanceId] = instanceSelector;
const parentInstanceSelector = instanceSelector.slice(1);
- const slice = getInstancesSlice(targetInstanceId);
+ const fragment = extractWebstudioFragment(targetInstanceId);
updateWebstudioData((data) => {
- const { newInstanceIds } = insertInstancesSliceCopy({
+ const { newInstanceIds } = insertWebstudioFragmentCopy({
data,
- slice,
+ fragment,
availableDataSources: findAvailableDataSources(
data.dataSources,
data.instances,
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 7a24bdf9d5..223986f722 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -25,8 +25,8 @@ import {
deleteInstanceMutable,
findAvailableDataSources,
findClosestDroppableTarget,
- getInstancesSlice,
- insertInstancesSliceCopy,
+ extractWebstudioFragment,
+ insertWebstudioFragmentCopy,
isInstanceDetachable,
updateWebstudioData,
} from "../instance-utils";
@@ -58,7 +58,7 @@ const getTreeData = (targetInstanceSelector: InstanceSelector) => {
return {
instanceSelector: targetInstanceSelector,
- ...getInstancesSlice(targetInstanceId),
+ ...extractWebstudioFragment(targetInstanceId),
};
};
@@ -190,9 +190,9 @@ export const onPaste = (clipboardData: string): boolean => {
}
updateWebstudioData((data) => {
- const { newInstanceIds } = insertInstancesSliceCopy({
+ const { newInstanceIds } = insertWebstudioFragmentCopy({
data,
- slice: fragment,
+ fragment,
availableDataSources: findAvailableDataSources(
data.dataSources,
data.instances,
diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.ts
index 0250d09ec8..f4f88f5154 100644
--- a/apps/builder/app/shared/instance-utils.test.ts
+++ b/apps/builder/app/shared/instance-utils.test.ts
@@ -29,8 +29,8 @@ import {
insertTemplateData,
type InsertConstraints,
deleteInstanceMutable,
- getInstancesSlice,
- insertInstancesSliceCopy,
+ extractWebstudioFragment,
+ insertWebstudioFragmentCopy,
reparentInstance,
} from "./instance-utils";
import {
@@ -866,7 +866,7 @@ describe("delete instance", () => {
});
});
-describe("get instances slice", () => {
+describe("extract webstudio fragment", () => {
test("collect the instance by id and all its descendants including portal instances", () => {
// body
// bodyChild1
@@ -885,7 +885,7 @@ describe("get instances slice", () => {
createInstance("bodyChild2", "Box", []),
])
);
- const { instances } = getInstancesSlice("bodyChild1");
+ const { instances } = extractWebstudioFragment("bodyChild1");
expect(instances).toEqual([
createInstance("bodyChild1", "Box", [{ type: "id", value: "slot" }]),
@@ -894,7 +894,7 @@ describe("get instances slice", () => {
]);
});
- test("collect all styles and breakpoints bound to instances slice", () => {
+ test("collect all styles and breakpoints bound to fragment instances", () => {
// body
// box1
// box2
@@ -937,7 +937,7 @@ describe("get instances slice", () => {
])
);
const { styleSources, styleSourceSelections, styles, breakpoints } =
- getInstancesSlice("box1");
+ extractWebstudioFragment("box1");
// exclude localBody and token1 bound to body
expect(styleSources).toEqual([
@@ -957,7 +957,7 @@ describe("get instances slice", () => {
expect(breakpoints).toEqual([{ id: "base", label: "base" }]);
});
- test("collect all props bound to instances slice", () => {
+ test("collect all props bound to fragment instances", () => {
// body
// box1
// box2
@@ -975,7 +975,7 @@ describe("get instances slice", () => {
createProp("box2", "box2Prop", "data-box2"),
])
);
- const { props } = getInstancesSlice("box1");
+ const { props } = extractWebstudioFragment("box1");
expect(props).toEqual([
createProp("box1", "box1Prop", "data-box1"),
@@ -983,7 +983,7 @@ describe("get instances slice", () => {
]);
});
- test("collect assets from props and styles withiin instances slice", () => {
+ test("collect assets from props and styles withiin fragment instances", () => {
// body
// box1
// box2
@@ -1061,7 +1061,7 @@ describe("get instances slice", () => {
createFontAsset("asset6", "font2"),
])
);
- const { assets } = getInstancesSlice("box1");
+ const { assets } = extractWebstudioFragment("box1");
expect(assets).toEqual([
createImageAsset("asset2"),
@@ -1124,7 +1124,7 @@ describe("get instances slice", () => {
},
])
);
- const { props, dataSources } = getInstancesSlice("box2");
+ const { props, dataSources } = extractWebstudioFragment("box2");
expect(dataSources).toEqual([
{
@@ -1219,7 +1219,7 @@ describe("get instances slice", () => {
},
])
);
- const { props, dataSources } = getInstancesSlice("box2");
+ const { props, dataSources } = extractWebstudioFragment("box2");
expect(dataSources).toEqual([
{
@@ -1306,7 +1306,7 @@ describe("get instances slice", () => {
},
])
);
- const { dataSources } = getInstancesSlice("box");
+ const { dataSources } = extractWebstudioFragment("box");
expect(dataSources).toEqual([
{
@@ -1390,7 +1390,7 @@ describe("get instances slice", () => {
},
])
);
- const { resources, dataSources } = getInstancesSlice("box1");
+ const { resources, dataSources } = extractWebstudioFragment("box1");
expect(resources).toEqual([
{
@@ -1491,7 +1491,7 @@ describe("get instances slice", () => {
},
])
);
- const { resources, dataSources } = getInstancesSlice("box");
+ const { resources, dataSources } = extractWebstudioFragment("box");
expect(resources).toEqual([
{
@@ -1541,8 +1541,8 @@ describe("get instances slice", () => {
});
});
-describe("insert instances slice copy", () => {
- const emptySlice = {
+describe("insert webstudio fragment copy", () => {
+ const emptyFragment = {
children: [],
instances: [
{
@@ -1577,10 +1577,10 @@ describe("insert instances slice copy", () => {
test("insert assets with same ids if missing", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
assets: [createImageAsset("asset1", "name", "another_project")],
},
availableDataSources: new Set(),
@@ -1592,10 +1592,10 @@ describe("insert instances slice copy", () => {
data.assets = toMap([
createImageAsset("asset1", "changed_name", "current_project"),
]);
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
assets: [
createImageAsset("asset1", "name", "another_project"),
createImageAsset("asset2", "another_name", "another_project"),
@@ -1617,10 +1617,10 @@ describe("insert instances slice copy", () => {
{ id: "existing_small", label: "small", minWidth: 768 },
]);
const data = getWebstudioData({ breakpoints });
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
breakpoints: [
{ id: "new_base", label: "Base" },
{
@@ -1650,10 +1650,10 @@ describe("insert instances slice copy", () => {
{ id: "token1", type: "token", name: "oldLabel" },
]);
const data = getWebstudioData({ breakpoints, styleSources });
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
breakpoints: [{ id: "new_base", label: "Base" }],
styleSources: [
{ id: "token1", type: "token", name: "newLabel" },
@@ -1692,10 +1692,10 @@ describe("insert instances slice copy", () => {
test("insert instances", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
instances: [
{
type: "instance",
@@ -1738,10 +1738,10 @@ describe("insert instances slice copy", () => {
];
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
instances: instancesWithPortals,
},
availableDataSources: new Set(),
@@ -1777,10 +1777,10 @@ describe("insert instances slice copy", () => {
component: "Fragment",
children: [],
});
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
instances: instancesWithPortals,
},
availableDataSources: new Set(),
@@ -1810,10 +1810,10 @@ describe("insert instances slice copy", () => {
test("insert props with new ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
props: [
{
id: "prop1",
@@ -1839,10 +1839,10 @@ describe("insert instances slice copy", () => {
test("insert props from portals with old ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
@@ -1884,10 +1884,10 @@ describe("insert instances slice copy", () => {
test("insert data sources with new ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
dataSources: [
{
id: "variableId",
@@ -1984,10 +1984,10 @@ describe("insert instances slice copy", () => {
test("inline data sources when not available in scope", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
dataSources: [
{
id: "outsideVariableId",
@@ -2080,10 +2080,10 @@ describe("insert instances slice copy", () => {
test("insert data sources from portals with old ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
@@ -2191,10 +2191,10 @@ describe("insert instances slice copy", () => {
test("inline data sources from portals when not available in scope", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
@@ -2292,10 +2292,10 @@ describe("insert instances slice copy", () => {
test("insert local styles with new ids and use merged breakpoint ids", () => {
const breakpoints = toMap<Breakpoint>([{ id: "base", label: "base" }]);
const data = getWebstudioData({ breakpoints });
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
instances: [
{
type: "instance",
@@ -2349,10 +2349,10 @@ describe("insert instances slice copy", () => {
test("insert local styles from portal and use merged breakpoint ids", () => {
const breakpoints = toMap<Breakpoint>([{ id: "base", label: "base" }]);
const data = getWebstudioData({ breakpoints });
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
@@ -2410,10 +2410,10 @@ describe("insert instances slice copy", () => {
test("insert resources with new ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
resources: [
{
id: "resourceId",
@@ -2481,10 +2481,10 @@ describe("insert instances slice copy", () => {
test("inline data sources into resources when not available in the scope", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
resources: [
{
id: "resourceId",
@@ -2531,10 +2531,10 @@ describe("insert instances slice copy", () => {
test("inline resource variables when not available in scope", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
resources: [
{
id: "resourceId",
@@ -2579,10 +2579,10 @@ describe("insert instances slice copy", () => {
test("insert resources from portals with old ids", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
@@ -2634,10 +2634,10 @@ describe("insert instances slice copy", () => {
test("inline data sources into resources from portals when not available in scope", () => {
const data = getWebstudioData();
- insertInstancesSliceCopy({
+ insertWebstudioFragmentCopy({
data,
- slice: {
- ...emptySlice,
+ fragment: {
+ ...emptyFragment,
// portal
// fragment
instances: [
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index dc2d04594c..a151a7e1f9 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -450,7 +450,7 @@ export const reparentInstance = (
dropTarget: DroppableTarget
) => {
const [rootInstanceId] = sourceInstanceSelector;
- const fragment = getInstancesSlice(rootInstanceId);
+ const fragment = extractWebstudioFragment(rootInstanceId);
updateWebstudioData((data) => {
const reparentDropTarget = getReparentDropTargetMutable(
data.instances,
@@ -463,9 +463,9 @@ export const reparentInstance = (
return;
}
deleteInstanceMutable(data, sourceInstanceSelector);
- const { newInstanceIds } = insertInstancesSliceCopy({
+ const { newInstanceIds } = insertWebstudioFragmentCopy({
data,
- slice: fragment,
+ fragment,
availableDataSources: findAvailableDataSources(
data.dataSources,
data.instances,
@@ -647,7 +647,7 @@ const collectUsedDataSources = (
}
};
-export const getInstancesSlice = (
+export const extractWebstudioFragment = (
rootInstanceId: string
): WebstudioFragment => {
const assets = $assets.get();
@@ -661,15 +661,15 @@ export const getInstancesSlice = (
const styles = $styles.get();
// collect the instance by id and all its descendants including portal instances
- const slicedInstanceIds = findTreeInstanceIds(instances, rootInstanceId);
- const slicedInstances: Instance[] = [];
- const slicedStyleSourceSelections: StyleSourceSelection[] = [];
- const slicedStyleSources: StyleSources = new Map();
+ const fragmentInstanceIds = findTreeInstanceIds(instances, rootInstanceId);
+ const fragmentInstances: Instance[] = [];
+ const fragmentStyleSourceSelections: StyleSourceSelection[] = [];
+ const fragmentStyleSources: StyleSources = new Map();
const usedDataSourceIds = new Set<DataSource["id"]>();
- for (const instanceId of slicedInstanceIds) {
+ for (const instanceId of fragmentInstanceIds) {
const instance = instances.get(instanceId);
if (instance) {
- slicedInstances.push(instance);
+ fragmentInstances.push(instance);
for (const child of instance.children) {
if (child.type === "expression") {
collectUsedDataSources(child.value, usedDataSourceIds);
@@ -680,37 +680,37 @@ export const getInstancesSlice = (
// collect all style sources bound to these instances
const styleSourceSelection = styleSourceSelections.get(instanceId);
if (styleSourceSelection) {
- slicedStyleSourceSelections.push(styleSourceSelection);
+ fragmentStyleSourceSelections.push(styleSourceSelection);
for (const styleSourceId of styleSourceSelection.values) {
- if (slicedStyleSources.has(styleSourceId)) {
+ if (fragmentStyleSources.has(styleSourceId)) {
continue;
}
const styleSource = styleSources.get(styleSourceId);
if (styleSource === undefined) {
continue;
}
- slicedStyleSources.set(styleSourceId, styleSource);
+ fragmentStyleSources.set(styleSourceId, styleSource);
}
}
}
- const slicedAssetIds = new Set<Asset["id"]>();
- const slicedFontFamilies = new Set<string>();
+ const fragmentAssetIds = new Set<Asset["id"]>();
+ const fragmentFontFamilies = new Set<string>();
// collect styles bound to these style sources
- const slicedStyles: StyleDecl[] = [];
- const slicedBreapoints: Breakpoints = new Map();
+ const fragmentStyles: StyleDecl[] = [];
+ const fragmentBreapoints: Breakpoints = new Map();
for (const styleDecl of styles.values()) {
- if (slicedStyleSources.has(styleDecl.styleSourceId) === false) {
+ if (fragmentStyleSources.has(styleDecl.styleSourceId) === false) {
continue;
}
- slicedStyles.push(styleDecl);
+ fragmentStyles.push(styleDecl);
// collect breakpoints
- if (slicedBreapoints.has(styleDecl.breakpointId) === false) {
+ if (fragmentBreapoints.has(styleDecl.breakpointId) === false) {
const breakpoint = breakpoints.get(styleDecl.breakpointId);
if (breakpoint) {
- slicedBreapoints.set(styleDecl.breakpointId, breakpoint);
+ fragmentBreapoints.set(styleDecl.breakpointId, breakpoint);
}
}
@@ -718,25 +718,25 @@ export const getInstancesSlice = (
traverseStyleValue(styleDecl.value, (value) => {
if (value.type === "fontFamily") {
for (const fontFamily of value.value) {
- slicedFontFamilies.add(fontFamily);
+ fragmentFontFamilies.add(fontFamily);
}
}
if (value.type === "image") {
if (value.value.type === "asset") {
- slicedAssetIds.add(value.value.value);
+ fragmentAssetIds.add(value.value.value);
}
}
});
}
// collect props bound to these instances
- const slicedProps: Props = new Map();
+ const fragmentProps: Props = new Map();
for (const prop of props.values()) {
- if (slicedInstanceIds.has(prop.instanceId) === false) {
+ if (fragmentInstanceIds.has(prop.instanceId) === false) {
continue;
}
- slicedProps.set(prop.id, prop);
+ fragmentProps.set(prop.id, prop);
if (prop.type === "expression") {
collectUsedDataSources(prop.value, usedDataSourceIds);
@@ -752,42 +752,42 @@ export const getInstancesSlice = (
// collect assets
if (prop.type === "asset") {
- slicedAssetIds.add(prop.value);
+ fragmentAssetIds.add(prop.value);
}
}
- // collect variables scoped to instances slice
+ // collect variables scoped to fragment instances
// or used by expressions or actions even outside of the tree
- // such variables can be bound to sliced root on paste
- const slicedDataSources: DataSources = new Map();
- const slicedResourceIds = new Set<Resource["id"]>();
+ // such variables can be bound to fragment root on paste
+ const fragmentDataSources: DataSources = new Map();
+ const fragmentResourceIds = new Set<Resource["id"]>();
for (const dataSource of dataSources.values()) {
if (
// check if data source itself can be copied
(dataSource.scopeInstanceId !== undefined &&
- slicedInstanceIds.has(dataSource.scopeInstanceId)) ||
+ fragmentInstanceIds.has(dataSource.scopeInstanceId)) ||
usedDataSourceIds.has(dataSource.id)
) {
- slicedDataSources.set(dataSource.id, dataSource);
+ fragmentDataSources.set(dataSource.id, dataSource);
if (dataSource.type === "resource") {
- slicedResourceIds.add(dataSource.resourceId);
+ fragmentResourceIds.add(dataSource.resourceId);
}
}
}
- // collect resources bound to all sliced data sources
+ // collect resources bound to all fragment data sources
// and then collect data sources used in these resources
// it creates some recursive behavior but since resources
// cannot depend on other resources all left data sources
// can be collected just once
- const slicedResources: Resource[] = [];
+ const fragmentResources: Resource[] = [];
const dataSourceIdsUsedInResources = new Set<DataSource["id"]>();
- for (const resourceId of slicedResourceIds) {
+ for (const resourceId of fragmentResourceIds) {
const resource = resources.get(resourceId);
if (resource === undefined) {
continue;
}
- slicedResources.push(resource);
+ fragmentResources.push(resource);
collectUsedDataSources(resource.url, dataSourceIdsUsedInResources);
for (const { value } of resource.headers) {
collectUsedDataSources(value, dataSourceIdsUsedInResources);
@@ -798,31 +798,31 @@ export const getInstancesSlice = (
}
for (const dataSource of dataSources.values()) {
if (dataSourceIdsUsedInResources.has(dataSource.id)) {
- slicedDataSources.set(dataSource.id, dataSource);
+ fragmentDataSources.set(dataSource.id, dataSource);
}
}
- const slicedAssets: Asset[] = [];
+ const fragmentAssets: Asset[] = [];
for (const asset of assets.values()) {
if (
- slicedAssetIds.has(asset.id) ||
- (asset.type === "font" && slicedFontFamilies.has(asset.meta.family))
+ fragmentAssetIds.has(asset.id) ||
+ (asset.type === "font" && fragmentFontFamilies.has(asset.meta.family))
) {
- slicedAssets.push(asset);
+ fragmentAssets.push(asset);
}
}
return {
children: [{ type: "id", value: rootInstanceId }],
- instances: slicedInstances,
- styleSourceSelections: slicedStyleSourceSelections,
- styleSources: Array.from(slicedStyleSources.values()),
- breakpoints: Array.from(slicedBreapoints.values()),
- styles: slicedStyles,
- dataSources: Array.from(slicedDataSources.values()),
- resources: slicedResources,
- props: Array.from(slicedProps.values()),
- assets: slicedAssets,
+ instances: fragmentInstances,
+ styleSourceSelections: fragmentStyleSourceSelections,
+ styleSources: Array.from(fragmentStyleSources.values()),
+ breakpoints: Array.from(fragmentBreapoints.values()),
+ styles: fragmentStyles,
+ dataSources: Array.from(fragmentDataSources.values()),
+ resources: fragmentResources,
+ props: Array.from(fragmentProps.values()),
+ assets: fragmentAssets,
};
};
@@ -902,13 +902,13 @@ const replaceDataSources = (
});
};
-export const insertInstancesSliceCopy = ({
+export const insertWebstudioFragmentCopy = ({
data,
- slice,
+ fragment,
availableDataSources,
}: {
data: WebstudioData;
- slice: WebstudioFragment;
+ fragment: WebstudioFragment;
availableDataSources: Set<DataSource["id"]>;
}) => {
const newInstanceIds = new Map<Instance["id"], Instance["id"]>();
@@ -922,10 +922,10 @@ export const insertInstancesSliceCopy = ({
return newDataIds;
}
- const sliceInstances: Instances = new Map();
+ const fragmentInstances: Instances = new Map();
const portalContentIds = new Set<Instance["id"]>();
- for (const instance of slice.instances) {
- sliceInstances.set(instance.id, instance);
+ for (const instance of fragment.instances) {
+ fragmentInstances.set(instance.id, instance);
if (instance.component === portalComponent) {
for (const child of instance.children) {
if (child.type === "id") {
@@ -935,9 +935,9 @@ export const insertInstancesSliceCopy = ({
}
}
- const sliceDataSources: DataSources = new Map();
- for (const dataSource of slice.dataSources) {
- sliceDataSources.set(dataSource.id, dataSource);
+ const fragmentDataSources: DataSources = new Map();
+ for (const dataSource of fragment.dataSources) {
+ fragmentDataSources.set(dataSource.id, dataSource);
}
const {
@@ -966,7 +966,7 @@ export const insertInstancesSliceCopy = ({
// insert assets
- for (const asset of slice.assets) {
+ for (const asset of fragment.assets) {
// asset can be already present if pasting to the same project
if (assets.has(asset.id) === false) {
// we use the same asset.id so the references are preserved
@@ -977,7 +977,7 @@ export const insertInstancesSliceCopy = ({
// merge breakpoints
const mergedBreakpointIds = new Map<Breakpoint["id"], Breakpoint["id"]>();
- for (const newBreakpoint of slice.breakpoints) {
+ for (const newBreakpoint of fragment.breakpoints) {
let matched = false;
for (const breakpoint of breakpoints.values()) {
if (equalMedia(breakpoint, newBreakpoint)) {
@@ -994,7 +994,7 @@ export const insertInstancesSliceCopy = ({
// insert tokens with their styles
const tokenStyleSourceIds = new Set<StyleSource["id"]>();
- for (const styleSource of slice.styleSources) {
+ for (const styleSource of fragment.styleSources) {
// prevent inserting styles when token is already present
if (styleSource.type === "local" || styleSources.has(styleSource.id)) {
continue;
@@ -1003,7 +1003,7 @@ export const insertInstancesSliceCopy = ({
tokenStyleSourceIds.add(styleSource.id);
styleSources.set(styleSource.id, styleSource);
}
- for (const styleDecl of slice.styles) {
+ for (const styleDecl of fragment.styles) {
if (tokenStyleSourceIds.has(styleDecl.styleSourceId)) {
const { breakpointId } = styleDecl;
const newStyleDecl: StyleDecl = {
@@ -1026,13 +1026,13 @@ export const insertInstancesSliceCopy = ({
}
const instanceIds = findTreeInstanceIdsExcludingSlotDescendants(
- sliceInstances,
+ fragmentInstances,
rootInstanceId
);
const availablePortalDataSources = new Set(availableDataSources);
const usedResourceIds = new Set<Resource["id"]>();
- for (const dataSource of slice.dataSources) {
+ for (const dataSource of fragment.dataSources) {
// insert only data sources within portal content
if (
dataSource.scopeInstanceId &&
@@ -1046,21 +1046,21 @@ export const insertInstancesSliceCopy = ({
}
}
- for (const resource of slice.resources) {
+ for (const resource of fragment.resources) {
if (usedResourceIds.has(resource.id) === false) {
continue;
}
const newUrl = inlineUnavailableDataSources({
code: resource.url,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code;
const newHeaders = resource.headers.map((header) => ({
name: header.name,
value: inlineUnavailableDataSources({
code: header.value,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code,
}));
const newBody =
@@ -1069,7 +1069,7 @@ export const insertInstancesSliceCopy = ({
: inlineUnavailableDataSources({
code: resource.body,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code;
resources.set(resource.id, {
...resource,
@@ -1079,7 +1079,7 @@ export const insertInstancesSliceCopy = ({
});
}
- for (const instance of slice.instances) {
+ for (const instance of fragment.instances) {
if (instanceIds.has(instance.id)) {
instances.set(instance.id, {
...instance,
@@ -1088,7 +1088,7 @@ export const insertInstancesSliceCopy = ({
const { code } = inlineUnavailableDataSources({
code: child.value,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
return {
type: "expression",
@@ -1101,7 +1101,7 @@ export const insertInstancesSliceCopy = ({
}
}
- for (let prop of slice.props) {
+ for (let prop of fragment.props) {
if (instanceIds.has(prop.instanceId) === false) {
continue;
}
@@ -1110,7 +1110,7 @@ export const insertInstancesSliceCopy = ({
const { code } = inlineUnavailableDataSources({
code: prop.value,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
prop = { ...prop, value: code };
}
@@ -1124,7 +1124,7 @@ export const insertInstancesSliceCopy = ({
const { code, isDiscarded } = inlineUnavailableDataSources({
code: value.code,
availableDataSources: availablePortalDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
if (isDiscarded) {
return [];
@@ -1139,7 +1139,7 @@ export const insertInstancesSliceCopy = ({
// insert local style sources with their styles
const instanceStyleSourceIds = new Set<StyleSource["id"]>();
- for (const styleSourceSelection of slice.styleSourceSelections) {
+ for (const styleSourceSelection of fragment.styleSourceSelections) {
const { instanceId } = styleSourceSelection;
if (instanceIds.has(instanceId) === false) {
continue;
@@ -1150,7 +1150,7 @@ export const insertInstancesSliceCopy = ({
}
}
const localStyleSourceIds = new Set<StyleSource["id"]>();
- for (const styleSource of slice.styleSources) {
+ for (const styleSource of fragment.styleSources) {
if (
styleSource.type === "local" &&
instanceStyleSourceIds.has(styleSource.id)
@@ -1159,7 +1159,7 @@ export const insertInstancesSliceCopy = ({
styleSources.set(styleSource.id, styleSource);
}
}
- for (const styleDecl of slice.styles) {
+ for (const styleDecl of fragment.styles) {
if (localStyleSourceIds.has(styleDecl.styleSourceId)) {
const { breakpointId } = styleDecl;
const newStyleDecl: StyleDecl = {
@@ -1181,21 +1181,21 @@ export const insertInstancesSliceCopy = ({
*/
// generate new ids only instances outside of portals
- const sliceInstanceIds = findTreeInstanceIdsExcludingSlotDescendants(
- sliceInstances,
- slice.instances[0].id
+ const fragmentInstanceIds = findTreeInstanceIdsExcludingSlotDescendants(
+ fragmentInstances,
+ fragment.instances[0].id
);
- for (const instanceId of sliceInstanceIds) {
+ for (const instanceId of fragmentInstanceIds) {
newInstanceIds.set(instanceId, nanoid());
}
const availableFragmentDataSources = new Set(availableDataSources);
const newResourceIds = new Map<Resource["id"], Resource["id"]>();
const usedResourceIds = new Set<Resource["id"]>();
- for (const dataSource of slice.dataSources) {
+ for (const dataSource of fragment.dataSources) {
const { scopeInstanceId } = dataSource;
// insert only data sources within portal content
- if (scopeInstanceId && sliceInstanceIds.has(scopeInstanceId)) {
+ if (scopeInstanceId && fragmentInstanceIds.has(scopeInstanceId)) {
availableFragmentDataSources.add(dataSource.id);
const newDataSourceId = nanoid();
newDataSourceIds.set(dataSource.id, newDataSourceId);
@@ -1219,7 +1219,7 @@ export const insertInstancesSliceCopy = ({
}
}
- for (const resource of slice.resources) {
+ for (const resource of fragment.resources) {
if (usedResourceIds.has(resource.id) === false) {
continue;
}
@@ -1229,7 +1229,7 @@ export const insertInstancesSliceCopy = ({
inlineUnavailableDataSources({
code: resource.url,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code,
newDataSourceIds
);
@@ -1239,7 +1239,7 @@ export const insertInstancesSliceCopy = ({
inlineUnavailableDataSources({
code: header.value,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code,
newDataSourceIds
),
@@ -1251,7 +1251,7 @@ export const insertInstancesSliceCopy = ({
inlineUnavailableDataSources({
code: resource.body,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
}).code,
newDataSourceIds
);
@@ -1264,8 +1264,8 @@ export const insertInstancesSliceCopy = ({
});
}
- for (const instance of slice.instances) {
- if (sliceInstanceIds.has(instance.id)) {
+ for (const instance of fragment.instances) {
+ if (fragmentInstanceIds.has(instance.id)) {
const newId = newInstanceIds.get(instance.id) ?? instance.id;
instances.set(newId, {
...instance,
@@ -1281,7 +1281,7 @@ export const insertInstancesSliceCopy = ({
const { code } = inlineUnavailableDataSources({
code: child.value,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
return {
type: "expression",
@@ -1294,8 +1294,8 @@ export const insertInstancesSliceCopy = ({
}
}
- for (let prop of slice.props) {
- if (sliceInstanceIds.has(prop.instanceId) === false) {
+ for (let prop of fragment.props) {
+ if (fragmentInstanceIds.has(prop.instanceId) === false) {
continue;
}
// inline data sources not available in scope into expressions
@@ -1303,7 +1303,7 @@ export const insertInstancesSliceCopy = ({
const { code } = inlineUnavailableDataSources({
code: prop.value,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
prop = { ...prop, value: replaceDataSources(code, newDataSourceIds) };
}
@@ -1317,7 +1317,7 @@ export const insertInstancesSliceCopy = ({
const { code, isDiscarded } = inlineUnavailableDataSources({
code: value.code,
availableDataSources: availableFragmentDataSources,
- dataSources: sliceDataSources,
+ dataSources: fragmentDataSources,
});
if (isDiscarded) {
return [];
@@ -1345,8 +1345,8 @@ export const insertInstancesSliceCopy = ({
// insert local styles with new ids
const instanceStyleSourceIds = new Set<StyleSource["id"]>();
- for (const styleSourceSelection of slice.styleSourceSelections) {
- if (sliceInstanceIds.has(styleSourceSelection.instanceId) === false) {
+ for (const styleSourceSelection of fragment.styleSourceSelections) {
+ if (fragmentInstanceIds.has(styleSourceSelection.instanceId) === false) {
continue;
}
for (const styleSourceId of styleSourceSelection.values) {
@@ -1357,7 +1357,7 @@ export const insertInstancesSliceCopy = ({
StyleSource["id"],
StyleSource["id"]
>();
- for (const styleSource of slice.styleSources) {
+ for (const styleSource of fragment.styleSources) {
if (
styleSource.type === "local" &&
instanceStyleSourceIds.has(styleSource.id)
@@ -1367,9 +1367,9 @@ export const insertInstancesSliceCopy = ({
styleSources.set(newId, { ...styleSource, id: newId });
}
}
- for (const styleSourceSelection of slice.styleSourceSelections) {
+ for (const styleSourceSelection of fragment.styleSourceSelections) {
const { instanceId, values } = styleSourceSelection;
- if (sliceInstanceIds.has(instanceId) === false) {
+ if (fragmentInstanceIds.has(instanceId) === false) {
continue;
}
const newInstanceId = newInstanceIds.get(instanceId) ?? instanceId;
@@ -1384,7 +1384,7 @@ export const insertInstancesSliceCopy = ({
instanceStyleSourceIds.add(styleSourceId);
}
}
- for (const styleDecl of slice.styles) {
+ for (const styleDecl of fragment.styles) {
const { breakpointId, styleSourceId } = styleDecl;
if (newLocalStyleSourceIds.has(styleDecl.styleSourceId)) {
const newStyleDecl: StyleDecl = {