mktcms 0.1.15 → 0.1.17

package/dist/module.json

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

package/dist/module.mjs

@@ -41,6 +41,10 @@ const module$1 = defineNuxtModule({
       route: "/api/admin/logout",
       handler: resolver.resolve("./runtime/server/api/admin/logout")
     });
+    addServerHandler({
+      route: "/api/admin/content/list",
+      handler: resolver.resolve("./runtime/server/api/admin/content/list")
+    });
     addServerHandler({
       route: "/api/admin/content/:path",
       method: "get",

package/dist/runtime/app/components/content/index.vue

@@ -3,7 +3,7 @@ import { useFetch, useRoute } from "#app";
 import { computed } from "vue";
 const path = useRoute().params.path || "";
 const pathParts = path.split(":");
-const { data: keys } = await useFetch("/api/content/list", {
+const { data: keys } = await useFetch("/api/admin/content/list", {
   query: { path }
 });
 const keysWithoutCurrentPath = computed(() => {

package/dist/runtime/server/api/admin/content/list.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<string[]>>;
+export default _default;

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

@@ -0,0 +1,20 @@
+import z from "zod";
+import { useStorage, useRuntimeConfig } from "nitropack/runtime";
+import { defineEventHandler, getValidatedQuery } from "h3";
+const querySchema = z.object({
+  path: z.string().optional()
+});
+export default defineEventHandler(async (event) => {
+  const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
+  const { mktcms: { s3Prefix } } = useRuntimeConfig();
+  const storage = useStorage("content");
+  const keys = await storage.getKeys(s3Prefix + (path ? ":" + path : ""));
+  const fallbackStorage = useStorage("fallback");
+  const fallbackKeys = await fallbackStorage.getKeys(s3Prefix + (path ? ":" + path : ""));
+  for (const key of fallbackKeys) {
+    if (!keys.includes(key)) {
+      keys.push(key);
+    }
+  }
+  return keys.map((key) => key.replace(s3Prefix + ":", ""));
+});

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

@@ -3,26 +3,7 @@ import { createError, defineEventHandler, getValidatedRouterParams } from "h3";
 import { useRuntimeConfig, useStorage } from "nitropack/runtime";
 import { parse } from "csv-parse/sync";
 import { marked } from "marked";
-const paramsSchema = z.object({
-  path: z.string().min(1)
-});
-export default defineEventHandler(async (event) => {
-  const { path } = await getValidatedRouterParams(event, (params) => paramsSchema.parse(params));
-  const { mktcms: { s3Prefix } } = useRuntimeConfig();
-  const fullPath = s3Prefix + ":" + path;
-  const storage = useStorage("content");
-  const file = await storage.getItem(fullPath);
-  if (!file) {
-    const fallbackStorage = useStorage("fallback");
-    const fallbackFile = await fallbackStorage.getItem(fullPath);
-    if (fallbackFile) {
-      return fallbackFile;
-    }
-    throw createError({
-      statusCode: 404,
-      statusMessage: "File not found"
-    });
-  }
+function parsedFile(fullPath, file) {
   if (fullPath.endsWith(".json") && typeof file === "string") {
     try {
       return JSON.parse(file);
@@ -59,4 +40,26 @@ export default defineEventHandler(async (event) => {
     }
   }
   return file;
+}
+const paramsSchema = z.object({
+  path: z.string().min(1)
+});
+export default defineEventHandler(async (event) => {
+  const { path } = await getValidatedRouterParams(event, (params) => paramsSchema.parse(params));
+  const { mktcms: { s3Prefix } } = useRuntimeConfig();
+  const fullPath = s3Prefix + ":" + path;
+  const storage = useStorage("content");
+  const file = await storage.getItem(fullPath);
+  if (!file) {
+    const fallbackStorage = useStorage("fallback");
+    const fallbackFile = await fallbackStorage.getItem(fullPath);
+    if (fallbackFile) {
+      return parsedFile(fullPath, fallbackFile);
+    }
+    throw createError({
+      statusCode: 404,
+      statusMessage: "File not found"
+    });
+  }
+  return parsedFile(fullPath, file);
 });

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

@@ -9,5 +9,12 @@ export default defineEventHandler(async (event) => {
   const { mktcms: { s3Prefix } } = useRuntimeConfig();
   const storage = useStorage("content");
   const keys = await storage.getKeys(s3Prefix + (path ? ":" + path : ""));
+  const fallbackStorage = useStorage("fallback");
+  const fallbackKeys = await fallbackStorage.getKeys(s3Prefix + (path ? ":" + path : ""));
+  for (const key of fallbackKeys) {
+    if (!keys.includes(key)) {
+      keys.push(key);
+    }
+  }
   return keys.map((key) => key.replace(s3Prefix + ":", ""));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",