@webstudio-is/sdk 0.189.0 → 0.191.0

package/lib/index.js

@@ -168,6 +168,25 @@ var Instance = z3.object({
   children: z3.array(InstanceChild)
 });
 var Instances = z3.map(InstanceId, Instance);
+var MatcherRelation = z3.union([
+  z3.literal("ancestor"),
+  z3.literal("parent"),
+  z3.literal("self"),
+  z3.literal("child"),
+  z3.literal("descendant")
+]);
+var MatcherOperation = z3.object({
+  $eq: z3.string().optional(),
+  $neq: z3.string().optional(),
+  $in: z3.array(z3.string()).optional(),
+  $nin: z3.array(z3.string()).optional()
+});
+var Matcher = z3.object({
+  relation: MatcherRelation,
+  component: MatcherOperation.optional(),
+  tag: MatcherOperation.optional()
+});
+var Matchers = z3.union([Matcher, z3.array(Matcher)]);
 
 // src/schema/data-sources.ts
 import { z as z4 } from "zod";
@@ -253,15 +272,6 @@ var ResourceRequest = z5.object({
   body: z5.optional(z5.unknown())
 });
 var Resources = z5.map(ResourceId, Resource);
-var LOCAL_RESOURCE_PREFIX = "$resources";
-var isLocalResource = (pathname, resourceName) => {
-  const segments = pathname.split("/").filter(Boolean);
-  if (resourceName === void 0) {
-    return segments[0] === LOCAL_RESOURCE_PREFIX;
-  }
-  return segments.join("/") === `${LOCAL_RESOURCE_PREFIX}/${resourceName}`;
-};
-var sitemapResourceUrl = `/${LOCAL_RESOURCE_PREFIX}/sitemap.xml`;
 
 // src/schema/props.ts
 import { z as z6 } from "zod";
@@ -901,64 +911,6 @@ var createScope = (occupiedIdentifiers = [], normalizeName = normalizeJsName, se
   };
 };
 
