@webstudio-is/sdk 0.274.5 → 0.275.0

package/lib/index.js

@@ -346,12 +346,29 @@ var pages = z2.object({
 
 // src/schema/instances.ts
 import { z as z3 } from "zod";
+var textChildValue = z3.string();
 var textChild = z3.object({
   type: z3.literal("text"),
-  value: z3.string(),
+  value: textChildValue,
   placeholder: z3.boolean().optional()
 });
 var instanceId = z3.string();
+var instanceComponent = z3.string().min(1);
+var instanceTag = z3.string().min(1, "Tag cannot be empty").describe(
+  "Optional HTML tag override for component rendering. Omit for component defaults; never pass an empty string."
+);
+var instanceAttributes = z3.object({
+  component: instanceComponent,
+  tag: instanceTag.optional(),
+  label: z3.string().optional()
+});
+var instanceCreateInput = instanceAttributes.partial({
+  component: true
+});
+var instanceFilterInput = instanceAttributes.pick({
+  component: true,
+  tag: true
+}).partial();
 var idChild = z3.object({
   type: z3.literal("id"),
   value: instanceId
@@ -364,9 +381,9 @@ var instanceChild = z3.union([idChild, textChild, expressionChild]);
 var instance = z3.object({
   type: z3.literal("instance"),
   id: instanceId,
-  component: z3.string(),
-  tag: z3.string().optional(),
-  label: z3.string().optional(),
+  component: instanceAttributes.shape.component,
+  tag: instanceAttributes.shape.tag,
+  label: instanceAttributes.shape.label,
   children: z3.array(instanceChild)
 });
 var instances = z3.map(instanceId, instance);
@@ -394,8 +411,8 @@ var dataSourceVariableValue = z4.union([
   }),
   z4.object({
     type: z4.literal("json"),
-    value: z4.unknown()
-  })
+    value: z4.unknown().optional()
+  }).transform((value) => ({ ...value, value: value.value ?? null }))
 ]);
 var dataSource = z4.union([
   z4.object({
@@ -461,6 +478,7 @@ var resource = z5.object({
 });
 var resourceRequest = z5.object({
   name: z5.string(),
+  control: z5.optional(z5.union([z5.literal("system"), z5.literal("graphql")])),
   method,
   url: z5.string(),
   searchParams: z5.array(
@@ -571,7 +589,7 @@ var insetUnitValue = z6.union([
     value: z6.literal("auto")
   })
 ]);
-var keyframeStyles = z6.record(styleValue);
+var keyframeStyles = z6.record(z6.string(), styleValue);
 var animationKeyframe = z6.object({
   offset: z6.number().optional(),
   styles: keyframeStyles
@@ -1076,6 +1094,13 @@ var componentCategories = [
   "hidden",
   "internal"
 ];
+var normalizeComponentCategory = (category) => {
+  return category ?? "hidden";
+};
+var shouldFilterComponentCategory = (category) => {
+  const normalized = normalizeComponentCategory(category);
+  return normalized === "hidden" || normalized === "internal";
+};
 var componentState = z15.object({
   selector: z15.string(),
   label: z15.string()
@@ -1106,13 +1131,14 @@ var wsComponentMeta = z15.object({
   indexWithinAncestor: z15.optional(z15.string()),
   label: z15.optional(z15.string()),
   description: z15.string().optional(),
+  deprecated: z15.boolean().optional(),
   icon: z15.string().optional(),
   presetStyle: z15.optional(z15.record(z15.string(), z15.array(presetStyleDecl))),
   states: z15.optional(z15.array(componentState)),
   order: z15.number().optional(),
   // properties and html attributes that will be always visible in properties panel
   initialProps: z15.array(z15.string()).optional(),
-  props: z15.record(propMeta).optional()
+  props: z15.record(z15.string(), propMeta).optional()
 });
 
 // src/assets.ts
@@ -2906,6 +2932,10 @@ var generateResources = ({
 `;
     generatedRequest += `    name: ${JSON.stringify(resource3.name)},
 `;
+    if (resource3.control !== void 0) {
+      generatedRequest += `    control: "${resource3.control}",
+`;
+    }
     const url2 = generateExpression({
       expression: resource3.url,
       dataSources: dataSources2,
@@ -3069,6 +3099,26 @@ var replaceFormActionsWithResources = ({
 };
 
 // src/page-meta-generator.ts
+import { parseExpressionAt as parseExpressionAt2 } from "acorn";
+var normalizeStringExpression = (expression) => {
+  const trimmedExpression = expression.trim();
+  try {
+    const parsedExpression = parseExpressionAt2(trimmedExpression, 0, {
+      ecmaVersion: "latest"
+    });
+    if (parsedExpression.end === trimmedExpression.length) {
+      if (parsedExpression.type === "Identifier" && trimmedExpression !== "undefined" && trimmedExpression.includes("$ws$") === false) {
+        return JSON.stringify(expression);
+      }
+      return expression;
+    }
+  } catch {
+  }
+  if (trimmedExpression.includes("$ws$")) {
+    return expression;
+  }
+  return JSON.stringify(expression);
+};
 var generatePageMeta = ({
   globalScope,
   page: page2,
@@ -3078,13 +3128,13 @@ var generatePageMeta = ({
   const localScope = createScope(["system", "resources"]);
   const usedDataSources = /* @__PURE__ */ new Map();
   const titleExpression = generateExpression({
-    expression: page2.title,
+    expression: normalizeStringExpression(page2.title),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
   });
   const descriptionExpression = generateExpression({
-    expression: page2.meta.description ?? "undefined",
+    expression: normalizeStringExpression(page2.meta.description ?? "undefined"),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
@@ -3096,7 +3146,7 @@ var generatePageMeta = ({
     scope: localScope
   });
   const languageExpression = generateExpression({
-    expression: page2.meta.language ?? "undefined",
+    expression: normalizeStringExpression(page2.meta.language ?? "undefined"),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
@@ -3105,7 +3155,9 @@ var generatePageMeta = ({
     page2.meta.socialImageAssetId ? assets2.get(page2.meta.socialImageAssetId)?.name : void 0
   );
   const socialImageUrlExpression = generateExpression({
-    expression: page2.meta.socialImageUrl ?? "undefined",
+    expression: normalizeStringExpression(
+      page2.meta.socialImageUrl ?? "undefined"
+    ),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
@@ -3117,13 +3169,13 @@ var generatePageMeta = ({
     scope: localScope
   });
   const redirectExpression = generateExpression({
-    expression: page2.meta.redirect ?? "undefined",
+    expression: normalizeStringExpression(page2.meta.redirect ?? "undefined"),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
   });
   const contentExpression = generateExpression({
-    expression: page2.meta.content ?? "undefined",
+    expression: normalizeStringExpression(page2.meta.content ?? "undefined"),
     dataSources: dataSources2,
     usedDataSources,
     scope: localScope
@@ -3137,7 +3189,7 @@ var generatePageMeta = ({
     }
     const propertyExpression = JSON.stringify(customMeta.property);
     const contentExpression2 = generateExpression({
-      expression: customMeta.content,
+      expression: normalizeStringExpression(customMeta.content),
       dataSources: dataSources2,
       usedDataSources,
       scope: localScope
@@ -3444,6 +3496,132 @@ ${userSheet.cssText}`,
     classes
   };
 };
+
+// src/input-json-schema.ts
+var unique = (values) => [...new Set(values)];
+var toInputJsonSchemaObject = (schema) => {
+  if (schema === void 0) {
+    return;
+  }
+  if (schema === true) {
+    return {};
+  }
+  if (schema === false) {
+    return { not: {} };
+  }
+  return schema;
+};
+var annotationInputJsonSchemaFields = /* @__PURE__ */ new Set(["description", "default"]);
+var isUnconstrainedInputJsonSchema = (schema) => Object.entries(schema).every(
+  ([field, value]) => value === void 0 || annotationInputJsonSchemaFields.has(field)
+);
+var inputJsonSchemaAcceptsType = (schema, type, options = {}) => {
+  if (options.treatUnconstrainedAsAny === true && isUnconstrainedInputJsonSchema(schema)) {
+    return true;
+  }
+  const schemaObject = toInputJsonSchemaObject(schema);
+  if (schemaObject === void 0) {
+    return false;
+  }
+  const types = schemaObject.type === void 0 ? [] : Array.isArray(schemaObject.type) ? schemaObject.type : [schemaObject.type];
+  if (types.includes(type)) {
+    return true;
+  }
+  if (type === "object" && (schemaObject.properties !== void 0 || schemaObject.required !== void 0 || schemaObject.additionalProperties !== void 0)) {
+    return true;
+  }
+  if (type === "array" && (schemaObject.items !== void 0 || schemaObject.prefixItems !== void 0 || schemaObject.minItems !== void 0 || schemaObject.maxItems !== void 0)) {
+    return true;
+  }
+  for (const combinator of ["anyOf", "oneOf"]) {
+    if (schemaObject[combinator] !== void 0) {
+      return schemaObject[combinator].some((item) => {
+        const itemSchema = toInputJsonSchemaObject(item);
+        return itemSchema === void 0 ? false : inputJsonSchemaAcceptsType(itemSchema, type, options);
+      });
+    }
+  }
+  if (schemaObject.allOf !== void 0) {
+    return schemaObject.allOf.length > 0 && schemaObject.allOf.every((item) => {
+      const itemSchema = toInputJsonSchemaObject(item);
+      return itemSchema === void 0 ? false : inputJsonSchemaAcceptsType(itemSchema, type, options);
+    });
+  }
+  return false;
+};
+var combineInputJsonSchemas = (left, right, combinator) => ({ [combinator]: [left, right] });
+var inputJsonSchemaCombinators = ["anyOf", "oneOf", "allOf"];
+var collectInputJsonSchemaBranchValue = (schema, readValue, combineValues) => {
+  let value = readValue(schema);
+  for (const combinator of inputJsonSchemaCombinators) {
+    for (const item of schema?.[combinator] ?? []) {
+      const itemSchema = toInputJsonSchemaObject(item);
+      const itemValue = collectInputJsonSchemaBranchValue(
+        itemSchema,
+        readValue,
+        combineValues
+      );
+      if (itemValue !== void 0) {
+        value = value === void 0 ? itemValue : combineValues(value, itemValue, combinator);
+      }
+    }
+  }
+  return value;
+};
+var mergeInputJsonSchemaProperties = (left, right, combinator) => {
+  const result = { ...left };
+  for (const [field, schema] of Object.entries(right)) {
+    const current = result[field];
+    result[field] = current === void 0 ? schema : combineInputJsonSchemas(current, schema, combinator);
+  }
+  return result;
+};
+var getInputJsonSchemaProperties = (schema) => collectInputJsonSchemaBranchValue(
+  schema,
+  (schema2) => {
+    const properties = Object.entries(schema2?.properties ?? {}).flatMap(
+      ([field, value]) => {
+        const valueSchema = toInputJsonSchemaObject(value);
+        return valueSchema === void 0 ? [] : [[field, valueSchema]];
+      }
+    );
+    return properties.length === 0 ? void 0 : Object.fromEntries(properties);
+  },
+  mergeInputJsonSchemaProperties
+);
+var getInputJsonSchemaAdditionalProperties = (schema) => collectInputJsonSchemaBranchValue(
+  schema,
+  (schema2) => typeof schema2?.additionalProperties === "object" ? schema2.additionalProperties : schema2?.additionalProperties === true ? {} : void 0,
+  combineInputJsonSchemas
+);
+var intersectStrings = (left, right) => left.filter((value) => right.includes(value));
+var getInputJsonSchemaRequiredFields = (schema) => {
+  if (schema === void 0) {
+    return [];
+  }
+  const allOfRequired = schema.allOf?.map(toInputJsonSchemaObject).filter((schema2) => schema2 !== void 0).flatMap(getInputJsonSchemaRequiredFields);
+  const anyBranchSchemas = [...schema.anyOf ?? [], ...schema.oneOf ?? []].map(toInputJsonSchemaObject).filter((schema2) => schema2 !== void 0);
+  const anyOfRequired = anyBranchSchemas.length === 0 ? void 0 : anyBranchSchemas.map(getInputJsonSchemaRequiredFields).reduce(intersectStrings);
+  return unique([
+    ...schema.required ?? [],
+    ...allOfRequired ?? [],
+    ...anyOfRequired ?? []
+  ]);
+};
+var getInputJsonSchemaMetadata = (inputSchema) => {
+  const properties = getInputJsonSchemaProperties(inputSchema) ?? {};
+  return {
+    inputFields: Object.keys(properties),
+    requiredInputFields: getInputJsonSchemaRequiredFields(inputSchema).filter(
+      (field) => field in properties
+    ),
+    inputFieldTypes: Object.fromEntries(
+      Object.entries(properties).flatMap(
+        ([field, schema]) => inputJsonSchemaAcceptsType(schema, "array") ? [[field, "array"]] : []
+      )
+    )
+  };
+};
 export {
   ALLOWED_FILE_EXTENSIONS,
   ALLOWED_FILE_TYPES,
@@ -3524,6 +3702,9 @@ export {
   getHtmlTagFromInstance,
   getHtmlTagsFromProps,
   getIndexesWithinAncestors,
+  getInputJsonSchemaAdditionalProperties,
+  getInputJsonSchemaMetadata,
+  getInputJsonSchemaProperties,
   getMimeTypeByExtension,
   getMimeTypeByFilename,
   getPageById,
@@ -3535,9 +3716,15 @@ export {
   imageAsset,
   imageMeta,
   initialBreakpoints,
+  inputJsonSchemaAcceptsType,
   insetUnitValue,
   instance,
+  instanceAttributes,
   instanceChild,
+  instanceComponent,
+  instanceCreateInput,
+  instanceFilterInput,
+  instanceTag,
   instances,
   isAbsoluteUrl,
   isAllowedExtension,
@@ -3553,6 +3740,7 @@ export {
   isRootFolder,
   lintExpression,
   matchPathnameParams,
+  normalizeComponentCategory,
   page,
   pageAuth,
   pageId,
@@ -3580,6 +3768,7 @@ export {
   resources,
   rootComponent,
   scrollAnimation,
+  shouldFilterComponentCategory,
   styleDecl,
   styleSource,
   styleSourceSelection,
@@ -3590,6 +3779,8 @@ export {
   tags,
   templates,
   textChild,
+  textChildValue,
+  toInputJsonSchemaObject,
   toRuntimeAsset,
   transpileExpression,
   validateFileName,

package/lib/runtime.js

@@ -152,7 +152,8 @@ var isBraveBrowser = () => {
 // src/runtime.ts
 var tagProperty = "data-ws-tag";
 var getTagFromProps = (props) => {
-  return props[tagProperty];
+  const tag = props[tagProperty];
+  return typeof tag === "string" && tag.length > 0 ? tag : void 0;
 };
 var indexProperty = "data-ws-index";
 var getIndexWithinAncestorFromProps = (props) => {

package/lib/schema.js

@@ -91,8 +91,8 @@ var dataSourceVariableValue = z3.union([
   }),
   z3.object({
     type: z3.literal("json"),
-    value: z3.unknown()
-  })
+    value: z3.unknown().optional()
+  }).transform((value) => ({ ...value, value: value.value ?? null }))
 ]);
 var dataSource = z3.union([
   z3.object({
@@ -155,12 +155,29 @@ var deployment = z4.union([
 
 // src/schema/instances.ts
 import { z as z5 } from "zod";
+var textChildValue = z5.string();
 var textChild = z5.object({
   type: z5.literal("text"),
-  value: z5.string(),
+  value: textChildValue,
   placeholder: z5.boolean().optional()
 });
 var instanceId = z5.string();
+var instanceComponent = z5.string().min(1);
+var instanceTag = z5.string().min(1, "Tag cannot be empty").describe(
+  "Optional HTML tag override for component rendering. Omit for component defaults; never pass an empty string."
+);
+var instanceAttributes = z5.object({
+  component: instanceComponent,
+  tag: instanceTag.optional(),
+  label: z5.string().optional()
+});
+var instanceCreateInput = instanceAttributes.partial({
+  component: true
+});
+var instanceFilterInput = instanceAttributes.pick({
+  component: true,
+  tag: true
+}).partial();
 var idChild = z5.object({
   type: z5.literal("id"),
   value: instanceId
@@ -173,9 +190,9 @@ var instanceChild = z5.union([idChild, textChild, expressionChild]);
 var instance = z5.object({
   type: z5.literal("instance"),
   id: instanceId,
-  component: z5.string(),
-  tag: z5.string().optional(),
-  label: z5.string().optional(),
+  component: instanceAttributes.shape.component,
+  tag: instanceAttributes.shape.tag,
+  label: instanceAttributes.shape.label,
   children: z5.array(instanceChild)
 });
 var instances = z5.map(instanceId, instance);
@@ -571,7 +588,7 @@ var insetUnitValue = z7.union([
     value: z7.literal("auto")
   })
 ]);
-var keyframeStyles = z7.record(styleValue);
+var keyframeStyles = z7.record(z7.string(), styleValue);
 var animationKeyframe = z7.object({
   offset: z7.number().optional(),
   styles: keyframeStyles
@@ -777,6 +794,7 @@ var resource = z9.object({
 });
 var resourceRequest = z9.object({
   name: z9.string(),
+  control: z9.optional(z9.union([z9.literal("system"), z9.literal("graphql")])),
   method,
   url: z9.string(),
   searchParams: z9.array(
@@ -865,7 +883,12 @@ export {
   imageMeta,
   initialBreakpoints,
   instance,
+  instanceAttributes,
   instanceChild,
+  instanceComponent,
+  instanceCreateInput,
+  instanceFilterInput,
+  instanceTag,
   instances,
   page,
   pageAuth,
@@ -891,5 +914,6 @@ export {
   styleSources,
   styles,
   templates,
-  textChild
+  textChild,
+  textChildValue
 };

package/lib/types/index.d.ts

@@ -24,5 +24,6 @@ export * from "./url-pattern";
 export * from "./link-utils";
 export * from "./css";
 export * from "./__generated__/tags";
+export { getInputJsonSchemaAdditionalProperties, getInputJsonSchemaMetadata, getInputJsonSchemaProperties, inputJsonSchemaAcceptsType, toInputJsonSchemaObject, type InputJsonSchema, type InputJsonSchemaValue, type InputJsonSchemaMetadata, } from "./input-json-schema";
 export type { AnimationAction, AnimationActionScroll, AnimationActionView, AnimationKeyframe, KeyframeStyles, RangeUnit, RangeUnitValue, ScrollNamedRange, ScrollRangeValue, ViewNamedRange, ViewRangeValue, ScrollAnimation, ViewAnimation, InsetUnitValue, DurationUnitValue, IterationsUnitValue, TimeUnit, } from "./schema/animation-schema";
 export { animationAction, scrollAnimation, viewAnimation, rangeUnitValue, animationKeyframe, insetUnitValue, durationUnitValue, RANGE_UNITS, } from "./schema/animation-schema";

package/lib/types/input-json-schema.d.ts

@@ -0,0 +1,15 @@
+import type { JSONSchema } from "json-schema-typed";
+export type InputJsonSchema = JSONSchema.Interface;
+export type InputJsonSchemaValue = JSONSchema;
+export type InputJsonSchemaMetadata = {
+    inputFields: readonly string[];
+    requiredInputFields: readonly string[];
+    inputFieldTypes: Partial<Record<string, "array">>;
+};
+export declare const toInputJsonSchemaObject: (schema: InputJsonSchemaValue | undefined) => InputJsonSchema | undefined;
+export declare const inputJsonSchemaAcceptsType: (schema: InputJsonSchema, type: string, options?: {
+    treatUnconstrainedAsAny?: boolean;
+}) => boolean;
+export declare const getInputJsonSchemaProperties: (schema: InputJsonSchema | undefined) => Record<string, InputJsonSchema> | undefined;
+export declare const getInputJsonSchemaAdditionalProperties: (schema: InputJsonSchema | undefined) => InputJsonSchema | undefined;
+export declare const getInputJsonSchemaMetadata: (inputSchema: InputJsonSchema) => InputJsonSchemaMetadata;