2 files changed, 21 insertions, 3 deletions

diff --git a/src/schemas/common.ts b/src/schemas/common.ts
new file mode 100644
index 0000000..ef1fefd
--- /dev/null
+++ b/src/schemas/common.ts
@@ -0,0 +1,17 @@
+import { fileAttributeSchema, imageAttributeSchema } from "$/deps/strapi.ts";
+
+const publicUrl = Deno.env.get("STRAPI_PUBLIC_URL") ?? Deno.env.get("STRAPI_URL");
+
+export const resolvedFileAttributeSchema = fileAttributeSchema.pipe(
+        ({ url, previewUrl, ...o }) => ({
+                ...o,
+                url: new URL(url, publicUrl).href,
+                ...(previewUrl ? { previewUrl: new URL(previewUrl, publicUrl).href } : {}),
+        }),
+);
+
+export const resolvedImageAttributeSchema = imageAttributeSchema.pipe((o) => ({
+        ...o,
+        previewUrl: o.previewUrl ? new URL(o.previewUrl, publicUrl).href : undefined,
+        url: new URL(o.url, publicUrl).href,
+}));
diff --git a/src/schemas/releases.ts b/src/schemas/releases.ts
index 0ccb6a6..529e8c9 100644
--- a/src/schemas/releases.ts
+++ b/src/schemas/releases.ts
@@ -1,13 +1,14 @@
 import { type } from "arktype";
 
-import { nodeSchema } from "../deps/strapi.tsx";
-import { strapiLoader } from "../deps/strapi.tsx";
+import { resolvedFileAttributeSchema } from "$/schemas/common.ts";
+
+import { nodeSchema } from "../deps/strapi.ts";
 
 export const releaseStrapiSchema = type({
         "version": "string",
         "date": "string.date.parse",
         "notes?": nodeSchema.array().or("null"),
-        "files": strapiLoader.resolvedFileAttributeSchema,
+        "files": resolvedFileAttributeSchema,
 });
 
 export const releaseSchema = releaseStrapiSchema.merge({