@webstudio-is/sdk 0.269.0 → 0.271.0

package/lib/index.js

@@ -142,13 +142,20 @@ var DefaultPagePage = z2.string().refine((path) => path !== "", "Can't be empty"
   (path) => path !== "/build" && path.startsWith("/build/") === false,
   "/build prefix is reserved for the system"
 ).refine((path) => path.length <= 255, "Path can't exceed 255 characters");
-var OldPagePath = z2.string().refine((path) => path !== "", "Can't be empty").refine((path) => path !== "/", "Can't be just a /").refine(
-  (path) => path === "" || path.startsWith("/"),
-  "Must start with a / or a full URL e.g. https://website.org"
-).refine((path) => path.endsWith("/") === false, "Can't end with a /").refine((path) => path.includes("//") === false, "Can't contain repeating /").refine((path) => {
-  const disallowedChars = /[\s<>"{}|\\^`[\]\u0000-\u001f\u007f]/;
-  return !disallowedChars.test(path);
-}, "Path contains invalid characters (spaces or URL-unsafe characters are not allowed)").refine(
+var RedirectSourcePath = z2.string().refine((path) => path !== "", "Can't be empty").refine((path) => path !== "/", "Can't be just a /").refine(
+  (path) => path.startsWith("/") && path.startsWith("//") === false,
+  "Must start with a /"
+).refine((path) => {
+  if (/[\\\u0000-\u001f\u007f]/.test(path)) {
+    return false;
+  }
+  try {
+    new URL(path, "https://example.com");
+    return true;
+  } catch {
+    return false;
+  }
+}, "Must be a valid URL path").refine(
   (path) => path !== "/s" && path.startsWith("/s/") === false,
   "/s prefix is reserved for the system"
 ).refine(
@@ -188,7 +195,7 @@ var ProjectNewRedirectPath = z2.string().min(1, "Path is required").refine((data
   }
 }, "Must be a valid URL");
 var PageRedirect = z2.object({
-  old: OldPagePath,
+  old: RedirectSourcePath,
   new: ProjectNewRedirectPath,
   status: z2.enum(["301", "302"]).optional()
 });
@@ -2137,10 +2144,16 @@ var getHtmlTagFromInstance = ({
   if (instance.component === "XmlNode") {
     return;
   }
+  if (instance.tag !== void 0) {
+    return instance.tag;
+  }
+  const propTag = htmlTagsByInstanceId === void 0 ? props === void 0 ? void 0 : getHtmlTagsFromProps(props).get(instance.id) : htmlTagsByInstanceId.get(instance.id);
+  if (propTag !== void 0) {
+    return propTag;
+  }
   const meta = metas.get(instance.component);
   const metaTag = Object.keys(meta?.presetStyle ?? {}).at(0);
-  const propTag = htmlTagsByInstanceId?.get(instance.id) ?? getHtmlTagsFromProps(props).get(instance.id);
-  return instance.tag ?? propTag ?? metaTag;
+  return metaTag;
 };
 var getIndexesWithinAncestors = (metas, instances, rootIds) => {
   const ancestors = /* @__PURE__ */ new Set();
@@ -3471,7 +3484,7 @@ export {
   InstanceChild,
   Instances,
   MIME_CATEGORIES,
-  OldPagePath,
+  Page,
   PageAuth,
   PageId,
   PageName,
@@ -3481,6 +3494,7 @@ export {
   PageTitle,
   Pages,
   PresetStyleDecl,
+  ProjectMeta,
   ProjectNewRedirectPath,
   Prop,
   PropMeta,
@@ -3489,6 +3503,7 @@ export {
   RESIZABLE_IMAGE_MIME_TYPES,
   ROOT_FOLDER_ID,
   ROOT_INSTANCE_ID,
+  RedirectSourcePath,
   Resource,
   ResourceRequest,
   Resources,