@isardsat/editorial-server 6.13.2 → 6.14.0

package/dist/lib/schema.d.ts

@@ -2,12 +2,15 @@ export declare function createSchema(configDirectory: string): Promise<Record<st
     displayName: string;
     fields: Record<string, {
         [x: string]: unknown;
-        type: "string" | "number" | "boolean" | "url" | "date" | "datetime" | "markdown" | "color" | "select";
+        type: "string" | "number" | "boolean" | "url" | "date" | "datetime" | "markdown" | "color" | "select" | "multiselect";
         displayName: string;
         optional: boolean;
         displayExtra?: string | undefined;
         placeholder?: string | undefined;
         showInSummary?: boolean | undefined;
+        options?: string[] | undefined;
+        maxSelectedOptions?: number | undefined;
+        minSelectedOptions?: number | undefined;
     }>;
     filterBy?: string | undefined;
     singleton?: boolean | undefined;

package/dist/lib/storage.d.ts

@@ -4,12 +4,15 @@ export declare function createStorage(dataDirectory: string): {
         displayName: string;
         fields: Record<string, {
             [x: string]: unknown;
-            type: "string" | "number" | "boolean" | "url" | "date" | "datetime" | "markdown" | "color" | "select";
+            type: "string" | "number" | "boolean" | "url" | "date" | "datetime" | "markdown" | "color" | "select" | "multiselect";
             displayName: string;
             optional: boolean;
             displayExtra?: string | undefined;
             placeholder?: string | undefined;
             showInSummary?: boolean | undefined;
+            options?: string[] | undefined;
+            maxSelectedOptions?: number | undefined;
+            minSelectedOptions?: number | undefined;
         }>;
         filterBy?: string | undefined;
         singleton?: boolean | undefined;

package/dist/routes/data.js

@@ -1,5 +1,5 @@
 import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
-import { EditorialDataItemSchema, EditorialDataSchema, EditorialSchemaSchema, } from "@isardsat/editorial-common";
+import { EditorialDataItemSchema, EditorialDataSchema, EditorialSchemaSchema, getOptionsReference, } from "@isardsat/editorial-common";
 function createCache() {
     let schemaCache = null;
     const contentCache = new Map();
@@ -36,6 +36,86 @@ function createCache() {
         },
     };
 }
+/**
+ * Resolves uploaded file paths to full URLs for an item.
+ */
+function resolveFileUrls(item, schema, itemType, origin) {
+    const resolvedItem = { ...item };
+    const itemSchema = schema[itemType];
+    if (!itemSchema)
+        return resolvedItem;
+    for (const [key, value] of Object.entries(resolvedItem)) {
+        if (!itemSchema.fields[key]?.isUploadedFile)
+            continue;
+        if (typeof value !== "string")
+            continue;
+        if (value.startsWith("http"))
+            continue;
+        resolvedItem[key] = `${origin}/${value}`;
+    }
+    return resolvedItem;
+}
+/**
+ * Resolves referenced fields in an item, replacing IDs with full objects.
+ * Recursively resolves nested references.
+ */
+function resolveReferences(item, schema, itemType, content, origin, resolvedIds = new Set()) {
+    const itemIdentifier = `${itemType}:${item.id}`;
+    // Prevent circular references
+    if (resolvedIds.has(itemIdentifier)) {
+        return resolveFileUrls(item, schema, itemType, origin);
+    }
+    resolvedIds.add(itemIdentifier);
+    // First resolve file URLs for the current item
+    let resolvedItem = resolveFileUrls(item, schema, itemType, origin);
+    const itemSchema = schema[itemType];
+    if (!itemSchema)
+        return resolvedItem;
+    for (const [fieldKey, fieldConfig] of Object.entries(itemSchema.fields)) {
+        if (fieldConfig.type !== "select" && fieldConfig.type !== "multiselect") {
+            continue;
+        }
+        const referencedType = getOptionsReference(fieldConfig.options);
+        if (!referencedType)
+            continue;
+        const referencedCollection = content[referencedType];
+        if (!referencedCollection)
+            continue;
+        const fieldValue = item[fieldKey];
+        if (fieldConfig.type === "select" && typeof fieldValue === "string") {
+            // Single reference - replace ID with full object
+            const referencedItem = referencedCollection[fieldValue];
+            if (referencedItem) {
+                // Recursively resolve nested references
+                resolvedItem[fieldKey] = resolveReferences(referencedItem, schema, referencedType, content, origin, new Set(resolvedIds));
+            }
+        }
+        else if (fieldConfig.type === "multiselect" &&
+            Array.isArray(fieldValue)) {
+            // Multiple references - replace IDs with full objects
+            resolvedItem[fieldKey] = fieldValue
+                .map((id) => {
+                const referencedItem = referencedCollection[id];
+                if (!referencedItem)
+                    return null;
+                // Recursively resolve nested references
+                return resolveReferences(referencedItem, schema, referencedType, content, origin, new Set(resolvedIds));
+            })
+                .filter(Boolean);
+        }
+    }
+    return resolvedItem;
+}
+/**
+ * Resolves all references in a collection.
+ */
+function resolveCollectionReferences(collection, schema, itemType, content, origin) {
+    const resolvedCollection = {};
+    for (const [itemKey, item] of Object.entries(collection)) {
+        resolvedCollection[itemKey] = resolveReferences(item, schema, itemType, content, origin);
+    }
+    return resolvedCollection;
+}
 export function createDataRoutes(config, storage) {
     const app = new OpenAPIHono();
     const cache = createCache();
@@ -70,6 +150,13 @@ export function createDataRoutes(config, storage) {
                     example: "es_ES",
                 }),
                 preview: z.string().optional(),
