mktcms 0.1.30 → 0.1.31

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "mktcms",
   "configKey": "mktcms",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -10,12 +10,6 @@ const module$1 = defineNuxtModule({
     const resolver = createResolver(import.meta.url);
     _nuxt.options.runtimeConfig.mktcms = defu((_nuxt.options.runtimeConfig.mktcms, {
       adminAuthKey: "",
-      s3AccessKey: "",
-      s3SecretKey: "",
-      s3Endpoint: "",
-      s3Bucket: "",
-      s3Region: "",
-      s3Prefix: "",
       smtpHost: "",
       smtpPort: 465,
       smtpSecure: true,

package/dist/runtime/server/api/admin/blob.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { createError, defineEventHandler, getValidatedQuery, send } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { toNodeBuffer } from "../../utils/toNodeBuffer.js";
 const querySchema = z.object({
   path: z.string().min(1)
@@ -8,10 +8,8 @@ const querySchema = z.object({
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  const file = await storage.getItemRaw(fullPath);
+  const file = await storage.getItemRaw(decodedPath);
   if (!file) {
     throw createError({
       statusCode: 404,

package/dist/runtime/server/api/admin/csv.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { createError, defineEventHandler, getValidatedQuery } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { parse } from "csv-parse/sync";
 const querySchema = z.object({
   path: z.string().min(1)
@@ -8,10 +8,8 @@ const querySchema = z.object({
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  const file = await storage.getItem(fullPath);
+  const file = await storage.getItem(decodedPath);
   if (!file) {
     throw createError({
       statusCode: 404,

package/dist/runtime/server/api/admin/csv.post.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery, readValidatedBody } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { stringify } from "csv-stringify/sync";
 const querySchema = z.object({
   path: z.string().min(1)
@@ -15,14 +15,12 @@ export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const { table } = await readValidatedBody(event, (body) => bodySchema.parse(body));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const content = stringify(table.rows, {
     header: true,
     columns: table.headers,
     delimiter: ";"
   });
   const storage = useStorage("content");
-  await storage.setItem(fullPath, content);
+  await storage.setItem(decodedPath, content);
   return { success: true };
 });

package/dist/runtime/server/api/admin/delete.js

@@ -1,15 +1,13 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 const querySchema = z.object({
   path: z.string().min(1)
 });
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  await storage.removeItem(fullPath);
+  await storage.removeItem(decodedPath);
   return { success: true };
 });

package/dist/runtime/server/api/admin/download.js

@@ -1,16 +1,14 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 const querySchema = z.object({
   path: z.string().min(1)
 });
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  const file = await storage.getItemRaw(fullPath);
+  const file = await storage.getItemRaw(decodedPath);
   const isImage = decodedPath.match(/\.(png|jpg|jpeg|gif|svg|webp)$/i);
   const isPdf = decodedPath.endsWith(".pdf");
   const isJson = decodedPath.endsWith(".json");

package/dist/runtime/server/api/admin/import.js

@@ -1,5 +1,5 @@
 import { createError, defineEventHandler, readMultipartFormData } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import path from "node:path";
 import unzipper from "unzipper";
 function sanitizePathSegment(segment) {
@@ -28,12 +28,8 @@ function zipPathToColonKey(entryPath) {
   const sanitizedParts = parts.map(sanitizePathSegment);
   return sanitizedParts.join(":");
 }
-function withPrefix(s3Prefix, colonKey) {
-  return [s3Prefix, colonKey].filter(Boolean).join(":");
-}
 export default defineEventHandler(async (event) => {
   const form = await readMultipartFormData(event);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
   if (!form) {
     throw createError({
       statusCode: 400,
@@ -82,10 +78,9 @@ export default defineEventHandler(async (event) => {
         statusMessage: `Invalid ZIP entry path: ${entry.path}`
       });
     }
-    const fullKey = withPrefix(s3Prefix, fileColonKey);
     const data = await entry.buffer();
-    await storage.setItemRaw(fullKey, data);
-    written.add(fullKey);
+    await storage.setItemRaw(fileColonKey, data);
+    written.add(fileColonKey);
   }
   return { success: true, count: written.size };
 });

package/dist/runtime/server/api/admin/list.js

@@ -1,5 +1,5 @@
 import z from "zod";
-import { useStorage, useRuntimeConfig } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { defineEventHandler, getValidatedQuery } from "h3";
 const querySchema = z.object({
   path: z.string().optional(),
@@ -8,14 +8,12 @@ const querySchema = z.object({
 export default defineEventHandler(async (event) => {
   const { path, type } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = path ? decodeURIComponent(path) : "";
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const pathPrefix = s3Prefix + (decodedPath ? ":" + decodedPath : "");
   const storage = useStorage("content");
-  const keys = await storage.getKeys(pathPrefix);
-  const keysWithoutPrefix = keys.map((key) => key.replace(pathPrefix + ":", ""));
-  const files = keysWithoutPrefix.filter((key) => !key.includes(":"));
+  const keys = await storage.getKeys(decodedPath);
+  const keysWithoutPath = decodedPath ? keys.map((key) => key.replace(decodedPath + ":", "")) : keys;
+  const files = keysWithoutPath.filter((key) => !key.includes(":"));
   const filteredFiles = type === "image" ? files.filter((file) => file.match(/\.(png|jpg|jpeg|gif|svg|webp)$/i)) : files;
-  const dirs = keysWithoutPrefix.filter((key) => key.includes(":")).map((key) => key.split(":")[0]);
+  const dirs = keysWithoutPath.filter((key) => key.includes(":")).map((key) => key.split(":")[0]);
   const uniqueDirs = Array.from(new Set(dirs));
   return {
     files: filteredFiles,

package/dist/runtime/server/api/admin/md.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { createError, defineEventHandler, getValidatedQuery } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { parseFrontmatter } from "../../utils/parseFrontmatter.js";
 const querySchema = z.object({
   path: z.string().min(1)
@@ -8,10 +8,8 @@ const querySchema = z.object({
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  const file = await storage.getItem(fullPath);
+  const file = await storage.getItem(decodedPath);
   if (!file) {
     throw createError({
       statusCode: 404,

package/dist/runtime/server/api/admin/md.post.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery, readValidatedBody } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { stringify } from "yaml";
 const querySchema = z.object({
   path: z.string().min(1)
@@ -23,9 +23,7 @@ export default defineEventHandler(async (event) => {
   const { frontmatter, markdown } = await readValidatedBody(event, (body) => bodySchema.parse(body));
   const decodedPath = decodeURIComponent(path);
   const content = buildContent(frontmatter, markdown);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  await storage.setItem(fullPath, content);
+  await storage.setItem(decodedPath, content);
   return { success: true };
 });

package/dist/runtime/server/api/admin/txt.js

@@ -1,16 +1,14 @@
 import { z } from "zod";
 import { createError, defineEventHandler, getValidatedQuery } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 const querySchema = z.object({
   path: z.string().min(1)
 });
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  const file = await storage.getItem(fullPath);
+  const file = await storage.getItem(decodedPath);
   if (!file) {
     throw createError({
       statusCode: 404,

package/dist/runtime/server/api/admin/txt.post.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery, readValidatedBody } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 const querySchema = z.object({
   path: z.string().min(1)
 });
@@ -11,9 +11,7 @@ export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const { text } = await readValidatedBody(event, (body) => bodySchema.parse(body));
   const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
   const storage = useStorage("content");
-  await storage.setItem(fullPath, text);
+  await storage.setItem(decodedPath, text);
   return { success: true };
 });

package/dist/runtime/server/api/admin/upload.js

@@ -1,6 +1,6 @@
 import z from "zod";
 import { createError, defineEventHandler, getValidatedQuery, readMultipartFormData } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 function sanitizeFilename(filename) {
   return filename.replace(/[/:\\]/g, "_");
 }
@@ -9,7 +9,6 @@ const querySchema = z.object({
 });
 export default defineEventHandler(async (event) => {
   const form = await readMultipartFormData(event);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const sanePath = path ? path.replace(/^\//, "").replace(/\/$/, "") : void 0;
   if (!form) {
@@ -39,7 +38,7 @@ export default defineEventHandler(async (event) => {
       statusMessage: "Invalid file type. Only PDF, JPG, JPEG, PNG, GIF, SVG, WEBP, MD, DOCX, TXT, CSV, and JSON files are allowed."
     });
   }
-  const filePath = [s3Prefix, sanePath, sanitizeFilename(file.filename)].filter(Boolean).join(":");
+  const filePath = [sanePath, sanitizeFilename(file.filename)].filter(Boolean).join(":");
   await useStorage("content").setItemRaw(filePath, Buffer.from(file.data));
   return { success: true, path: filePath };
 });

package/dist/runtime/server/api/content/[path].js

@@ -1,85 +1,46 @@
 import { z } from "zod";
 import { createError, defineEventHandler, getValidatedRouterParams, send } from "h3";
-import { useRuntimeConfig, useStorage } from "nitropack/runtime";
-import { parse } from "csv-parse/sync";
-import { marked } from "marked";
-import { parseFrontmatter } from "../../utils/parseFrontmatter.js";
+import { useStorage } from "nitropack/runtime";
 import { toNodeBuffer } from "../../utils/toNodeBuffer.js";
-function parsedFile(fullPath, file) {
-  if (fullPath.endsWith(".json") && typeof file === "string") {
-    try {
-      return JSON.parse(file);
-    } catch {
-      throw createError({
-        statusCode: 500,
-        statusMessage: "Invalid JSON file"
-      });
-    }
-  }
-  if (fullPath.endsWith(".csv") && typeof file === "string") {
-    try {
-      const table = parse(file, {
-        skip_empty_lines: true,
-        delimiter: ";"
-      });
-      const headers = Array.isArray(table[0]) ? table[0].map((cell) => String(cell ?? "")) : [];
-      const rows = table.slice(1);
-      return { headers, rows };
-    } catch {
-      throw createError({
-        statusCode: 500,
-        statusMessage: "Invalid CSV file"
-      });
-    }
-  }
-  if (fullPath.endsWith(".md") && typeof file === "string") {
-    try {
-      const markdownItem = parseFrontmatter(file);
-      return {
-        ...markdownItem,
-        html: marked.parse(markdownItem.markdown)
-      };
-    } catch {
-      throw createError({
-        statusCode: 500,
-        statusMessage: "Invalid Markdown file"
-      });
-    }
-  }
-  return file;
+import { parsedFile } from "../../utils/parsedFile.js";
+function getFileType(path) {
+  const isImage = path.match(/\.(png|jpg|jpeg|gif|svg|webp)$/i);
+  const isPdf = path.endsWith(".pdf");
+  const isJson = path.endsWith(".json");
+  const isCSV = path.endsWith(".csv");
+  const isMarkdown = path.endsWith(".md");
+  return { isImage, isPdf, isJson, isCSV, isMarkdown };
 }
-const paramsSchema = z.object({
-  path: z.string().min(1)
-});
-export default defineEventHandler(async (event) => {
-  const { path } = await getValidatedRouterParams(event, (params) => paramsSchema.parse(params));
-  const decodedPath = decodeURIComponent(path);
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + decodedPath;
-  const isImage = decodedPath.match(/\.(png|jpg|jpeg|gif|svg|webp)$/i);
-  const isPdf = decodedPath.endsWith(".pdf");
-  const isJson = decodedPath.endsWith(".json");
-  const isCSV = decodedPath.endsWith(".csv");
-  const isMarkdown = decodedPath.endsWith(".md");
+function getContentType(path) {
+  const { isImage, isPdf, isJson, isCSV, isMarkdown } = getFileType(path);
   if (isImage) {
-    const ext = decodedPath.split(".").pop()?.toLowerCase();
+    const ext = path.split(".").pop()?.toLowerCase();
     if (ext === "svg") {
-      event.node.res.setHeader("Content-Type", "image/svg+xml");
+      return "image/svg+xml";
     } else if (ext === "jpg") {
-      event.node.res.setHeader("Content-Type", "image/jpeg");
+      return "image/jpeg";
     } else {
-      event.node.res.setHeader("Content-Type", "image/" + ext);
+      return "image/" + ext;
     }
   } else if (isPdf) {
-    event.node.res.setHeader("Content-Type", "application/pdf");
+    return "application/pdf";
   } else if (isJson || isCSV || isMarkdown) {
-    event.node.res.setHeader("Content-Type", "application/json; charset=utf-8");
+    return "application/json; charset=utf-8";
   } else {
-    event.node.res.setHeader("Content-Type", "text/plain; charset=utf-8");
+    return "text/plain; charset=utf-8";
   }
+}
+const paramsSchema = z.object({
+  path: z.string().min(1)
+});
+export default defineEventHandler(async (event) => {
+  const { path } = await getValidatedRouterParams(event, (params) => paramsSchema.parse(params));
+  const decodedPath = decodeURIComponent(path);
+  const { isImage, isPdf } = getFileType(decodedPath);
+  event.node.res.setHeader("Content-Type", getContentType(decodedPath));
   const storage = useStorage("content");
   if (isImage || isPdf) {
-    const raw = await storage.getItemRaw(fullPath);
+    const raw = await storage.getItemRaw(decodedPath);
     if (!raw) {
       throw createError({
         statusCode: 404,
@@ -90,12 +51,12 @@ export default defineEventHandler(async (event) => {
     event.node.res.setHeader("Content-Length", String(body.byteLength));
     return send(event, body);
   }
-  const file = await storage.getItem(fullPath);
+  const file = await storage.getItem(decodedPath);
   if (!file) {
     throw createError({
       statusCode: 404,
       statusMessage: "File not found"
     });
   }
-  return parsedFile(fullPath, file);
+  return parsedFile(decodedPath, file);
 });

package/dist/runtime/server/api/content/list.js

@@ -1,5 +1,5 @@
 import z from "zod";
-import { useStorage, useRuntimeConfig } from "nitropack/runtime";
+import { useStorage } from "nitropack/runtime";
 import { defineEventHandler, getValidatedQuery } from "h3";
 import { marked } from "marked";
 import { parseFrontmatter } from "../../utils/parseFrontmatter.js";
@@ -10,9 +10,8 @@ const querySchema = z.object({
 export default defineEventHandler(async (event) => {
   const { path, type } = await getValidatedQuery(event, (query) => querySchema.parse(query));
   const decodedPath = path ? decodeURIComponent(path) : void 0;
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
   const storage = useStorage("content");
-  const keys = await storage.getKeys(s3Prefix + (decodedPath ? ":" + decodedPath : ""));
+  const keys = await storage.getKeys(decodedPath);
   const filteredKeys = keys.filter((key) => {
     if (type === "md") {
       return key.endsWith(".md");
@@ -32,14 +31,14 @@ export default defineEventHandler(async (event) => {
     return false;
   });
   if (type === "image") {
-    return filteredKeys.map((key) => key.replace(s3Prefix + ":", ""));
+    return filteredKeys;
   }
   const items = await storage.getItems(filteredKeys);
   return items.map((item) => {
     if (type === "md" && typeof item.value === "string") {
       const markdownItem = parseFrontmatter(item.value);
       return {
-        key: item.key.replace(s3Prefix + ":", ""),
+        key: item.key,
         value: {
           ...markdownItem,
           html: marked.parse(markdownItem.markdown)

package/dist/runtime/server/plugins/storage.js

@@ -1,20 +1,8 @@
-import createS3Driver from "unstorage/drivers/s3";
 import createFsDriver from "unstorage/drivers/fs";
-import { defineNitroPlugin, useStorage, useRuntimeConfig } from "nitropack/runtime";
+import { defineNitroPlugin, useStorage } from "nitropack/runtime";
 export default defineNitroPlugin(() => {
   const storage = useStorage();
-  const { mktcms: { s3AccessKey, s3SecretKey, s3Endpoint, s3Bucket, s3Region } } = useRuntimeConfig();
-  if (s3AccessKey && s3SecretKey && s3Endpoint && s3Bucket && s3Region) {
-    storage.mount("content", createS3Driver({
-      accessKeyId: s3AccessKey,
-      secretAccessKey: s3SecretKey,
-      endpoint: s3Endpoint,
-      bucket: s3Bucket,
-      region: s3Region
-    }));
-  } else {
-    storage.mount("content", createFsDriver({
-      base: "./.storage"
-    }));
-  }
+  storage.mount("content", createFsDriver({
+    base: "./.storage"
+  }));
 });

package/dist/runtime/server/utils/parsedFile.d.ts

@@ -0,0 +1 @@
+export declare function parsedFile(fullPath: string, file: string | number | boolean | object): any;

package/dist/runtime/server/utils/parsedFile.js

@@ -0,0 +1,47 @@
+import { createError } from "h3";
+import { parse } from "csv-parse/sync";
+import { marked } from "marked";
+import { parseFrontmatter } from "./parseFrontmatter.js";
+export function parsedFile(fullPath, file) {
+  if (fullPath.endsWith(".json") && typeof file === "string") {
+    try {
+      return JSON.parse(file);
+    } catch {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Invalid JSON file"
+      });
+    }
+  }
+  if (fullPath.endsWith(".csv") && typeof file === "string") {
+    try {
+      const table = parse(file, {
+        skip_empty_lines: true,
+        delimiter: ";"
+      });
+      const headers = Array.isArray(table[0]) ? table[0].map((cell) => String(cell ?? "")) : [];
+      const rows = table.slice(1);
+      return { headers, rows };
+    } catch {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Invalid CSV file"
+      });
+    }
+  }
+  if (fullPath.endsWith(".md") && typeof file === "string") {
+    try {
+      const markdownItem = parseFrontmatter(file);
+      return {
+        ...markdownItem,
+        html: marked.parse(markdownItem.markdown)
+      };
+    } catch {
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Invalid Markdown file"
+      });
+    }
+  }
+  return file;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",
@@ -39,7 +39,6 @@
   "dependencies": {
     "@nuxt/kit": "^4.2.2",
     "@vueuse/core": "^14.1.0",
-    "aws4fetch": "^1.0.20",
     "csv-parse": "^6.1.0",
     "csv-stringify": "^6.6.0",
     "defu": "^6.1.4",