@isardsat/editorial-server 6.4.3 → 6.5.0

package/dist/lib/storage.d.ts

@@ -12,7 +12,9 @@ export declare function createStorage(dataDirectory: string): {
         }, import("zod").ZodTypeAny, "passthrough">>;
         singleton?: boolean | undefined;
     }>>;
-    getContent: () => Promise<EditorialData>;
+    getContent: ({ production, }: {
+        production?: boolean;
+    }) => Promise<EditorialData>;
     getLocalisationMessages: (langCode: string) => Promise<any>;
     saveLocalisationMessages: (messages: any) => Promise<boolean>;
     createItem: (item: EditorialDataObjectWithType) => Promise<import("zod").objectOutputType<{

package/dist/lib/storage.js

@@ -16,14 +16,14 @@ export function createStorage(dataDirectory) {
     /**
      * TODO: This should ideally cache the result of reading the file until an update occurs.
      */
-    async function getContent() {
-        return await readFile(dataPath, "utf-8").then((value) => JSON.parse(value));
+    async function getContent({ production, }) {
+        return await readFile(production ? dataProdPath : dataPath, "utf-8").then((value) => JSON.parse(value));
     }
     async function getLocalisationMessages(langCode) {
         return await readFile(join(dataDirectory, "locales", "messages", `${langCode}.json`), "utf-8").then((value) => JSON.parse(value));
     }
     async function saveContent({ production }) {
-        const content = await getContent();
+        const content = await getContent({ production: false });
         await writeFileSafe(production ? dataProdPath : dataPath, JSON.stringify(EditorialDataSchema.parse(content), null, 2));
         return true;
     }
@@ -32,7 +32,7 @@ export function createStorage(dataDirectory) {
         return true;
     }
     async function createItem(item) {
-        const content = await getContent();
+        const content = await getContent({ production: false });
         content[item.type] = content[item.type] ?? {};
         content[item.type][item.id] = EditorialDataItemSchema.parse(item);
         // TODO: Use superjson to safely encode different types.
@@ -40,7 +40,7 @@ export function createStorage(dataDirectory) {
         return item;
     }
     async function updateItem(item) {
-        const content = await getContent();
+        const content = await getContent({ production: false });
         const oldItem = content[item.type][item.id];
         const newItem = EditorialDataItemSchema.parse({
             ...oldItem,
@@ -53,7 +53,7 @@ export function createStorage(dataDirectory) {
         return newItem;
     }
     async function deleteItem(item) {
-        const content = await getContent();
+        const content = await getContent({ production: false });
         delete content[item.type][item.id];
         // TODO: Use superjson to safely encode different types.
         await writeFileSafe(dataPath, JSON.stringify(content, null, 2));

package/dist/lib/utils/fs.js

@@ -1,6 +1,6 @@
-import { copyFile, rename, writeFile } from 'fs/promises';
-import { tmpdir } from 'os';
-import { basename, dirname, join } from 'path';
+import { access, constants, copyFile, rename, writeFile } from "fs/promises";
+import { tmpdir } from "os";
+import { basename, dirname, join } from "path";
 /**
  * This function writes a file in as atomic a way as possible. It first creates
  * a backup of the file to be written to, writes new content to a temporary
@@ -10,7 +10,13 @@ export async function writeFileSafe(file, contents) {
     const fileName = basename(file);
     const destination = join(dirname(file), `${fileName}.${Date.now()}.tmp`);
     try {
-        await copyFile(file, join(tmpdir(), fileName));
+        try {
+            await access(file, constants.F_OK);
+            await copyFile(file, join(tmpdir(), fileName));
+        }
+        catch {
+            // File doesn't exist, skip backup
+        }
         await writeFile(destination, contents);
         await rename(destination, file);
     }

package/dist/routes/actions.js

@@ -29,8 +29,8 @@ export function createActionRoutes(storage, hooks) {
     }), 
     // TODO: Don't async, let the promises run in the background.
     async (c) => {
-        await storage.saveContent({ production: false });
-        const content = await storage.getContent();
+        await storage.saveContent({ production: true });
+        const content = await storage.getContent({ production: true });
         const schema = await storage.getSchema();
         try {
             const scriptResult = await hooks.onLocalize(content, schema);

package/dist/routes/data.js

@@ -23,6 +23,18 @@ export function createDataRoutes(config, storage) {
     app.openapi(createRoute({
         method: "get",
         path: "/data",
+        request: {
+            query: z.object({
+                lang: z
+                    .string()
+                    .optional()
+                    .openapi({
+                    param: { name: "lang", in: "query" },
+                    example: "es_ES",
+                }),
+                preview: z.string().optional(),
+            }),
+        },
         responses: {
             200: {
                 content: {
@@ -34,7 +46,8 @@ export function createDataRoutes(config, storage) {
             },
         },
     }), async (c) => {
-        const content = await storage.getContent();
+        const { preview } = c.req.valid("query");
+        const content = await storage.getContent({ production: !preview });
         return c.json(content);
     });
     app.openapi(createRoute({
@@ -75,7 +88,7 @@ export function createDataRoutes(config, storage) {
         const { itemType } = c.req.valid("param");
         const { lang, preview } = c.req.valid("query");
         const origin = preview ? new URL(c.req.url).origin : publicFilesUrl;
-        const content = await storage.getContent();
+        const content = await storage.getContent({ production: !preview });
         const schema = await storage.getSchema();
         const collection = content[itemType];
         if (!collection) {
@@ -95,6 +108,8 @@ export function createDataRoutes(config, storage) {
             for (const [key, value] of Object.entries(itemValue)) {
                 if (!schema[itemType].fields[key]?.isUploadedFile)
                     continue;
+                if (value.startsWith("http"))
+                    continue;
                 collection[itemKey][key] = `${origin}/${value}`;
             }
         }
@@ -110,6 +125,9 @@ export function createDataRoutes(config, storage) {
                     example: "newsItem",
                 }),
             }),
+            query: z.object({
+                preview: z.string().optional(),
+            }),
         },
         responses: {
             200: {
@@ -123,7 +141,8 @@ export function createDataRoutes(config, storage) {
         },
     }), async (c) => {
         const { itemType } = c.req.valid("param");
-        const content = await storage.getContent();
+        const { preview } = c.req.valid("query");
+        const content = await storage.getContent({ production: !preview });
         return c.json(Object.keys(content[itemType]));
     });
     app.openapi(createRoute({
@@ -168,7 +187,7 @@ export function createDataRoutes(config, storage) {
         const { itemType, id } = c.req.valid("param");
         const { lang, preview } = c.req.valid("query");
         const origin = preview ? new URL(c.req.url).origin : publicFilesUrl;
-        const content = await storage.getContent();
+        const content = await storage.getContent({ production: !preview });
         const schema = await storage.getSchema();
         const collection = content[itemType];
         if (!collection) {
@@ -191,6 +210,8 @@ export function createDataRoutes(config, storage) {
         for (const [key, value] of Object.entries(item)) {
             if (!schema[itemType].fields[key]?.isUploadedFile)
                 continue;
+            if (value.startsWith("http"))
+                continue;
             item[key] = `${origin}/${value}`;
         }
         return c.json(item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isardsat/editorial-server",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
     "hono": "^4.6.20",
     "yaml": "^2.7.0",
     "zod": "^3.24.1",
-    "@isardsat/editorial-admin": "^6.4.3",
-    "@isardsat/editorial-common": "^6.4.3"
+    "@isardsat/editorial-admin": "^6.5.0",
+    "@isardsat/editorial-common": "^6.5.0"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.0",