-// src/resource-loader.ts
-var loadResource = async (customFetch, resourceRequest) => {
-  const { url, method, headers, body } = resourceRequest;
-  const requestHeaders = new Headers(
-    headers.map(({ name, value }) => [name, value])
-  );
-  const requestInit = {
-    method,
-    headers: requestHeaders
-  };
-  if (method !== "get" && body !== void 0) {
-    if (typeof body === "string") {
-      requestInit.body = body;
-    }
-    if (typeof body === "object") {
-      requestInit.body = JSON.stringify(body);
-    }
-  }
-  try {
-    const response = await customFetch(url.trim(), requestInit);
-    let data = await response.text();
-    try {
-      data = JSON.parse(data);
-    } catch {
-    }
-    if (!response.ok) {
-      console.error(
-        `Failed to load resource: ${url} - ${response.status}: ${JSON.stringify(data).slice(0, 300)}`
-      );
-    }
-    return {
-      ok: response.ok,
-      data,
-      status: response.status,
-      statusText: response.statusText
-    };
-  } catch (error) {
-    console.error(error);
-    const message = error.message;
-    return {
-      ok: false,
-      data: void 0,
-      status: 500,
-      statusText: message
-    };
-  }
-};
-var loadResources = async (customFetch, requests) => {
-  return Object.fromEntries(
-    await Promise.all(
-      Array.from(
-        requests,
-        async ([name, request]) => [name, await loadResource(customFetch, request)]
-      )
-    )
-  );
-};
-
 // src/resources-generator.ts
 var generateResources = ({
   scope,
@@ -1271,31 +1223,6 @@ var generatePageMeta = ({
 `;
   return generated;
 };
-
-// src/form-fields.ts
-var formIdFieldName = `ws--form-id`;
-var formBotFieldName = `ws--form-bot`;
-
-// src/to-string.ts
-var createJsonStringifyProxy = (target) => {
-  return new Proxy(target, {
-    get(target2, prop, receiver) {
-      if (prop === "toString") {
-        return function() {
-          return JSON.stringify(target2);
-        };
-      }
-      const value = Reflect.get(target2, prop, receiver);
-      if (typeof value === "object" && value !== null) {
-        return createJsonStringifyProxy(value);
-      }
-      return value;
-    }
-  });
-};
-var isPlainObject = (value) => {
-  return Object.prototype.toString.call(value) === "[object Object]" && (Object.getPrototypeOf(value) === null || Object.getPrototypeOf(value) === Object.prototype);
-};
 export {
   Asset,
   Assets,
@@ -1317,6 +1244,10 @@ export {
   Instance,
   InstanceChild,
   Instances,
+  Matcher,
+  MatcherOperation,
+  MatcherRelation,
+  Matchers,
   PageName,
   PagePath,
   PageRedirect,
@@ -1339,7 +1270,6 @@ export {
   Templates,
   TextChild,
   WebstudioFragment,
-  createJsonStringifyProxy,
   createScope,
   decodeDataSourceVariable,
   documentTypes,
@@ -1349,8 +1279,6 @@ export {
   findParentFolderByChildId,
   findTreeInstanceIds,
   findTreeInstanceIdsExcludingSlotDescendants,
-  formBotFieldName,
-  formIdFieldName,
   generateExpression,
   generateObjectExpression,
   generatePageMeta,
@@ -1361,17 +1289,12 @@ export {
   getStyleDeclKey,
   initialBreakpoints,
   isLiteralExpression,
-  isLocalResource,
   isPathnamePattern,
-  isPlainObject,
   isRootFolder,
   lintExpression,
-  loadResource,
-  loadResources,
   matchPathnameParams,
   parseComponentName,
   parseObjectExpression,
   replaceFormActionsWithResources,
-  sitemapResourceUrl,
   transpileExpression
 };

package/lib/runtime.js

@@ -0,0 +1,101 @@
+// src/resource-loader.ts
+var LOCAL_RESOURCE_PREFIX = "$resources";
+var isLocalResource = (pathname, resourceName) => {
+  const segments = pathname.split("/").filter(Boolean);
+  if (resourceName === void 0) {
+    return segments[0] === LOCAL_RESOURCE_PREFIX;
+  }
+  return segments.join("/") === `${LOCAL_RESOURCE_PREFIX}/${resourceName}`;
+};
+var sitemapResourceUrl = `/${LOCAL_RESOURCE_PREFIX}/sitemap.xml`;
+var loadResource = async (customFetch, resourceRequest) => {
+  const { url, method, headers, body } = resourceRequest;
+  const requestHeaders = new Headers(
+    headers.map(({ name, value }) => [name, value])
+  );
+  const requestInit = {
+    method,
+    headers: requestHeaders
+  };
+  if (method !== "get" && body !== void 0) {
+    if (typeof body === "string") {
+      requestInit.body = body;
+    }
+    if (typeof body === "object") {
+      requestInit.body = JSON.stringify(body);
+    }
+  }
+  try {
+    const response = await customFetch(url.trim(), requestInit);
+    let data = await response.text();
+    try {
+      data = JSON.parse(data);
+    } catch {
+    }
+    if (!response.ok) {
+      console.error(
+        `Failed to load resource: ${url} - ${response.status}: ${JSON.stringify(data).slice(0, 300)}`
+      );
+    }
+    return {
+      ok: response.ok,
+      data,
+      status: response.status,
+      statusText: response.statusText
+    };
+  } catch (error) {
+    console.error(error);
+    const message = error.message;
+    return {
+      ok: false,
+      data: void 0,
+      status: 500,
+      statusText: message
+    };
+  }
+};
+var loadResources = async (customFetch, requests) => {
+  return Object.fromEntries(
+    await Promise.all(
+      Array.from(
+        requests,
+        async ([name, request]) => [name, await loadResource(customFetch, request)]
+      )
+    )
+  );
+};
+
+// src/to-string.ts
+var createJsonStringifyProxy = (target) => {
+  return new Proxy(target, {
+    get(target2, prop, receiver) {
+      if (prop === "toString") {
+        return function() {
+          return JSON.stringify(target2);
+        };
+      }
+      const value = Reflect.get(target2, prop, receiver);
+      if (typeof value === "object" && value !== null) {
+        return createJsonStringifyProxy(value);
+      }
+      return value;
+    }
+  });
+};
+var isPlainObject = (value) => {
+  return Object.prototype.toString.call(value) === "[object Object]" && (Object.getPrototypeOf(value) === null || Object.getPrototypeOf(value) === Object.prototype);
+};
+
+// src/form-fields.ts
+var formIdFieldName = `ws--form-id`;
+var formBotFieldName = `ws--form-bot`;
+export {
+  createJsonStringifyProxy,
+  formBotFieldName,
+  formIdFieldName,
+  isLocalResource,
+  isPlainObject,
+  loadResource,
+  loadResources,
+  sitemapResourceUrl
+};

package/lib/types/index.d.ts

@@ -13,10 +13,7 @@ export * from "./schema/webstudio";
 export * from "./instances-utils";
 export * from "./page-utils";
 export * from "./scope";
-export * from "./resource-loader";
 export * from "./expression";
 export * from "./resources-generator";
 export * from "./page-meta-generator";
 export * from "./url-pattern";
-export * from "./form-fields";
-export * from "./to-string";

package/lib/types/jsx.d.ts

@@ -140,7 +140,7 @@ export declare const renderJsx: (root: JSX.Element) => {
 type ComponentProps = Record<string, unknown> & Record<`${string}:expression`, string> & {
     "ws:id"?: string;
     "ws:label"?: string;
-    children?: ReactNode;
+    children?: ReactNode | ExpressionValue;
 };
 type Component = {
     displayName: string;

package/lib/types/resource-loader.d.ts

@@ -1,4 +1,9 @@
 import type { ResourceRequest } from "./schema/resources";
+/**
+ * Prevents fetch cycles by prefixing local resources.
+ */
+export declare const isLocalResource: (pathname: string, resourceName?: string) => boolean;
+export declare const sitemapResourceUrl = "/$resources/sitemap.xml";
 export declare const loadResource: (customFetch: typeof fetch, resourceRequest: ResourceRequest) => Promise<{
     ok: boolean;
     data: string;

package/lib/types/runtime.d.ts

@@ -0,0 +1,3 @@
+export * from "./resource-loader";
+export * from "./to-string";
+export * from "./form-fields";

package/lib/types/schema/instances.d.ts

@@ -206,3 +206,212 @@ export declare const Instances: z.ZodMap<z.ZodString, z.ZodObject<{
     label?: string | undefined;
 }>>;
 export type Instances = z.infer<typeof Instances>;
+export declare const MatcherRelation: z.ZodUnion<[z.ZodLiteral<"ancestor">, z.ZodLiteral<"parent">, z.ZodLiteral<"self">, z.ZodLiteral<"child">, z.ZodLiteral<"descendant">]>;
+export type MatcherRelation = z.infer<typeof MatcherRelation>;
+export declare const MatcherOperation: z.ZodObject<{
+    $eq: z.ZodOptional<z.ZodString>;
+    $neq: z.ZodOptional<z.ZodString>;
+    $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+}, "strip", z.ZodTypeAny, {
+    $eq?: string | undefined;
+    $neq?: string | undefined;
+    $in?: string[] | undefined;
+    $nin?: string[] | undefined;
+}, {
+    $eq?: string | undefined;
+    $neq?: string | undefined;
+    $in?: string[] | undefined;
+    $nin?: string[] | undefined;
+}>;
+export type MatcherOperation = z.infer<typeof MatcherOperation>;
+export declare const Matcher: z.ZodObject<{
+    relation: z.ZodUnion<[z.ZodLiteral<"ancestor">, z.ZodLiteral<"parent">, z.ZodLiteral<"self">, z.ZodLiteral<"child">, z.ZodLiteral<"descendant">]>;
+    component: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+    tag: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}>;
+export type Matcher = z.infer<typeof Matcher>;
+export declare const Matchers: z.ZodUnion<[z.ZodObject<{
+    relation: z.ZodUnion<[z.ZodLiteral<"ancestor">, z.ZodLiteral<"parent">, z.ZodLiteral<"self">, z.ZodLiteral<"child">, z.ZodLiteral<"descendant">]>;
+    component: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+    tag: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}>, z.ZodArray<z.ZodObject<{
+    relation: z.ZodUnion<[z.ZodLiteral<"ancestor">, z.ZodLiteral<"parent">, z.ZodLiteral<"self">, z.ZodLiteral<"child">, z.ZodLiteral<"descendant">]>;
+    component: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+    tag: z.ZodOptional<z.ZodObject<{
+        $eq: z.ZodOptional<z.ZodString>;
+        $neq: z.ZodOptional<z.ZodString>;
+        $in: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        $nin: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }, {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}, {
+    relation: "ancestor" | "parent" | "self" | "child" | "descendant";
+    component?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+    tag?: {
+        $eq?: string | undefined;
+        $neq?: string | undefined;
+        $in?: string[] | undefined;
+        $nin?: string[] | undefined;
+    } | undefined;
+}>, "many">]>;
+export type Matchers = z.infer<typeof Matchers>;

package/lib/types/schema/resources.d.ts

@@ -119,8 +119,3 @@ export declare const Resources: z.ZodMap<z.ZodString, z.ZodObject<{
     body?: string | undefined;
 }>>;
 export type Resources = z.infer<typeof Resources>;
-/**
- * Prevents fetch cycles by prefixing local resources.
- */
-export declare const isLocalResource: (pathname: string, resourceName?: string) => boolean;
-export declare const sitemapResourceUrl = "/$resources/sitemap.xml";