@webstudio-is/sdk 0.269.0 → 0.270.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,6 @@ export {
   InstanceChild,
   Instances,
   MIME_CATEGORIES,
-  OldPagePath,
   PageAuth,
   PageId,
   PageName,
@@ -3489,6 +3501,7 @@ export {
   RESIZABLE_IMAGE_MIME_TYPES,
   ROOT_FOLDER_ID,
   ROOT_INSTANCE_ID,
+  RedirectSourcePath,
   Resource,
   ResourceRequest,
   Resources,

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

@@ -9,7 +9,7 @@ export declare const getHtmlTagsFromProps: (props: Props) => Map<string, string>
 export declare const getHtmlTagFromInstance: ({ instance, metas, props, htmlTagsByInstanceId, }: {
     instance: Instance;
     metas: Map<Instance["component"], WsComponentMeta>;
-    props: Props;
+    props?: Props;
     htmlTagsByInstanceId?: Map<Instance["id"], string>;
 }) => string | undefined;
 export type IndexesWithinAncestors = Map<Instance["id"], number>;

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

@@ -79,7 +79,7 @@ export declare const PageAuth: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
 }>]>;
 export type PageAuth = z.infer<typeof PageAuth>;
 export declare const HomePagePath: z.ZodEffects<z.ZodString, "", string>;
-export declare const OldPagePath: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
+export declare const RedirectSourcePath: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
 export declare const PagePath: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
 declare const Page: z.ZodObject<{
     path: z.ZodUnion<[z.ZodEffects<z.ZodString, "", string>, z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>]>;
@@ -509,7 +509,7 @@ declare const ProjectMeta: z.ZodObject<{
 export type ProjectMeta = z.infer<typeof ProjectMeta>;
 export declare const ProjectNewRedirectPath: z.ZodEffects<z.ZodString, string, string>;
 export declare const PageRedirect: z.ZodObject<{
-    old: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
+    old: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
     new: z.ZodEffects<z.ZodString, string, string>;
     status: z.ZodOptional<z.ZodEnum<["301", "302"]>>;
 }, "strip", z.ZodTypeAny, {
@@ -559,7 +559,7 @@ export declare const Pages: z.ZodEffects<z.ZodObject<{
         atomicStyles?: boolean | undefined;
     }>>;
     redirects: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        old: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
+        old: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, string, string>, string, string>, string, string>, string, string>;
         new: z.ZodEffects<z.ZodString, string, string>;
         status: z.ZodOptional<z.ZodEnum<["301", "302"]>>;
     }, "strip", z.ZodTypeAny, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/sdk",
-  "version": "0.269.0",
+  "version": "0.270.0",
   "description": "Webstudio project data schema",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -51,16 +51,16 @@
     "type-fest": "^4.37.0",
     "warn-once": "^0.1.1",
     "zod": "^3.24.2",
-    "@webstudio-is/css-engine": "0.269.0",
-    "@webstudio-is/fonts": "0.269.0",
-    "@webstudio-is/icons": "0.269.0",
-    "@webstudio-is/wsauth": "0.269.0"
+    "@webstudio-is/css-engine": "0.270.0",
+    "@webstudio-is/fonts": "0.270.0",
+    "@webstudio-is/wsauth": "0.270.0",
+    "@webstudio-is/icons": "0.270.0"
   },
   "devDependencies": {
     "html-tags": "^4.0.0",
     "vitest": "^3.1.2",
-    "@webstudio-is/template": "0.269.0",
-    "@webstudio-is/css-data": "0.269.0",
+    "@webstudio-is/template": "0.270.0",
+    "@webstudio-is/css-data": "0.270.0",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {