@hywax/cms 0.0.7 → 0.0.9

package/dist/module.d.mts

@@ -17,6 +17,11 @@ interface CMSOptions {
      * @defaultValue 'https://fluxor.uplora.ru'
      */
     fluxorUrl?: string;
+    /**
+     * Uplora URL
+     * @defaultValue 'http://uplora.ru'
+     */
+    uploraUrl?: string;
     /**
      * Prefix for the environment variables
      * @defaultValue 'APP_'
@@ -35,6 +40,7 @@ declare module '@nuxt/schema' {
             fluxorUrl: string;
             version: string;
         };
+        uploraUrl: string;
         uploraApiKey: string;
     }
 }

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@hywax/cms",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "configKey": "cms",
   "builder": {
     "@nuxt/module-builder": "1.0.1",

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { createResolver, addComponentsDir, addImportsDir, addPlugin, addImports, addServerImports, addServerImportsDir, hasNuxtModule, installModule, addServerHandler, addTypeTemplate, addTemplate, addServerTemplate, defineNuxtModule } from '@nuxt/kit';
+import { createResolver, addComponentsDir, addPlugin, addImports, addImportsDir, addServerImports, addServerImportsDir, hasNuxtModule, installModule, addServerHandler, addTypeTemplate, addTemplate, addServerTemplate, defineNuxtModule } from '@nuxt/kit';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'pathe';
 import { defu } from 'defu';
@@ -6,7 +6,7 @@ import { snakeCase, kebabCase } from 'scule';
 import { readFile, writeFile } from 'node:fs/promises';
 
 const name = "@hywax/cms";
-const version = "0.0.7";
+const version = "0.0.9";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -25,6 +25,7 @@ const defaultCMSConfig = {};
 const defaultModuleOptions = {
   name: "cms",
   prefix: "C",
+  uploraUrl: "http://uplora.ru",
   fluxorUrl: "https://fluxor.uplora.ru",
   envPrefix: "APP_",
   httpCodes: {
@@ -61,19 +62,25 @@ function prepareAutoImports({ resolve, options, nuxt }) {
     pathPrefix: false,
     global: true
   });
-  addImportsDir(resolve("./runtime/composables"));
-  addPlugin(resolve("./runtime/plugins/api.ts"));
+  addPlugin(resolve("./runtime/plugins/api"));
   addImports([
     ...httpCodesImports,
     { name: "docToMarkdown", from: resolve("./runtime/editor/markdown") },
     { name: "markdownToDoc", from: resolve("./runtime/editor/markdown") }
   ]);
+  addImportsDir([
+    resolve("./runtime/composables"),
+    resolve("./runtime/utils")
+  ]);
   addServerImports([
     ...httpCodesImports,
     { name: "docToMarkdown", from: resolve("./runtime/editor/markdown") },
     { name: "markdownToDoc", from: resolve("./runtime/editor/markdown") }
   ]);
-  addServerImportsDir(resolve("./runtime/server/utils"));
+  addServerImportsDir([
+    resolve("./runtime/utils"),
+    resolve("./runtime/server/utils")
+  ]);
   nuxt.options.nitro.alias ||= {};
   nuxt.options.nitro.alias["#cms/http-codes"] = httpCodesPath;
   nuxt.options.alias["#cms"] = resolve("./runtime");
@@ -170,6 +177,7 @@ function prepareMergeConfigs({ nuxt, options }) {
     name: `${options.name}-session`
   });
   nuxt.options.runtimeConfig.uplora = defu(nuxt.options.runtimeConfig.uplora || {}, {
+    url: options.uploraUrl,
     apiKey: ""
   });
 }

package/dist/runtime/components/AutocompleteSelect.vue

@@ -31,8 +31,7 @@
 
 <script>
 import theme from "#build/cms/autocomplete-select";
-import { computed, ref, refDebounced, shallowRef, toRaw, triggerRef, useAppConfig, useAsyncData, useId, useNuxtData, watch } from "#imports";
-import { useInfiniteScroll, useOffsetPagination } from "@vueuse/core";
+import { computed, ref, refDebounced, shallowRef, toRaw, triggerRef, useAppConfig, useAsyncData, useId, useInfiniteScroll, useNuxtData, useOffsetPagination, watch } from "#imports";
 import { tv } from "../utils/tv";
 </script>
 

package/dist/runtime/components/InputUploraImage.vue

@@ -19,16 +19,16 @@
         <UPopover
           :ui="{ content: 'p-2' }"
           :content="{ align: 'end', side: 'bottom', sideOffset: 8 }"
+          @update:open="syncState"
         >
           <UButton :icon="appConfig.ui.icons.ellipsisVertical" color="neutral" size="sm" />
 
           <template #content>
             <UFormField label="Описание изображения">
               <UTextarea
-                :model-value="modelValue.alt"
+                v-model="state.alt"
                 placeholder="Введите описание..."
                 autoresize
-                @update:model-value="updateAlt"
               />
             </UFormField>
           </template>
@@ -79,7 +79,7 @@
 
 <script>
 import theme from "#build/cms/input-uplora-image";
-import { computed, useAppConfig } from "#imports";
+import { computed, reactive, useAppConfig } from "#imports";
 import { imagesExtensions } from "@uplora/formats";
 import { Primitive } from "reka-ui";
 import { useUploraDelete, useUploraUpload } from "../composables/useUplora";
@@ -103,7 +103,12 @@ const modelValue = defineModel({ type: Object, ...{
   })
 } });
 const appConfig = useAppConfig();
-const { open, execute: uploadExecute, status: uploadStatus, reset: resetUpload, onUploaded } = useUploraUpload();
+const state = reactive({
+  alt: modelValue.value.alt
+});
+const { open, execute: uploadExecute, status: uploadStatus, reset: resetUpload, onUploaded } = useUploraUpload({
+  accept: "image/*"
+});
 const { execute: deleteExecute, onDeleted } = useUploraDelete();
 onUploaded((file) => {
   modelValue.value = {
@@ -121,10 +126,10 @@ onDeleted(() => {
   };
   emit("delete");
 });
-function updateAlt(alt) {
+function syncState() {
   modelValue.value = {
     ...modelValue.value,
-    alt
+    alt: state.alt
   };
 }
 const ui = computed(() => tv({ extend: tv(theme), ...appConfig.cms?.inputUploraImage || {} })());

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

@@ -18,7 +18,7 @@ declare const _default: <T extends object>(__VLS_props: NonNullable<Awaited<type
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly onReset?: (() => any) | undefined;
         readonly onSubmit?: (() => any) | undefined;
-    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onSubmit" | "onReset"> & TablePanelFiltersProps<T> & Partial<{}>> & import("vue").PublicProps;
+    } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, "onReset" | "onSubmit"> & TablePanelFiltersProps<T> & Partial<{}>> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {

package/dist/runtime/composables/useAdmin.d.ts

@@ -1,4 +1,4 @@
-import type { Ref } from 'vue';
+import type { Ref } from '#imports';
 export interface UseAdminReturn {
     isSidebarOpen: Ref<boolean>;
     isSidebarCollapsed: Ref<boolean>;

package/dist/runtime/composables/useAdmin.js

@@ -1,5 +1,4 @@
-import { ref, useRoute, watch } from "#imports";
-import { createSharedComposable } from "@vueuse/shared";
+import { createSharedComposable, ref, useRoute, watch } from "#imports";
 export const useAdmin = createSharedComposable(() => {
   const route = useRoute();
   const isSidebarOpen = ref(false);

package/dist/runtime/composables/useLogout.d.ts

@@ -0,0 +1,8 @@
+import type { Ref } from '#imports';
+import type { EventHookOn } from '@vueuse/shared';
+export interface UseLogoutResult {
+    isLoading: Ref<boolean>;
+    logout: () => Promise<void>;
+    onLoggedOut: EventHookOn<void>;
+}
+export declare const useLogout: () => UseLogoutResult;

package/dist/runtime/composables/useLogout.js

@@ -0,0 +1,21 @@
+import { clearNuxtData, createEventHook, createSharedComposable, ref, useUserSession } from "#imports";
+export const useLogout = createSharedComposable(() => {
+  const isLoading = ref(false);
+  const { clear } = useUserSession();
+  const { on: onLoggedOut, trigger: logoutTrigger } = createEventHook();
+  async function logout() {
+    isLoading.value = true;
+    try {
+      clearNuxtData();
+      await clear();
+      logoutTrigger();
+    } finally {
+      isLoading.value = false;
+    }
+  }
+  return {
+    isLoading,
+    logout,
+    onLoggedOut
+  };
+});

package/dist/runtime/server/api/uplora/[id].delete.d.ts

@@ -1,2 +1,10 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<never>>;
+import { z } from 'zod';
+export declare const filesDeleteRouteParamsSchema: z.ZodObject<{
+    id: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id: string;
+}, {
+    id: string;
+}>;
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;
 export default _default;

package/dist/runtime/server/api/uplora/[id].delete.js

@@ -1,4 +1,15 @@
+import { useRuntimeConfig } from "#imports";
+import { getValidatedRouterParams } from "h3";
+import { z } from "zod";
 import { defineHttpHandler } from "../../utils/httpHandler.js";
-export default defineHttpHandler(() => {
-  throw new Error("Not implemented");
+export const filesDeleteRouteParamsSchema = z.object({
+  id: z.string().min(24).max(24)
+});
+export default defineHttpHandler(async (event) => {
+  const { id } = await getValidatedRouterParams(event, filesDeleteRouteParamsSchema.parse);
+  const { uplora } = useRuntimeConfig();
+  await $fetch(`${uplora.url}/api/files/${id}`, {
+    method: "DELETE",
+    headers: { "x-api-key": uplora.apiKey }
+  });
 });

package/dist/runtime/server/api/uplora/index.post.d.ts

@@ -1,5 +1,8 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
+interface UploraFile {
     id: string;
+}
+type UploraFileImage = UploraFile & {
     lqip: string;
-}>>;
+};
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<UploraFile | UploraFileImage>>;
 export default _default;

package/dist/runtime/server/api/uplora/index.post.js

@@ -1,8 +1,33 @@
+import { Buffer } from "node:buffer";
+import { HTTP_CODE_BAD_REQUEST } from "#cms/http-codes";
+import { useRuntimeConfig } from "#imports";
+import { isImageMimeType } from "@uplora/formats";
+import { z } from "zod";
+import { InternalHttpError } from "../../errors/InternalHttpError.js";
 import { defineHttpHandler } from "../../utils/httpHandler.js";
-export default defineHttpHandler(async () => {
-  await new Promise((resolve) => setTimeout(resolve, 300));
-  return {
-    id: "f50hmx9sbnr6azkvc9ir46dg",
-    lqip: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAclBMVEUiKCLCu7LSo4HftJOwr6q5ta9LOi0pKiQyLiY+MynmvZvZrIlYQTLVx7qlpqLLwbfq07zrxqbuz7JkSTfKmXe3hmbfz75xUTyfc1WrfF3BkG6TaU58WEKcnJeHYEffwafQu6fhybLFq5Wwo5WSko2FiYXlL2BpAAAACXBIWXMAAAsTAAALEwEAmpwYAAADAklEQVR4nJ2VbW+bQAzH/z4oJC2iaUqkbVGaStu+/1dqlFfV+gRqk0B4mGwfcNAs0uqrjjP1z76zzYV+g6UBkANIRdthKJe7S35cq+afIajhoS8YSpXyHUAIa0868WBsJwyA9BpGCVW7nZAQraLqjp2lSOELkLsh1LzsEN4IseMdOFJqGBBigQUT4rEse4KVEk4k+sX2AYA/orb+Y2TRuw7EmXNowM8VwGa9YcDaI4t4ESF6j4zoJeCTUL7YS6ItEIsWmQiWqnnzMTKU8PlQxto3d9tVucQaa1brGnV/mLquayCO+VhLEP3ULW5XavMKazzdTxXYT/fyNMDNZr1Zb+inLUtt2PT59jl5Sp46+1YsdSNz8yCAOm/mlDwlmF6NCEynCRLMtLTmnh+Pi+1KcyiH+wCKoAgKBAUQFJyiK/H8Mid4NHuYPT6X2WorqTI1l2ZfVuDBf7yoqviVAzc8efR2/wh/mWbI8itORTpJJ/ms6DpP5WAm0tvgjfFOgQOAEFggi7PZm7ZZn2cDXKfXb1o0Sl6UaSGE0h8z29a1kUpK7WwDUwJm2kAC6eT2f9teufwj4dmN5FLcRNJL3ScC5PQDKM5QveTtRAtc8Jqxdoculoe9f3lMGAF66hTWWx840aDvPJefOWmZw0RIkUnba/Rt8LGfCAe3oecvc9BSWgLnQCtzmQPQnQJ2phOYFe1OHC/8WnsGXk96TDYMkpIqdJTH0T9ah4bJCp5gDUB8pZRQMxbfXsagW/ilrNWfRKxGOx12DUU29y5ohpgVr/IsorotswNqPHtEl6HATUcLDuL1UmuUqetJeRd0U3a8kGRQV+AxZ9PkSOlLxfTHghOjZ0Ml9eObRUQDWvkIuT9Jug2jhGrE7rp2pAhAofP1DcnujHyjya2mIki77slPmJNmavPzGRtdGO7rMB9hrnHvov1FhwdUYVXBz6vKz52cDs930l+Y8xhfLAwO2cYiYms5XfwjAsup6G240QFbMSfe5XwFhWBQx/9JeHaPZzEdX+O/JH8BtUM+KttnGNQAAAAASUVORK5CYII="
-  };
+import { readValidatedMultipartFormData } from "../../utils/validation.js";
+const filesCreatePayloadSchema = z.object({
+  file: z.object({
+    name: z.literal("file"),
+    filename: z.string(),
+    type: z.string(),
+    data: z.instanceof(Buffer)
+  })
+});
+export default defineHttpHandler(async (event) => {
+  const { file } = await readValidatedMultipartFormData(event, filesCreatePayloadSchema.parse);
+  const { uplora } = useRuntimeConfig();
+  if (!file) {
+    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+  }
+  const formData = new FormData();
+  formData.append("file", new Blob([file.data], { type: file.type }), file.filename);
+  if (isImageMimeType(file.type)) {
+    formData.append("lqip", "true");
+  }
+  return await $fetch(`${uplora.url}/api/files`, {
+    method: "POST",
+    headers: { "x-api-key": uplora.apiKey },
+    body: formData
+  });
 });

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

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

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

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

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

@@ -45,7 +45,7 @@ export function parseErrorString(errorString) {
 export function errorServerResolver(error, errorMap) {
   const httpCodeString = extractHttpCodeString(error, errorMap);
   const parsedHttpCode = parseErrorString(httpCodeString);
-  consola.error({
+  consola.error.raw({
     code: parsedHttpCode.statusCode,
     message: parsedHttpCode.message,
     error

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

@@ -1,3 +1,7 @@
-import type { PaginationQueryRaw, PaginationQueryValidated, SortQuery, SortQueryRaw } from '../../types';
+import type { H3Event, InferEventInput, ValidateFunction } from 'h3';
+import type { PaginationQuery, PaginationQueryRaw, SortQuery, SortQueryRaw } from '../../types';
 export declare function getValidatedSort<T extends string[]>(query: SortQueryRaw, availableColumns: readonly [...T]): SortQuery<T[number]>;
-export declare function getValidatedPagination(query: PaginationQueryRaw): PaginationQueryValidated;
+export declare function getValidatedPagination(query: PaginationQueryRaw): PaginationQuery & {
+    pageOffset: number;
+};
+export declare function readValidatedMultipartFormData<T, Event extends H3Event = H3Event, _T = InferEventInput<'body', Event, T>>(event: Event, validate: ValidateFunction<_T>): Promise<_T>;

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

@@ -1,4 +1,5 @@
 import { HTTP_CODE_BAD_REQUEST } from "#cms/http-codes";
+import { readMultipartFormData } from "h3";
 import { InternalHttpError } from "../errors/InternalHttpError.js";
 export function getValidatedSort(query, availableColumns) {
   if (!query.sortColumn || !availableColumns.includes(query.sortColumn)) {
@@ -24,3 +25,30 @@ export function getValidatedPagination(query) {
     pageOffset
   };
 }
+export async function readValidatedMultipartFormData(event, validate) {
+  const formData = await readMultipartFormData(event);
+  if (!formData) {
+    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+  }
+  try {
+    const transformedFormData = {};
+    for (const [key, value] of Object.entries(formData)) {
+      const dataKey = value.name ?? key;
+      if ("name" in value && "filename" in value && "type" in value && "data" in value) {
+        transformedFormData[dataKey] = value;
+      } else {
+        transformedFormData[dataKey] = value.data.toString();
+      }
+    }
+    const res = await validate(transformedFormData);
+    if (res === false) {
+      throw new InternalHttpError(HTTP_CODE_BAD_REQUEST);
+    }
+    if (res === true) {
+      return formData;
+    }
+    return res ?? formData;
+  } catch (error) {
+    throw new InternalHttpError(HTTP_CODE_BAD_REQUEST, { cause: error });
+  }
+}

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

@@ -17,6 +17,3 @@ export interface PaginationQuery {
     page: number;
     perPage: number;
 }
-export type PaginationQueryValidated = PaginationQuery & {
-    pageOffset: number;
-};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "repository": {
     "type": "git",