@webstudio-is/react-sdk 0.205.0 → 0.206.0

package/lib/index.js

@@ -467,50 +467,6 @@ var namespaceMeta = (meta, namespace, components) => {
   return newMeta;
 };
 
-// src/instance-utils.ts
-var getIndexesWithinAncestors = (metas, instances, rootIds) => {
-  const ancestors = /* @__PURE__ */ new Set();
-  for (const meta of metas.values()) {
-    if (meta.indexWithinAncestor !== void 0) {
-      ancestors.add(meta.indexWithinAncestor);
-    }
-  }
-  const indexes = /* @__PURE__ */ new Map();
-  const traverseInstances = (instances2, instanceId, latestIndexes2 = /* @__PURE__ */ new Map()) => {
-    const instance = instances2.get(instanceId);
-    if (instance === void 0) {
-      return;
-    }
-    const meta = metas.get(instance.component);
-    if (meta === void 0) {
-      return;
-    }
-    if (ancestors.has(instance.component)) {
-      latestIndexes2 = new Map(latestIndexes2);
-      latestIndexes2.set(instance.component, /* @__PURE__ */ new Map());
-    }
-    if (meta.indexWithinAncestor !== void 0) {
-      const ancestorIndexes = latestIndexes2.get(meta.indexWithinAncestor);
-      if (ancestorIndexes !== void 0) {
-        let index = ancestorIndexes.get(instance.component) ?? -1;
-        index += 1;
-        ancestorIndexes.set(instance.component, index);
-        indexes.set(instance.id, index);
-      }
-    }
-    for (const child of instance.children) {
-      if (child.type === "id") {
-        traverseInstances(instances2, child.value, latestIndexes2);
-      }
-    }
-  };
-  const latestIndexes = /* @__PURE__ */ new Map();
-  for (const instanceId of rootIds) {
-    traverseInstances(instances, instanceId, latestIndexes);
-  }
-  return indexes;
-};
-
 // src/component-generator.ts
 import {
   parseComponentName,
@@ -520,7 +476,8 @@ import {
   blockComponent,
   blockTemplateComponent,
   collectionComponent,
-  descendantComponent
+  descendantComponent,
+  getIndexesWithinAncestors
 } from "@webstudio-is/sdk";
 var generateAction = ({
   scope,
@@ -818,13 +775,16 @@ var generateWebstudioComponent = ({
   instances,
   props,
   dataSources,
-  indexesWithinAncestors,
+  metas,
   classesMap
 }) => {
   const instance = instances.get(rootInstanceId);
   if (instance === void 0) {
     return "";
   }
+  const indexesWithinAncestors = getIndexesWithinAncestors(metas, instances, [
+    rootInstanceId
+  ]);
   const usedDataSources = /* @__PURE__ */ new Map();
   const generatedJsx = generateJsxElement({
     context: "expression",
@@ -909,7 +869,6 @@ export {
   generateRemixParams,
   generateRemixRoute,
   generateWebstudioComponent,
-  getIndexesWithinAncestors,
   idAttribute,
   indexAttribute,
   isAttributeNameSafe,

package/lib/types/component-generator.d.ts

@@ -1,5 +1,4 @@
-import type { Instances, Instance, Props, Scope, DataSources, Prop } from "@webstudio-is/sdk";
-import type { IndexesWithinAncestors } from "./instance-utils";
+import type { Instances, Instance, Props, Scope, DataSources, Prop, WsComponentMeta, IndexesWithinAncestors } from "@webstudio-is/sdk";
 export declare const generateJsxElement: ({ context, scope, instance, props, dataSources, usedDataSources, indexesWithinAncestors, children, classesMap, }: {
     context?: "expression" | "jsx";
     scope: Scope;
@@ -22,7 +21,7 @@ export declare const generateJsxChildren: ({ scope, children, instances, props,
     classesMap?: Map<string, Array<string>>;
     excludePlaceholders?: boolean;
 }) => string;
-export declare const generateWebstudioComponent: ({ scope, name, rootInstanceId, parameters, instances, props, dataSources, indexesWithinAncestors, classesMap, }: {
+export declare const generateWebstudioComponent: ({ scope, name, rootInstanceId, parameters, instances, props, dataSources, metas, classesMap, }: {
     scope: Scope;
     name: string;
     rootInstanceId: Instance["id"];
@@ -32,6 +31,6 @@ export declare const generateWebstudioComponent: ({ scope, name, rootInstanceId,
     instances: Instances;
     props: Props;
     dataSources: DataSources;
-    indexesWithinAncestors: IndexesWithinAncestors;
     classesMap: Map<string, Array<string>>;
+    metas: Map<Instance["component"], WsComponentMeta>;
 }) => string;

package/lib/types/hook.d.ts

@@ -1,5 +1,4 @@
-import type { Instance, Prop } from "@webstudio-is/sdk";
-import type { IndexesWithinAncestors } from "./instance-utils";
+import type { IndexesWithinAncestors, Instance, Prop } from "@webstudio-is/sdk";
 export type InstanceData = {
     id: Instance["id"];
     instanceKey: string;

package/lib/types/index.d.ts

@@ -3,6 +3,5 @@ export * from "./components/components-utils";
 export * from "./embed-template";
 export * from "./props";
 export type * from "./context";
-export { getIndexesWithinAncestors } from "./instance-utils";
 export type * from "./hook";
 export { generateWebstudioComponent, generateJsxElement, generateJsxChildren, } from "./component-generator";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/react-sdk",
-  "version": "0.205.0",
+  "version": "0.206.0",
   "description": "Webstudio JavaScript / TypeScript API",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -14,7 +14,7 @@
     "type-fest": "^4.32.0",
     "vitest": "^3.0.4",
     "zod": "^3.22.4",
-    "@webstudio-is/template": "0.205.0",
+    "@webstudio-is/template": "0.206.0",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "peerDependencies": {
@@ -26,11 +26,11 @@
     "change-case": "^5.4.4",
     "html-tags": "^4.0.0",
     "nanoid": "^5.0.9",
-    "@webstudio-is/css-engine": "0.205.0",
-    "@webstudio-is/image": "0.205.0",
-    "@webstudio-is/sdk": "0.205.0",
-    "@webstudio-is/icons": "^0.205.0",
-    "@webstudio-is/fonts": "0.205.0"
+    "@webstudio-is/css-engine": "0.206.0",
+    "@webstudio-is/fonts": "0.206.0",
+    "@webstudio-is/icons": "^0.206.0",
+    "@webstudio-is/image": "0.206.0",
+    "@webstudio-is/sdk": "0.206.0"
   },
   "exports": {
     ".": {

package/placeholder.d.ts

@@ -5,21 +5,16 @@ declare module "__CONSTANTS__" {
 }
 
 declare module "__CLIENT__" {
-  import type {
-    FontAsset,
-    ImageAsset,
-    ResourceRequest,
-    System,
-  } from "@webstudio-is/sdk";
+  import type { ResourceRequest, System } from "@webstudio-is/sdk";
 
   export const siteName: string;
 
-  export const favIconAsset: ImageAsset | undefined;
+  export const favIconAsset: string | undefined;
 
   // Font assets on current page (can be preloaded)
-  export const pageFontAssets: FontAsset[];
+  export const pageFontAssets: string[];
 
-  export const pageBackgroundImageAssets: ImageAsset[];
+  export const pageBackgroundImageAssets: string[];
 
   export const CustomCode: () => ReactNode;
 

package/lib/types/instance-utils.d.ts

@@ -1,3 +0,0 @@
-import type { Instance, Instances, WsComponentMeta } from "@webstudio-is/sdk";
-export type IndexesWithinAncestors = Map<Instance["id"], number>;
-export declare const getIndexesWithinAncestors: (metas: Map<Instance["component"], WsComponentMeta>, instances: Instances, rootIds: Instance["id"][]) => IndexesWithinAncestors;

package/lib/types/instance-utils.test.d.ts

@@ -1 +0,0 @@
-export {};