@hywax/cms 2.0.2 → 3.0.0

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

@@ -1,9 +1,8 @@
-import { HTTP_CODE_BAD_REQUEST } from "#cms/http-codes";
 import { readMultipartFormData } from "h3";
-import { InternalHttpError } from "../errors/InternalHttpError.js";
+import { createHttpError } from "./http.js";
 export function getValidatedSort(query, availableColumns) {
   if (!query.sortColumn || !availableColumns.includes(query.sortColumn)) {
-    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+    throw createHttpError("badRequest");
   }
   const sortType = query.sortType === "asc" ? "asc" : "desc";
   const sortColumn = query.sortColumn;
@@ -15,7 +14,7 @@ export function getValidatedSort(query, availableColumns) {
 export function getValidatedPagination(query) {
   const perPage = Number(query.perPage);
   if (!Number.isInteger(perPage) || perPage < 1 || perPage > 100) {
-    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+    throw createHttpError("badRequest");
   }
   const page = Number(query.page) || 1;
   const pageOffset = (page - 1) * perPage;
@@ -28,7 +27,7 @@ export function getValidatedPagination(query) {
 export async function readValidatedMultipartFormData(event, validate) {
   const formData = await readMultipartFormData(event);
   if (!formData) {
-    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+    throw createHttpError("badRequest");
   }
   try {
     const transformedFormData = {};
@@ -42,13 +41,13 @@ export async function readValidatedMultipartFormData(event, validate) {
     }
     const res = await validate(transformedFormData);
     if (res === false) {
-      throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+      throw createHttpError("badRequest");
     }
     if (res === true) {
       return formData;
     }
     return res ?? formData;
   } catch (error) {
-    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST, { cause: error });
+    throw createHttpError("badRequest", { cause: error });
   }
 }

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

@@ -7,9 +7,9 @@ export * from '../components/EditorLinkPopover.vue';
 export * from '../components/FormPanel.vue';
 export * from '../components/FormPanelAsideSection.vue';
 export * from '../components/FormPanelSection.vue';
-export * from '../components/InputSeo.vue';
-export * from '../components/InputSlug.vue';
-export * from '../components/InputUploraImage.vue';
+export * from '../components/FormSeo.vue';
+export * from '../components/FormSlug.vue';
+export * from '../components/FormUploraImage.vue';
 export * from '../components/Layout.vue';
 export * from '../components/ModalConfirm.vue';
 export * from '../components/prose/UploraImage.vue';

package/dist/runtime/types/index.js

@@ -7,9 +7,9 @@ export * from "../components/EditorLinkPopover.vue";
 export * from "../components/FormPanel.vue";
 export * from "../components/FormPanelAsideSection.vue";
 export * from "../components/FormPanelSection.vue";
-export * from "../components/InputSeo.vue";
-export * from "../components/InputSlug.vue";
-export * from "../components/InputUploraImage.vue";
+export * from "../components/FormSeo.vue";
+export * from "../components/FormSlug.vue";
+export * from "../components/FormUploraImage.vue";
 export * from "../components/Layout.vue";
 export * from "../components/ModalConfirm.vue";
 export * from "../components/prose/UploraImage.vue";

package/dist/runtime/utils/enums.d.ts

@@ -0,0 +1,4 @@
+export declare function createEnumItems<T extends Record<any, string>>(labels: T): Array<{
+    value: keyof T;
+    label: string;
+}>;

package/dist/runtime/utils/enums.js

@@ -0,0 +1,6 @@
+export function createEnumItems(labels) {
+  return Object.entries(labels).map(([value, label]) => ({
+    value,
+    label
+  }));
+}

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

@@ -1,6 +1,7 @@
 export * from './auth';
 export * from './avatar';
 export * from './date';
+export * from './enums';
 export * from './formatters';
 export * from './logger';
 export * from './slugify';

package/dist/runtime/utils/index.js

@@ -1,6 +1,7 @@
 export * from "./auth.js";
 export * from "./avatar.js";
 export * from "./date.js";
+export * from "./enums.js";
 export * from "./formatters.js";
 export * from "./logger.js";
 export * from "./slugify.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "imports": {
     "#build/cms/*": "./.nuxt/cms/*.ts",
@@ -48,7 +48,8 @@
   ],
   "peerDependencies": {
     "@unovis/ts": "^1.6.2",
-    "@unovis/vue": "^1.6.2"
+    "@unovis/vue": "^1.6.2",
+    "drizzle-orm": "^0.45.1"
   },
   "peerDependenciesMeta": {
     "@unovis/ts": {
@@ -79,16 +80,16 @@
     "scule": "^1.3.0",
     "sortablejs": "^1.15.6",
     "tinyglobby": "^0.2.15",
-    "zod": "^4.3.4"
+    "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.4.1",
+    "@antfu/eslint-config": "^6.7.3",
     "@commitlint/cli": "^20.3.0",
     "@commitlint/config-conventional": "^20.3.0",
     "@nuxt/devtools": "^3.1.1",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/schema": "^4.2.2",
-    "@nuxt/test-utils": "^3.21.0",
+    "@nuxt/test-utils": "^3.23.0",
     "@types/sortablejs": "^1.15.9",
     "@vue/test-utils": "^2.4.6",
     "changelogen-monorepo": "^0.5.0",
@@ -99,7 +100,7 @@
     "nuxt": "^4.2.2",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "vue-tsc": "^3.2.1"
+    "vue-tsc": "^3.2.2"
   },
   "resolutions": {
     "@hywax/cms": "workspace:*"

package/.nuxt/cms/http-codes.ts

@@ -1,8 +0,0 @@
-export const HTTP_CODE_BAD_REQUEST = '400: Неверный запрос'
-export const HTTP_CODE_UNAUTHORIZED = '401: Не авторизован'
-export const HTTP_CODE_FORBIDDEN = '403: Доступ запрещен'
-export const HTTP_CODE_NOT_FOUND = '404: Не найдено'
-export const HTTP_CODE_REQUEST_TIMEOUT = '408: Время ожидания запроса истекло'
-export const HTTP_CODE_INTERNAL_SERVER_ERROR = '500: Внутренняя ошибка сервера'
-export const HTTP_CODE_BAD_GATEWAY = '502: Ошибка шлюза'
-export const HTTP_CODE_SERVICE_UNAVAILABLE = '503: Сервис недоступен'

package/dist/runtime/components/InputUploraImage.d.vue.ts

@@ -1,40 +0,0 @@
-import type { AppConfig } from '@nuxt/schema';
-import type { ComponentConfig } from '../types';
-import theme from '#build/cms/input-uplora-image';
-type InputUploraImage = ComponentConfig<typeof theme, AppConfig, 'inputUploraImage'>;
-export interface InputUploraImageProps {
-    showExtensions?: boolean;
-    id?: string;
-    name?: string;
-    disabled?: boolean;
-    as?: any;
-    class?: any;
-    ui?: InputUploraImage['slots'];
-}
-export interface InputUploraImageEmits {
-    upload: [InputUploraImageModelValue];
-    delete: [];
-}
-export interface InputUploraImageModelValue {
-    image?: string;
-    alt?: string;
-    color?: string;
-    lqip?: string;
-}
-declare const _default: typeof __VLS_export;
-export default _default;
-declare const __VLS_export: import("vue").DefineComponent<InputUploraImageProps & {
-    modelValue?: InputUploraImageModelValue;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    delete: () => any;
-    "update:modelValue": (value: InputUploraImageModelValue) => any;
-    upload: (args_0: InputUploraImageModelValue) => any;
-}, string, import("vue").PublicProps, Readonly<InputUploraImageProps & {
-    modelValue?: InputUploraImageModelValue;
-}> & Readonly<{
-    onDelete?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((value: InputUploraImageModelValue) => any) | undefined;
-    onUpload?: ((args_0: InputUploraImageModelValue) => any) | undefined;
-}>, {
-    showExtensions: boolean;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/components/InputUploraImage.vue

@@ -1,181 +0,0 @@
-<template>
-  <Primitive :as="as" :class="ui.root({ class: [props.ui?.root, props.class] })">
-    <template v-if="modelValue.image">
-      <UPopover
-        :content="{ align: 'center', side: 'top', sideOffset: 8 }"
-        :ui="{ content: 'p-1' }"
-      >
-        <CUploraImage
-          :image="modelValue.image"
-          :alt="modelValue.alt"
-          :color="modelValue.color"
-          :lqip="modelValue.lqip"
-          :class="ui.image({ class: [props.ui?.image] })"
-        />
-
-        <div v-if="!modelValue.alt" :class="ui.imageActionsWarning({ class: [props.ui?.imageActionsWarning] })">
-          <UIcon :name="appConfig.ui.icons.warning" class="size-4" />
-        </div>
-
-        <template #content>
-          <div class="flex items-center gap-0.5">
-            <UPopover :ui="{ content: 'p-1' }" @update:open="syncState">
-              <UButton
-                color="neutral"
-                size="sm"
-                variant="ghost"
-                :icon="appConfig.ui.icons.editLine"
-              />
-              <template #content>
-                <UTextarea
-                  v-model="state.alt"
-                  placeholder="Введите описание..."
-                  autoresize
-                  variant="none"
-                  size="xs"
-                />
-              </template>
-            </UPopover>
-
-            <UButton
-              color="neutral"
-              size="sm"
-              variant="ghost"
-              :icon="appConfig.ui.icons.refresh"
-              @click="resetState()"
-            />
-
-            <ButtonDeleteConfirm
-              color="error"
-              size="sm"
-              variant="ghost"
-              label=""
-              :icon="appConfig.ui.icons.trash"
-              @confirm="deleteExecute(modelValue.image)"
-            />
-          </div>
-        </template>
-      </UPopover>
-    </template>
-    <div v-else :id="id" :class="ui.uploader({ class: [props.ui?.uploader] })">
-      <template v-if="uploadStatus === 'pending'">
-        <UIcon :name="appConfig.ui.icons.loading" :class="ui.uploaderPendingIcon({ class: [props.ui?.uploaderPendingIcon] })" />
-      </template>
-      <template v-else-if="uploadStatus === 'idle'">
-        <button
-          type="button"
-          :class="ui.uploaderIdleButton({ class: [props.ui?.uploaderIdleButton] })"
-          :disabled="disabled"
-          v-bind="ariaAttrs"
-          @click="open"
-        >
-          <UAvatar :icon="appConfig.ui.icons.image" size="lg" />
-
-          <p :class="ui.uploaderIdleText({ class: [props.ui?.uploaderIdleText] })">
-            Загрузить изображение
-          </p>
-          <p :class="ui.uploaderIdleExtensions({ class: [props.ui?.uploaderIdleExtensions] })">
-            {{ extensions }}
-          </p>
-        </button>
-      </template>
-      <template v-else-if="uploadStatus === 'error'">
-        <p :class="ui.uploaderErrorText({ class: [props.ui?.uploaderErrorText] })">
-          Произошла ошибка при загрузке изображения
-        </p>
-        <div :class="ui.uploaderErrorActions({ class: [props.ui?.uploaderErrorActions] })">
-          <UButton
-            label="Отменить"
-            variant="ghost"
-            color="neutral"
-            @click="resetUpload"
-          />
-          <UButton
-            label="Повторить"
-            variant="soft"
-            color="neutral"
-            @click="uploadExecute"
-          />
-        </div>
-      </template>
-    </div>
-  </Primitive>
-</template>
-
-<script>
-import theme from "#build/cms/input-uplora-image";
-import { useAppConfig, useFormField, useUploraDelete, useUploraUpload } from "#imports";
-import { imagesExtensions } from "@uplora/formats";
-import { Primitive } from "reka-ui";
-import { computed, reactive, useId } from "vue";
-import { tv } from "../tv";
-import ButtonDeleteConfirm from "./ButtonDeleteConfirm.vue";
-</script>
-
-<script setup>
-const props = defineProps({
-  showExtensions: { type: Boolean, required: false, default: true },
-  id: { type: String, required: false },
-  name: { type: String, required: false },
-  disabled: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-  ui: { type: null, required: false }
-});
-const emit = defineEmits(["upload", "delete"]);
-const modelValue = defineModel({ type: Object, ...{
-  default: () => ({
-    image: void 0,
-    alt: void 0,
-    lqip: void 0,
-    color: void 0
-  })
-} });
-const appConfig = useAppConfig();
-const extensions = computed(() => imagesExtensions.filter((extension) => extension !== "jpeg").join(", "));
-const state = reactive({
-  alt: modelValue.value.alt
-});
-const { id: _id, disabled, emitFormChange, emitFormInput, ariaAttrs } = useFormField(props);
-const id = _id.value ?? useId();
-const { open, execute: uploadExecute, status: uploadStatus, reset: resetUpload, onUploaded } = useUploraUpload({
-  accept: "image/*"
-});
-const { execute: deleteExecute, onDeleted } = useUploraDelete();
-function syncState() {
-  modelValue.value = {
-    ...modelValue.value,
-    alt: state.alt || void 0
-  };
-}
-function resetState() {
-  modelValue.value = {
-    image: void 0,
-    alt: void 0,
-    lqip: void 0,
-    color: void 0
-  };
-  emitFormChange();
-  emitFormInput();
-}
-onUploaded((file) => {
-  modelValue.value = {
-    ...modelValue.value,
-    image: file.id,
-    lqip: file.lqip,
-    color: file.color
-  };
-  emit("upload", modelValue.value);
-  emitFormChange();
-  emitFormInput();
-});
-onDeleted(() => {
-  resetUpload();
-  resetState();
-  emit("delete");
-});
-const ui = computed(() => tv({ extend: tv(theme), ...appConfig.cms?.inputUploraImage || {} })({
-  disabled: disabled.value,
-  uploaded: modelValue.value.image !== ""
-}));
-</script>

package/dist/runtime/components/InputUploraImage.vue.d.ts

@@ -1,40 +0,0 @@
-import type { AppConfig } from '@nuxt/schema';
-import type { ComponentConfig } from '../types';
-import theme from '#build/cms/input-uplora-image';
-type InputUploraImage = ComponentConfig<typeof theme, AppConfig, 'inputUploraImage'>;
-export interface InputUploraImageProps {
-    showExtensions?: boolean;
-    id?: string;
-    name?: string;
-    disabled?: boolean;
-    as?: any;
-    class?: any;
-    ui?: InputUploraImage['slots'];
-}
-export interface InputUploraImageEmits {
-    upload: [InputUploraImageModelValue];
-    delete: [];
-}
-export interface InputUploraImageModelValue {
-    image?: string;
-    alt?: string;
-    color?: string;
-    lqip?: string;
-}
-declare const _default: typeof __VLS_export;
-export default _default;
-declare const __VLS_export: import("vue").DefineComponent<InputUploraImageProps & {
-    modelValue?: InputUploraImageModelValue;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    delete: () => any;
-    "update:modelValue": (value: InputUploraImageModelValue) => any;
-    upload: (args_0: InputUploraImageModelValue) => any;
-}, string, import("vue").PublicProps, Readonly<InputUploraImageProps & {
-    modelValue?: InputUploraImageModelValue;
-}> & Readonly<{
-    onDelete?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((value: InputUploraImageModelValue) => any) | undefined;
-    onUpload?: ((args_0: InputUploraImageModelValue) => any) | undefined;
-}>, {
-    showExtensions: boolean;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/server/errors/InternalHttpError.d.ts

@@ -1,8 +0,0 @@
-interface InternalHttpErrorOptions {
-    cause?: unknown;
-}
-export declare class InternalHttpError extends Error {
-    httpCodeString: string;
-    constructor(httpCodeString: string, options?: InternalHttpErrorOptions);
-}
-export {};

package/dist/runtime/server/errors/InternalHttpError.js

@@ -1,7 +0,0 @@
-export class InternalHttpError extends Error {
-  constructor(httpCodeString, options) {
-    super("Internal Error");
-    this.httpCodeString = httpCodeString;
-    this.cause = options?.cause;
-  }
-}

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

@@ -1,8 +0,0 @@
-import type { CustomError, ErrorMapCodes } from '../types';
-import { H3Error } from 'h3';
-import { InternalHttpError } from '../errors';
-export declare function parseErrorString(errorString: string): CustomError;
-export declare function errorServerResolver(error: unknown, errorMap?: ErrorMapCodes): H3Error<{
-    [key: string]: unknown;
-}>;
-export declare function createServerError(errorString: string): InternalHttpError;

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

@@ -1,57 +0,0 @@
-import { HTTP_CODE_BAD_REQUEST, HTTP_CODE_INTERNAL_SERVER_ERROR, HTTP_CODE_REQUEST_TIMEOUT, HTTP_CODE_UNAUTHORIZED } from "#cms/http-codes";
-import { consola } from "consola";
-import { defu } from "defu";
-import { createError, H3Error } from "h3";
-import { z } from "zod";
-import { InternalHttpError, TimeoutError } from "../errors/index.js";
-const defaultHttpCodes = {
-  DEFAULT: HTTP_CODE_INTERNAL_SERVER_ERROR,
-  ZOD: HTTP_CODE_BAD_REQUEST,
-  DB: HTTP_CODE_INTERNAL_SERVER_ERROR,
-  ERROR_UNAUTHORIZED: HTTP_CODE_UNAUTHORIZED,
-  TIMEOUT: HTTP_CODE_REQUEST_TIMEOUT
-};
-function extractHttpCodeString(error, errorMap = {}) {
-  errorMap = defu(errorMap, defaultHttpCodes);
-  if (error instanceof InternalHttpError) {
-    return error.httpCodeString;
-  } else if (error instanceof z.ZodError) {
-    return errorMap.ZOD;
-  } else if (error instanceof TimeoutError) {
-    return errorMap.TIMEOUT;
-  } else if (error instanceof H3Error && error.cause instanceof InternalHttpError) {
-    return error.cause.httpCodeString;
-  } else if (error instanceof Error) {
-    if ("query" in error && "params" in error && Array.isArray(error.params)) {
-      const errorMaybeCode2 = `DB_${error.cause?.code}`;
-      return errorMap[errorMaybeCode2] ?? errorMap.DB;
-    }
-    const normalizedMessage = error.message.trim().replaceAll(" ", "_").toUpperCase();
-    const errorMaybeCode = `ERROR_${normalizedMessage}`;
-    return errorMap[errorMaybeCode] ?? errorMap.DEFAULT;
-  }
-  return errorMap.DEFAULT;
-}
-export function parseErrorString(errorString) {
-  const [code, message] = errorString.split(":");
-  if (!code || !message) {
-    throw new Error("Invalid error string");
-  }
-  return {
-    statusCode: Number.parseInt(code, 10),
-    message: message.trim()
-  };
-}
-export function errorServerResolver(error, errorMap) {
-  const httpCodeString = extractHttpCodeString(error, errorMap);
-  const parsedHttpCode = parseErrorString(httpCodeString);
-  consola.error.raw({
-    code: parsedHttpCode.statusCode,
-    message: parsedHttpCode.message,
-    error
-  });
-  return createError(parsedHttpCode);
-}
-export function createServerError(errorString) {
-  return new InternalHttpError(errorString);
-}

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

@@ -1,10 +0,0 @@
-import type { EventHandler, EventHandlerRequest, EventHandlerResponse } from 'h3';
-import type { ErrorMapCodes } from '../types';
-export interface EventHandlerOptions {
-    errorMap?: ErrorMapCodes;
-}
-/**
- * Функция для определения обработчика HTTP-запросов.
- * Обрабатывает, H3-обработчик и ловит, обрабатывает ошибки.
- */
-export declare function defineHttpHandler<Request extends EventHandlerRequest, Response extends EventHandlerResponse>(handler: EventHandler<Request, Response | Promise<Response>>, options?: EventHandlerOptions): EventHandler<Request, Promise<Response>>;

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

@@ -1,15 +0,0 @@
-import { eventHandler } from "h3";
-import { errorServerResolver } from "./errors.js";
-export function defineHttpHandler(handler, options) {
-  return eventHandler(async (event) => {
-    try {
-      return await handler(event);
-    } catch (e) {
-      let error = e;
-      if (error.cause?.data instanceof Error) {
-        error = error.cause?.data;
-      }
-      throw errorServerResolver(error, options?.errorMap);
-    }
-  });
-}