Add warning for zod4 importing + expand mastodon posts pattern matching

Author: essential-randomness

.changeset/mastodon-status-urls.md

@@ -0,0 +1,6 @@
+---
+"@fujocoded/zod-transform-socials": patch
+---
+
+- mastodon match now accepts post urls in addition to profile mathes (e.g. urls like `/@user/112050937942786185`).
+- warn at import time when the default (zod 3) entry is used but zod 4 is installed (for example an astro 6 upgrade that forgot to switch to `/zod4`).

zod-transform-socials/README.md

@@ -80,6 +80,7 @@ For example, putting a custom icon on a personal homepage that would
 otherwise resolve to `"custom"` with no icon:
 
 ```yaml
+name: ms boba
 contacts:
   - url: https://essentialrandomness.com
     icon: simple-icons:firefox
@@ -91,14 +92,14 @@ Drop `SocialLinks` into a content collection (or any other Zod object):
 
 ```ts
 import { SocialLinks } from "@fujocoded/zod-transform-socials";
-// zod import,
+// zod import depends on version
 
 export const teamCollection = defineCollection({
   type: "data",
   schema: (tools) =>
     z.object({
       name: z.name(),
-      // contacts is
+      // contacts will contain your list of social URLs
       contacts: SocialLinks,
     });
 });

zod-transform-socials/src/index.ts

@@ -12,6 +12,14 @@ import {
 } from "./transform.ts";
 import * as z from "zod";
 
+// Zod 4 adds a top-level `toJSONSchema`; Zod 3 doesn't. If we see it, the
+// consumer (likely Astro 6) is on Zod 4 and should be using the /zod4 entry.
+if (typeof (z as { toJSONSchema?: unknown }).toJSONSchema === "function") {
+  console.warn(
+    "[@fujocoded/zod-transform-socials] Zod 4 is installed but you imported the Zod 3 entry. Use `@fujocoded/zod-transform-socials/zod4` instead.",
+  );
+}
+
 const createSocialsSchema = (urlSchema: z.ZodString): z.ZodType<SocialsInput> =>
   z.union([
     urlSchema,

zod-transform-socials/src/social-links.ts

@@ -8,7 +8,7 @@ export type { ProfileMatch };
  */
 const DOMAIN_PATTERNS = {
   mastodon: (domain: string) => ({
-    match: `https?://${escapeForRegex(domain)}/@([a-z0-9-_]+)/?`,
+    match: `https?://${escapeForRegex(domain)}/@([a-z0-9-_]+)(?:/.*)?`,
     group: 1,
   }),
 } as const satisfies Record<string, (domain: string) => ProfileMatch>;

zod-transform-socials/src/zod4.ts

@@ -15,7 +15,7 @@ import {
 } from "./transform.ts";
 import * as z from "zod/v4";
 
-const createSocialsSchema = (urlSchema: z.ZodString) =>
+const createSocialsSchema = (urlSchema: z.ZodType<string>) =>
   z.union([
     urlSchema,
     z.object({
@@ -35,15 +35,15 @@ const createSocialLinksSchema = (
     .transform((socialUrls) => socialUrls.map(transformSocial))
     .default([]);
 
-export const urlSchema = z.string().url();
+export const urlSchema = z.url();
 export const SocialsSchema = createSocialsSchema(urlSchema);
 export const SocialLinks = createSocialLinksSchema(
   SocialsSchema,
   transformSocial,
 );
 
 export const createSocialsTransformer = (config: CreateSocialsConfig = {}) => {
-  const SocialsSchema = createSocialsSchema(z.string().url());
+  const SocialsSchema = createSocialsSchema(z.url());
   const { transformSocial, socialLinks } = createTransformSocial(config);
   const SocialLinks = createSocialLinksSchema(SocialsSchema, transformSocial);