@karibsen/eponyme 0.6.0 → 0.8.0

package/dist/runtime/composables/useEponymeForm.js

@@ -10,14 +10,12 @@ function resolveForm(name) {
   if (!definition) throw new Error(`[Eponyme] Unknown form "${name}". Declare it with form() in eponyme.config.ts.`);
   return definition;
 }
-const CAPTCHA_TOKEN_KEY = "_eponyme_captcha";
 export function useEponymeForm(name, options = {}) {
   const definition = resolveForm(name);
   const requestFetch = useRequestFetch();
   const serverErrors = ref({});
   const pending = ref(false);
   const submitted = ref(false);
-  const captchaToken = ref("");
   const values = ref(createDefaultEponymeData(definition.fields));
   const validation = useEponymeValidation(definition.fields, values, ref({}), { serverErrors });
   const fields = computed(() => Object.entries(definition.fields).map(([fieldName, fieldDefinition]) => ({
@@ -35,7 +33,6 @@ export function useEponymeForm(name, options = {}) {
     values.value = createDefaultEponymeData(definition.fields);
     serverErrors.value = {};
     submitted.value = false;
-    captchaToken.value = "";
     validation.reset();
   }
   async function submit() {
@@ -52,9 +49,7 @@ export function useEponymeForm(name, options = {}) {
           console.warn(`[Eponyme] Form "${name}" is managed, so its onSubmit handler is ignored.`);
         await requestFetch(`/api/eponyme-forms/${name}`, {
           method: "POST",
-          // The token travels beside the fields, never as one of them: it is
-          // transport, and the schema only knows about declared fields.
-          body: definition.captcha ? { ...values.value, [CAPTCHA_TOKEN_KEY]: captchaToken.value } : values.value
+          body: values.value
         });
       }
       submitted.value = true;
@@ -77,8 +72,6 @@ export function useEponymeForm(name, options = {}) {
     pending,
     submitted,
     honeypot: definition.honeypot,
-    requiresCaptcha: definition.captcha,
-    captchaToken,
     submit,
     reset
   };

package/dist/runtime/fields/index.d.ts

@@ -6,12 +6,14 @@ import { date, today } from './date.js';
 import { email } from './email.js';
 import { image } from './image.js';
 import { number } from './number.js';
+import { phone } from './phone.js';
 import { radio } from './radio.js';
 import { richText } from './rich-text.js';
 import { section } from './section.js';
 import { select } from './select.js';
 import { slug } from './slug.js';
 import { string } from './string.js';
+import { tags } from './tags.js';
 import { tab } from './tab.js';
 import { textarea } from './textarea.js';
 import { url } from './url.js';
@@ -19,6 +21,7 @@ export declare const field: {
     string: typeof string;
     slug: typeof slug;
     email: typeof email;
+    phone: typeof phone;
     url: typeof url;
     textarea: typeof textarea;
     richText: typeof richText;
@@ -28,6 +31,7 @@ export declare const field: {
     select: typeof select;
     radio: typeof radio;
     checkboxGroup: typeof checkboxGroup;
+    tags: typeof tags;
     date: typeof date;
     color: typeof color;
     array: typeof array;

package/dist/runtime/fields/index.js

@@ -6,14 +6,16 @@ import { date, today } from "./date.js";
 import { email } from "./email.js";
 import { image } from "./image.js";
 import { number } from "./number.js";
+import { phone } from "./phone.js";
 import { radio } from "./radio.js";
 import { richText } from "./rich-text.js";
 import { section } from "./section.js";
 import { select } from "./select.js";
 import { slug } from "./slug.js";
 import { string } from "./string.js";
+import { tags } from "./tags.js";
 import { tab } from "./tab.js";
 import { textarea } from "./textarea.js";
 import { url } from "./url.js";
-export const field = { string, slug, email, url, textarea, richText, number, boolean, image, select, radio, checkboxGroup, date, color, array, section, tab };
+export const field = { string, slug, email, phone, url, textarea, richText, number, boolean, image, select, radio, checkboxGroup, tags, date, color, array, section, tab };
 export { today };

package/dist/runtime/fields/phone.d.ts

@@ -0,0 +1,2 @@
+import type { PhoneFieldDefinition, PhoneFieldOptions } from '../types/field.js';
+export declare function phone(options?: PhoneFieldOptions): PhoneFieldDefinition;

package/dist/runtime/fields/phone.js

@@ -0,0 +1,3 @@
+export function phone(options = {}) {
+  return { type: "phone", options };
+}

package/dist/runtime/fields/tags.d.ts

@@ -0,0 +1,6 @@
+import type { TagsFieldDefinition, TagsFieldOptions } from '../types/field.js';
+/**
+ * The whole options object is the type parameter, so the literals an author writes —
+ * the suggestions and `allowCustom` — survive into the value type. See `TagsValueOf`.
+ */
+export declare function tags<const O extends TagsFieldOptions>(options?: O): TagsFieldDefinition<O>;

package/dist/runtime/fields/tags.js

@@ -0,0 +1,3 @@
+export function tags(options = {}) {
+  return { type: "tags", options };
+}

package/dist/runtime/middleware/eponyme-auth.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nuxt/app").RouteMiddleware;
+declare const _default: import("#app").RouteMiddleware;
 export default _default;

package/dist/runtime/middleware/eponyme-owner.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nuxt/app").RouteMiddleware;
+declare const _default: import("#app").RouteMiddleware;
 export default _default;

package/dist/runtime/pages/EponymeIndexPage.vue

@@ -104,9 +104,6 @@ function closePreview() {
     <section class="ep:mx-auto ep:w-full ep:max-w-3xl ep:px-6 ep:py-8 ep:md:px-10 ep:md:py-12">
       <div class="ep:flex ep:flex-wrap ep:items-start ep:justify-between ep:gap-4">
         <div>
-          <p class="ep:m-0 ep:text-[11px] ep:font-semibold ep:tracking-widest ep:text-muted-ep ep:uppercase">
-            Eponyme
-          </p>
           <h1 class="ep:mt-2 ep:text-3xl ep:font-semibold ep:tracking-tight ep:text-white">
             Content entries
           </h1>

package/dist/runtime/server/api/eponyme-collections/[path].get.js

@@ -4,12 +4,50 @@ import { requireEponymeUser } from "../../utils/auth.js";
 import { getEponymeCacheTags, setEponymePublicCache } from "../../utils/eponyme-cache.js";
 import { interpolateEponymeContent } from "../../utils/eponyme-variables.js";
 const MAX_TAKE = 200;
+const OPERATORS = ["gte", "lte", "gt", "lt", "contains", "in", "not"];
+const LIST_OPERATORS = /* @__PURE__ */ new Set(["in", "not"]);
+const FILTER_KEY = /^where\[([^\]]+)\](?:\[([^\]]+)\])?$/;
 function readCount(raw, min, max) {
   if (raw === void 0 || raw === "") return void 0;
   const value = Number(raw);
   if (!Number.isFinite(value)) return void 0;
   return Math.min(max, Math.max(min, Math.trunc(value)));
 }
+function readFilter(query, allowed) {
+  const where = {};
+  for (const [rawKey, rawValue] of Object.entries(query)) {
+    const match = FILTER_KEY.exec(rawKey);
+    if (!match) continue;
+    const [, key, operator] = match;
+    if (!allowed?.includes(key)) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: `Unknown filter key "${key}". Available keys: ${allowed?.join(", ") || "none"}.`
+      });
+    }
+    if (operator === void 0) {
+      const values = (Array.isArray(rawValue) ? rawValue : [rawValue]).map(String).filter(Boolean);
+      if (values.length) where[key] = values.length === 1 ? values[0] : values;
+      continue;
+    }
+    if (!OPERATORS.includes(operator)) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: `Unknown filter operator "${operator}". Available operators: ${OPERATORS.join(", ")}.`
+      });
+    }
+    const existing = where[key];
+    const operators = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+    if (LIST_OPERATORS.has(operator)) {
+      const values = (Array.isArray(rawValue) ? rawValue : [rawValue]).map(String).filter(Boolean);
+      if (values.length) operators[operator] = values;
+    } else {
+      operators[operator] = String(Array.isArray(rawValue) ? rawValue[0] : rawValue);
+    }
+    where[key] = operators;
+  }
+  return Object.keys(where).length ? where : void 0;
+}
 export default defineEventHandler(async (event) => {
   const name = decodeURIComponent(getRequestURL(event).pathname.replace(/^\/api\/eponyme-collections\//, ""));
   const query = getQuery(event);
@@ -33,7 +71,8 @@ export default defineEventHandler(async (event) => {
     take: readCount(query.take, 1, MAX_TAKE),
     skip: readCount(query.skip, 0, Number.MAX_SAFE_INTEGER),
     orderBy,
-    order: query.order === "asc" ? "asc" : query.order === "desc" ? "desc" : void 0
+    order: query.order === "asc" ? "asc" : query.order === "desc" ? "desc" : void 0,
+    where: readFilter(query, service.collectionFilterKeys(name))
   });
   if (!page) throw createError({ statusCode: 404, statusMessage: "Eponyme collection not found." });
   return query.raw ? page : interpolateEponymeContent(page);

package/dist/runtime/server/api/eponyme-forms/[path].post.js

@@ -1,7 +1,6 @@
 import { createError, defineEventHandler, getRequestHeader, readRawBody, setResponseHeader, setResponseStatus } from "h3";
 import { useEponymeFormService } from "../../services/eponyme-form-service.js";
 import { readEponymeFormRoute } from "../../utils/form-route.js";
-import { CAPTCHA_TOKEN_KEY, isEponymeCaptchaConfigured, verifyEponymeCaptcha } from "../../utils/eponyme-captcha.js";
 import { callEponymeBlockingHook, callEponymeHook } from "../../utils/eponyme-hooks.js";
 export default defineEventHandler(async (event) => {
   const route = readEponymeFormRoute(event);
@@ -27,20 +26,6 @@ export default defineEventHandler(async (event) => {
     setResponseStatus(event, 201);
     return { submitted: true };
   }
-  if (definition.captcha) {
-    if (!isEponymeCaptchaConfigured()) {
-      throw createError({
-        statusCode: 500,
-        statusMessage: `Form "${route.name}" requires a captcha but no adapter is installed. Add one, such as @karibsen/eponyme-captcha.`
-      });
-    }
-    const token = payload && typeof payload === "object" ? payload[CAPTCHA_TOKEN_KEY] : void 0;
-    const result2 = await verifyEponymeCaptcha(event, token);
-    if (!result2.success) {
-      setResponseStatus(event, 422);
-      return { errors: { _form: ["Captcha verification failed. Please try again."] } };
-    }
-  }
   const validated = service.validate(route.name, payload);
   if (validated && "errors" in validated) {
     setResponseStatus(event, 422);

package/dist/runtime/server/plugins/eponyme-sync.js

@@ -1,4 +1,4 @@
-import { defineNitroPlugin } from "nitropack/runtime";
+import { defineNitroPlugin, useRuntimeConfig } from "nitropack/runtime";
 import { useEponymeAuthService } from "../services/eponyme-auth-service.js";
 import { useEponymeService } from "../services/eponyme-service.js";
 export default defineNitroPlugin(async () => {
@@ -11,4 +11,14 @@ export default defineNitroPlugin(async () => {
     );
   }
   await useEponymeService().syncAll();
+  const content = useRuntimeConfig().eponymeContent;
+  if (content?.autoReindex === false) return;
+  try {
+    await useEponymeService().syncIndexState();
+  } catch (error) {
+    throw new Error(
+      "[Eponyme] Index rebuild failed. Apply the EponymeEntryIndex and EponymeIndexState Prisma migrations before starting the application, or set `eponyme.autoReindex: false` to start without it and run `reindexEponymeEntries()` by hand.",
+      { cause: error }
+    );
+  }
 });

package/dist/runtime/server/services/eponyme-form-store.d.ts

@@ -1,5 +1,6 @@
 import type { EponymeConfig, EponymeFormDefinitionBase } from '../../types/index.js';
 import { type ValidationErrors } from '../../utils/validate-eponyme-data.js';
+/** Kept here rather than imported, so the store stays free of H3 imports. */
 type DateValue = Date | string;
 export interface EponymeFormSubmission {
     id: string;

package/dist/runtime/server/services/eponyme-form-store.js

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
+import { normalizeEponymeValues } from "../../utils/normalize-eponyme-values.js";
 import { getEponymeForms } from "../../utils/get-eponyme-schemas.js";
 import { validateEponymeData } from "../../utils/validate-eponyme-data.js";
-const CAPTCHA_TOKEN_KEY = "_eponyme_captcha";
 const DEFAULT_PER_PAGE = 25;
 const MAX_PER_PAGE = 100;
 export class EponymeFormService {
@@ -37,10 +37,11 @@ export class EponymeFormService {
     if (!payload || typeof payload !== "object" || Array.isArray(payload))
       return { errors: { _form: ["Body must be an object."] } };
     const input = payload;
-    const { [definition.honeypot || ""]: _honeypot, [CAPTCHA_TOKEN_KEY]: _captcha, ...rest } = input;
-    const unknownKeys = Object.keys(rest).filter((key) => !(key in definition.fields));
+    const { [definition.honeypot || ""]: _honeypot, ...submitted } = input;
+    const unknownKeys = Object.keys(submitted).filter((key) => !(key in definition.fields));
     if (unknownKeys.length)
       return { errors: Object.fromEntries(unknownKeys.map((key) => [key, ["Unknown field."]])) };
+    const rest = normalizeEponymeValues(definition.fields, submitted);
     const errors = validateEponymeData(definition.fields, rest, "publish");
     if (Object.keys(errors).length) return { errors };
     return { data: rest };