+                resolve: z
+                    .string()
+                    .optional()
+                    .openapi({
+                    param: { name: "resolve", in: "query" },
+                    description: "Resolve referenced fields to full objects",
+                }),
             }),
         },
         responses: {
@@ -83,9 +170,19 @@ export function createDataRoutes(config, storage) {
             },
         },
     }), async (c) => {
-        const { preview } = c.req.valid("query");
+        const { preview, resolve } = c.req.valid("query");
         const content = await cache.getContent(storage, { production: !preview });
-        return c.json(content);
+        if (!resolve) {
+            return c.json(content);
+        }
+        const origin = preview ? new URL(c.req.url).origin : publicFilesUrl;
+        // Resolve references for all collections
+        const schema = await cache.getSchema(storage);
+        const resolvedContent = {};
+        for (const [itemType, collection] of Object.entries(content)) {
+            resolvedContent[itemType] = resolveCollectionReferences(collection, schema, itemType, content, origin);
+        }
+        return c.json(resolvedContent);
     });
     app.openapi(createRoute({
         method: "get",
@@ -106,6 +203,13 @@ export function createDataRoutes(config, storage) {
                     example: "es_ES",
                 }),
                 preview: z.string().optional(),
+                resolve: z
+                    .string()
+                    .optional()
+                    .openapi({
+                    param: { name: "resolve", in: "query" },
+                    description: "Resolve referenced fields to full objects",
+                }),
             }),
         },
         responses: {
@@ -123,7 +227,7 @@ export function createDataRoutes(config, storage) {
         },
     }), async (c) => {
         const { itemType } = c.req.valid("param");
-        const { lang, preview } = c.req.valid("query");
+        const { lang, preview, resolve } = c.req.valid("query");
         const origin = preview ? new URL(c.req.url).origin : publicFilesUrl;
         const content = await cache.getContent(storage, {
             production: !preview,
@@ -149,6 +253,11 @@ export function createDataRoutes(config, storage) {
                 }
             }
         }
+        // Resolve references if requested (includes file URL resolution)
+        if (resolve) {
+            return c.json(resolveCollectionReferences(collection, schema, itemType, content, origin));
+        }
+        // Apply file URL resolution for non-resolved requests
         for (const [itemKey, itemValue] of Object.entries(collection)) {
             for (const [key, value] of Object.entries(itemValue)) {
                 if (!schema[itemType].fields[key]?.isUploadedFile)
@@ -219,6 +328,13 @@ export function createDataRoutes(config, storage) {
                     example: "es_ES",
                 }),
                 preview: z.string().optional(),
+                resolve: z
+                    .string()
+                    .optional()
+                    .openapi({
+                    param: { name: "resolve", in: "query" },
+                    description: "Resolve referenced fields to full objects",
+                }),
             }),
         },
         responses: {
@@ -236,7 +352,7 @@ export function createDataRoutes(config, storage) {
         },
     }), async (c) => {
         const { itemType, id } = c.req.valid("param");
-        const { lang, preview } = c.req.valid("query");
+        const { lang, preview, resolve } = c.req.valid("query");
         const origin = preview ? new URL(c.req.url).origin : publicFilesUrl;
         const content = await cache.getContent(storage, {
             production: !preview,
@@ -247,7 +363,7 @@ export function createDataRoutes(config, storage) {
         if (!collection) {
             return c.notFound();
         }
-        const item = collection[id];
+        let item = collection[id];
         if (!item) {
             return c.notFound();
         }
@@ -261,6 +377,12 @@ export function createDataRoutes(config, storage) {
                 }
             }
         }
+        // Resolve references if requested (includes file URL resolution)
+        if (resolve) {
+            item = resolveReferences(item, schema, itemType, content, origin);
+            return c.json(item);
+        }
+        // Apply file URL resolution for non-resolved requests
         for (const [key, value] of Object.entries(item)) {
             if (!schema[itemType].fields[key]?.isUploadedFile)
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isardsat/editorial-server",
-  "version": "6.13.2",
+  "version": "6.14.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
     "hono": "^4.9.8",
     "yaml": "^2.8.1",
     "zod": "^4.1.11",
-    "@isardsat/editorial-admin": "^6.13.2",
-    "@isardsat/editorial-common": "^6.13.2"
+    "@isardsat/editorial-common": "^6.14.0",
+    "@isardsat/editorial-admin": "^6.14.0"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.0",