@vc-shell/framework 1.0.52 → 1.0.54

package/dist/ui/types/ts-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-helpers.d.ts","sourceRoot":"","sources":["../../../ui/types/ts-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,aAAa,EACb,UAAU,EACX,MAAM,KAAK,CAAC;AAEb,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC;AAErC,MAAM,MAAM,oBAAoB,CAC9B,SAAS,SAAS,uBAAuB,CACvC,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,CAAC,CACF,GAAG,uBAAuB,CAAC,GAAG,CAAC,EAChC,KAAK,GAAG,GAAG,EACX,WAAW,GAAG,GAAG,EACjB,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,aAAa,GAAG,aAAa,IACrC;IAAE,QAAQ,SAAS,CAAA;CAAE,GAAG,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE1E,MAAM,MAAM,0BAA0B,CAAC,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,IAAI;IAC7D,QAAQ;QACN,MAAM,EAAE,WAAW,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,KAAK,CAAC;KACf,CAAA;CACJ,CAAC"}
+{"version":3,"file":"ts-helpers.d.ts","sourceRoot":"","sources":["../../../ui/types/ts-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,UAAU,EACX,MAAM,KAAK,CAAC;AAEb,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC;AAErC,MAAM,MAAM,oBAAoB,CAC9B,SAAS,SAAS,uBAAuB,CACvC,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,CACF,GAAG,uBAAuB,CAAC,GAAG,CAAC,EAChC,KAAK,GAAG,GAAG,EACX,WAAW,GAAG,GAAG,EACjB,CAAC,GAAG,GAAG,EACP,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,YAAY,GAAG,YAAY,IACnC;IAAE,QAAQ,SAAS,CAAA;CAAE,GAAG,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE7E,MAAM,MAAM,0BAA0B,CAAC,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,IAAI;IACzE,QAAQ;QACN,MAAM,EAAE,WAAW,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,KAAK,CAAC;QACd,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAA;KAC/B,CAAA;CACJ,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,kBAAkB,IAAI;KACtD,CAAC,IAAI,MAAM,GAAG,KAAK,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,MAAM,CAAC,EAAE,GAC1E,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAC7B,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GACxB,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,KAAK,KAAK,IAAI,GACtF,KAAK;CACV,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3D,KAAK,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC;AAChH,MAAM,MAAM,gBAAgB,CAAC,OAAO,GAAG,kBAAkB,EAAE,KAAK,SAAS,MAAM,OAAO,GAAG,MAAM,OAAO,IAAI,mBAAmB,CAAC;KAC3H,GAAG,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;CAC/I,CAAC,KAAK,CAAC,CAAC,CAAA"}

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

@@ -0,0 +1,2 @@
+export * from "./types";
+//# sourceMappingURL=index.d.ts.map

package/dist/ui/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ui/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}

package/dist/ui/utils/types.d.ts

@@ -0,0 +1,3 @@
+export { isArray, isFunction, isObject, isString, isDate, isPromise, isSymbol } from "@vue/shared";
+export { isBoolean, isNumber } from "@vueuse/core";
+//# sourceMappingURL=types.d.ts.map

package/dist/ui/utils/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ui/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC"}

package/dist/vite.config.d.ts

@@ -1,3 +1,3 @@
-declare const _default: import("vite").UserConfigExport;
+declare const _default: Record<string, any>;
 export default _default;
 //# sourceMappingURL=vite.config.d.ts.map

package/dist/vite.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.config.d.ts","sourceRoot":"","sources":["../vite.config.ts"],"names":[],"mappings":";AAMA,wBAkDE"}
+{"version":3,"file":"vite.config.d.ts","sourceRoot":"","sources":["../vite.config.ts"],"names":[],"mappings":";AAKA,wBAiCG"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "main": "./dist/framework.js",
-  "module": "./dist/framework.js",
+  "module": "./dist/framework.esm.js",
   "types": "./dist/index.d.ts",
   "style": "./dist/style.css",
   "files": [
@@ -14,7 +14,7 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/framework.js",
+      "import": "./dist/framework.esm.js",
       "require": "./dist/framework.js",
       "types": "./dist/index.d.ts"
     },
@@ -27,13 +27,15 @@
   },
   "scripts": {
     "build": "vite build",
+    "dev": "vite",
     "development": "vite build --watch -m development",
     "watch": "vite build --watch",
     "type-check": "vue-tsc --noEmit"
   },
   "dependencies": {
     "@popperjs/core": "^2.11.0",
-    "@vee-validate/rules": "^4.5.5",
+    "@vee-validate/i18n": "^4.7.3",
+    "@vee-validate/rules": "^4.7.3",
     "@vueuse/components": "^9.9.0",
     "@vueuse/core": "^9.9.0",
     "@vueuse/integrations": "^9.9.0",
@@ -45,26 +47,22 @@
     "vue": "^3.0.0",
     "vue-currency-input": "~2.5.1",
     "vue-i18n": "^9.1.7",
-    "vue-logger-plugin": "^2.1.2",
     "vue-router": "^4.1.6",
     "vue3-ace-editor": "^2.2.2",
     "vue3-touch-events": "^4.1.0",
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "@rollup/plugin-commonjs": "^21.0.2",
-    "@vc-shell/api-client-generator": "^1.0.52",
-    "@vc-shell/config-generator": "^1.0.52",
+    "@vc-shell/api-client-generator": "^1.0.54",
+    "@vc-shell/config-generator": "^1.0.54",
     "@vue-macros/volar": "^0.8.1",
     "sass": "^1.49.0",
     "typescript": "^4.9.5",
-    "unplugin-vue-macros": "^1.1.1",
     "url-pattern": "^1.0.3"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "86f38c6a3c0ce2461fd0c49bd446f5c94c359d61"
+  "gitHead": "e7492afe894926b839bef1ea9a58b86fd83ce1d1"
 }

package/shared/app-switcher/components/vc-app-switcher/vc-app-switcher.vue

@@ -31,9 +31,7 @@
             :alt="`icon_${item.id}`"
             class="tw-w-5 tw-h-5 tw-mr-2 tw-shrink-0"
           />
-          <p
-            class="tw-font-normal tw-text-sm tw-text-[#727C87] tw-truncate group-hover:tw-opacity-80"
-          >
+          <p class="tw-font-normal tw-text-sm tw-text-[#727C87] tw-truncate group-hover:tw-opacity-80">
             {{ item.title }}
           </p>
         </li>
@@ -44,7 +42,7 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
-import { AppDescriptor } from "@/core/api";
+import { AppDescriptor } from "./../../../../core/api";
 
 export interface Props {
   appsList: AppDescriptor[];
@@ -62,8 +60,7 @@ const emit = defineEmits<Emits>();
 
 const isVisible = ref(false);
 
-const imageUrl = (url: string) =>
-  import.meta.env.APP_PLATFORM_URL.replace(/\/+$/, "") + url;
+const imageUrl = (url: string) => import.meta.env.APP_PLATFORM_URL.replace(/\/+$/, "") + url;
 
 const locationHandler = (url: string) => {
   const cleanUrl = window.location.pathname.replace(/\/+$/, "");

package/shared/app-switcher/composables/useAppSwitcher/index.ts

@@ -1,10 +1,6 @@
 import { computed, Ref, ref } from "vue";
-import { AppDescriptor, AppsClient } from "@/core/api";
-import {
-  useLogger,
-  useUser,
-  usePermissions,
-} from "@/core/composables";
+import { AppDescriptor, AppsClient } from "./../../../../core/api";
+import { useUser, usePermissions } from "./../../../../core/composables";
 
 interface IUseAppSwitcher {
   readonly appsList: Ref<AppDescriptor[]>;
@@ -13,7 +9,6 @@ interface IUseAppSwitcher {
 }
 
 export default (): IUseAppSwitcher => {
-  const logger = useLogger();
   const { checkPermission } = usePermissions();
   const appsList = ref<AppDescriptor[]>([]);
 
@@ -30,7 +25,7 @@ export default (): IUseAppSwitcher => {
     try {
       appsList.value = await client.getApps();
     } catch (e) {
-      logger.error(e);
+      console.error(e);
       throw e;
     }
   }

package/shared/app-switcher/index.ts

@@ -1,14 +1,7 @@
-import { App } from "vue";
+import { createModule } from "../../core/plugins/modularity";
 import * as components from "./components";
 
-export default {
-  install(app: App): void {
-    // Register exported components
-    Object.entries(components).forEach(([componentName, component]) => {
-      app.component(componentName, component);
-    });
-  },
-};
+export default createModule(components);
 
-export * from "./composables";
 export * from "./components";
+export * from "./composables";

package/shared/assets/components/assets-details/assets-details.vue

@@ -8,7 +8,7 @@
     @close="$emit('close:blade')"
   >
     <!-- Blade contents -->
-    <div class= "tw-flex tw-grow-1 tw-border-t tw-border-solid tw-border-t-[#eaedf3]">
+    <div class="tw-flex tw-grow-1 tw-border-t tw-border-solid tw-border-t-[#eaedf3]">
       <div class="assets-details__content tw-grow tw-basis-0">
         <VcContainer :no-padding="true">
           <div class="tw-p-4">
@@ -25,9 +25,7 @@
                 v-model="localImage.name"
                 clearable
                 required
-                :placeholder="
-                  $t('ASSETS.PAGES.DETAILS.FIELDS.NAME.PLACEHOLDER')
-                "
+                :placeholder="$t('ASSETS.PAGES.DETAILS.FIELDS.NAME.PLACEHOLDER')"
               ></VcInput>
               <VcInput
                 class="tw-mb-4"
@@ -42,10 +40,8 @@
                 class="tw-mb-4"
                 :label="$t('ASSETS.PAGES.DETAILS.FIELDS.DESCRIPTION.TITLE')"
                 v-model="localImage.description"
-                :placeholder="
-                  $t('ASSETS.PAGES.DETAILS.FIELDS.DESCRIPTION.PLACEHOLDER')
-                "
-                is-required
+                :placeholder="$t('ASSETS.PAGES.DETAILS.FIELDS.DESCRIPTION.PLACEHOLDER')"
+                required
               ></VcTextarea>
             </VcForm>
           </div>
@@ -57,16 +53,9 @@
 
 <script lang="ts" setup>
 import { computed, reactive, unref } from "vue";
-import { useI18n } from "@/core/composables";
-import { IParentCallArgs } from "@/shared";
-import {
-  VcBlade,
-  VcContainer,
-  VcForm,
-  VcImage,
-  VcInput,
-  VcTextarea,
-} from "@/ui/components";
+import { useI18n } from "./../../../../core/composables";
+import { IParentCallArgs } from "./../../../../shared";
+import { VcBlade, VcContainer, VcForm, VcImage, VcInput, VcTextarea } from "./../../../../ui/components";
 
 export interface Props {
   expanded?: boolean;
@@ -104,10 +93,7 @@ const bladeToolbar = [
     title: t("ASSETS.PAGES.DETAILS.TOOLBAR.SAVE"),
     icon: "fas fa-save",
     clickHandler() {
-      if (
-        props.options.sortHandler &&
-        typeof props.options.sortHandler === "function"
-      ) {
+      if (props.options.sortHandler && typeof props.options.sortHandler === "function") {
         props.options.sortHandler(false, localImage);
         emit("close:blade");
       }
@@ -118,15 +104,8 @@ const bladeToolbar = [
     title: t("ASSETS.PAGES.DETAILS.TOOLBAR.DELETE"),
     icon: "fas fa-trash",
     clickHandler() {
-      if (
-        window.confirm(
-          unref(computed(() => t("ASSETS.PAGES.DETAILS.DELETE_CONFIRMATION")))
-        )
-      ) {
-        if (
-          props.options.sortHandler &&
-          typeof props.options.sortHandler === "function"
-        ) {
+      if (window.confirm(unref(computed(() => t("ASSETS.PAGES.DETAILS.DELETE_CONFIRMATION"))))) {
+        if (props.options.sortHandler && typeof props.options.sortHandler === "function") {
           props.options.sortHandler(true, localImage);
           emit("close:blade");
         }

package/shared/assets/components/index.ts

@@ -1 +1 @@
-export {default as AssetsDetails} from './assets-details/assets-details.vue'
+export { default as AssetsDetails } from "./assets-details/assets-details.vue";

package/shared/assets/index.ts

@@ -1,19 +1,7 @@
-import { App } from "vue";
+import { createModule } from "../../core/plugins/modularity";
 import * as components from "./components";
 import * as locales from "./locales";
 
-export default {
-    install(app: App): void {
-        Object.entries(components).forEach(([pageName, page]) => {
-            app.component(pageName, page);
-            app.config.globalProperties.pages?.push(page);
-        });
+export default createModule(components, locales);
 
-        // Load locales
-        Object.entries(locales).forEach(([key, message]) => {
-            app.config.globalProperties.$mergeLocaleMessage(key, message);
-        });
-    },
-};
-
-export * from './components'
+export * from "./components";

package/shared/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue

@@ -33,17 +33,12 @@
 <script lang="ts" setup>
 import { computed, onBeforeUpdate, ref } from "vue";
 import { useRoute } from "vue-router";
-import {
-  IBladeContainer,
-  IBladeElement,
-  IBladeEvent,
-  IParentCallArgs,
-} from "@/shared";
+import { IBladeContainer, IBladeElement, IBladeEvent, IParentCallArgs } from "./../../../../shared";
 
 export interface Props {
   blades: IBladeContainer[];
   parentBladeOptions: Record<string, unknown>;
-  parentBladeParam: string;
+  parentBladeParam?: string | undefined;
 }
 
 export interface Emits {

package/shared/blade-navigation/composables/index.ts

@@ -1 +1 @@
-export {default as useBladeNavigation} from './useBladeNavigation'
+export { default as useBladeNavigation } from "./useBladeNavigation";

package/shared/blade-navigation/composables/useBladeNavigation/index.ts

@@ -1,14 +1,8 @@
 import { computed, ref, unref, watch, Ref } from "vue";
 import { isEqual } from "lodash-es";
 import { useRouter, useRoute, NavigationFailure } from "vue-router";
-import { usePermissions } from "@/core/composables";
-import {
-  ExtendedComponent,
-  IBladeContainer,
-  IBladeElement,
-  IBladeEvent,
-  IParentCallArgs,
-} from "@/shared";
+import { usePermissions } from "./../../../../core/composables";
+import { ExtendedComponent, IBladeContainer, IBladeElement, IBladeEvent, IParentCallArgs } from "./../../../../shared";
 
 interface IUseBladeNavigation {
   readonly blades: Ref<IBladeContainer[]>;
@@ -16,14 +10,7 @@ interface IUseBladeNavigation {
   readonly parentBladeParam: Ref<string>;
   bladesRefs: Ref<IBladeElement[]>;
   openBlade: (
-    {
-      parentBlade,
-      component,
-      param,
-      bladeOptions,
-      onOpen,
-      onClose,
-    }: IBladeEvent,
+    { parentBlade, component, param, bladeOptions, onOpen, onClose }: IBladeEvent,
     index?: number,
     navigationCb?: () => Promise<void | NavigationFailure>
   ) => void;
@@ -61,14 +48,7 @@ export default (): IUseBladeNavigation => {
   );
 
   async function openBlade(
-    {
-      parentBlade,
-      component: blade,
-      param,
-      bladeOptions,
-      onOpen,
-      onClose,
-    }: IBladeEvent,
+    { parentBlade, component: blade, param, bladeOptions, onOpen, onClose }: IBladeEvent,
     index?: number,
     navigationCb?: () => Promise<void | NavigationFailure>
   ) {
@@ -102,9 +82,7 @@ export default (): IUseBladeNavigation => {
       if (existingChild === undefined) {
         child.idx = index + 1;
       } else if (existingChild) {
-        await closeBlade(
-          blades.value.findIndex((x) => x.idx === existingChild.idx)
-        );
+        await closeBlade(blades.value.findIndex((x) => x.idx === existingChild.idx));
         child.idx = existingChild.idx;
       }
 
@@ -118,10 +96,7 @@ export default (): IUseBladeNavigation => {
 
       isPrevented.value = false;
       for (let i = 0; i < children.length; i++) {
-        if (
-          children[i]?.onBeforeClose &&
-          typeof children[i].onBeforeClose === "function"
-        ) {
+        if (children[i]?.onBeforeClose && typeof children[i].onBeforeClose === "function") {
           const result = await children[i].onBeforeClose();
           if (result === false) {
             isPrevented.value = true;
@@ -172,18 +147,14 @@ export default (): IUseBladeNavigation => {
   }
 
   async function onParentCall(index: number, args: IParentCallArgs) {
-    console.debug(
-      `vc-app#onParentCall(${index}, { method: ${args.method} }) called.`
-    );
+    console.debug(`vc-app#onParentCall(${index}, { method: ${args.method} }) called.`);
 
     if (index >= 0) {
       const currentParent = unref(bladesRefs.value[index]);
 
       if (currentParent) {
         if (args.method && typeof currentParent[args.method] === "function") {
-          const method = currentParent[args.method] as (
-            args: unknown
-          ) => Promise<unknown>;
+          const method = currentParent[args.method] as (args: unknown) => Promise<unknown>;
           const result = await method(args.args);
           if (typeof args.callback === "function") {
             args.callback(result);

package/shared/blade-navigation/index.ts

@@ -1,15 +1,8 @@
-import { App } from "vue";
+import { createModule } from "../../core/plugins/modularity";
 import * as components from "./components";
 
-export default {
-    install(app: App): void {
-        // Register exported pages
-        Object.entries(components).forEach(([componentName, component]) => {
-            app.component(componentName, component);
-        });
-    },
-};
+export default createModule(components);
 
 export * from "./components";
 export * from "./composables";
-export * from './types'
+export * from "./types";

package/shared/blade-navigation/types/index.ts

@@ -1,5 +1,5 @@
 import { Component, ComponentPublicInstance } from "vue";
-import { IMenuItems } from "@/core/types";
+import { IMenuItems } from "./../../../core/types";
 import { NavigationFailure } from "vue-router";
 
 /* onParentCall event interface */

package/shared/index.ts

@@ -1,15 +1,13 @@
 import { App } from "vue";
-import { default as AssetsDetails } from "./assets";
-import { default as VcAppSwitcher } from "./app-switcher";
-import { default as VcBladeNavigation } from "./blade-navigation";
-
-const components = [AssetsDetails, VcAppSwitcher, VcBladeNavigation];
-
-export function init(app: App): App {
-  components.forEach((component) => app.use(component));
-
-  return app;
-}
+import { default as AssetsDetailsModule } from "./assets";
+import { default as VcAppSwitcherModule } from "./app-switcher";
+import { default as VcBladeNavigationModule } from "./blade-navigation";
+
+export default {
+  install(app: App): void {
+    app.use(AssetsDetailsModule).use(VcAppSwitcherModule).use(VcBladeNavigationModule);
+  },
+};
 
 export * from "./assets";
 export * from "./app-switcher";

package/ui/components/atoms/vc-badge/index.ts

@@ -1,7 +1,7 @@
 import { ComponentPublicInstance } from "vue";
-import { VcBadgeProps } from "./vc-badge-model";
-import { ComponentConstructor } from "@/ui/types/ts-helpers";
+import { VcBadgeEmits, VcBadgeProps } from "./vc-badge-model";
+import { ComponentConstructor } from "./../../../types/ts-helpers";
 import Badge from "./vc-badge.vue";
-export const VcBadge: ComponentConstructor<
-  ComponentPublicInstance<VcBadgeProps>
-> = Badge;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const VcBadge: ComponentConstructor<ComponentPublicInstance<VcBadgeProps, any, any, any, any, VcBadgeEmits>> =
+  Badge;

package/ui/components/atoms/vc-badge/vc-badge-model.ts

@@ -1,26 +1,27 @@
+import { ExtractTypes } from "./../../../types/ts-helpers";
 import { VNode } from "vue";
 
-export interface VcBadgeProps {
-  /**
-   * Badge active state
-   * */
-  active?: boolean | undefined;
-  /**
-   * Put component in disabled state
-   * */
-  disabled?: boolean | undefined;
-  /**
-   * Is badge clickable?
-   * */
-  clickable?: boolean | undefined;
-}
+export const badgeProps = {
+  active: {
+    type: Boolean,
+    default: false,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  clickable: {
+    type: Boolean,
+    default: false,
+  },
+};
 
-export interface VcBadgeEmits {
-  /**
-   * Emitted when component is clicked
-   * */
-  (event: "click"): void;
-}
+export const badgeEmits = {
+  click: () => true,
+};
+
+export type VcBadgeProps = ExtractTypes<typeof badgeProps>;
+export type VcBadgeEmits = typeof badgeEmits;
 
 export interface VcBadgeSlots {
   /**

package/ui/components/atoms/vc-badge/vc-badge.vue

@@ -16,17 +16,11 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  VcBadgeEmits,
-  VcBadgeProps,
-} from "@/ui/components/atoms/vc-badge/vc-badge-model";
-
-const props = withDefaults(defineProps<VcBadgeProps>(), {
-  active: false,
-  disabled: false,
-  clickable: true,
-});
-const emit = defineEmits<VcBadgeEmits>();
+import { badgeProps, badgeEmits } from "./vc-badge-model";
+
+const props = defineProps(badgeProps);
+
+const emit = defineEmits(badgeEmits);
 
 function onClick(): void {
   if (props.clickable && !props.disabled) {

package/ui/components/atoms/vc-button/index.ts

@@ -1,7 +1,7 @@
 import { ComponentPublicInstance } from "vue";
-import { VcButtonProps } from "./vc-button-model";
-import { ComponentConstructor } from "@/ui/types/ts-helpers";
+import { VcButtonEmits, VcButtonProps } from "./vc-button-model";
+import { ComponentConstructor } from "./../../../types/ts-helpers";
 import Button from "./vc-button.vue";
-export const VcBadge: ComponentConstructor<
-  ComponentPublicInstance<VcButtonProps>
-> = Button;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const VcButton: ComponentConstructor<ComponentPublicInstance<VcButtonProps, any, any, any, any, VcButtonEmits>> =
+  Button;

package/ui/components/atoms/vc-button/vc-button-model.ts

@@ -1,30 +1,37 @@
-import { VNode } from "vue";
+import { ExtractTypes } from "./../../../types/ts-helpers";
+import { VNode, PropType } from "vue";
 
-export interface VcButtonProps {
-  /**
-   * Button icon from Fontawesome icons set
-   * */
-  icon?: string | undefined;
-  /**
-   * Put component in disabled state
-   * */
-  disabled?: boolean | undefined;
-  /**
-   * Is badge clickable?
-   * */
-  clickable?: boolean | undefined;
-}
+export const buttonProps = {
+  icon: String,
+  variant: {
+    type: String as PropType<"primary" | "secondary" | "special" | "danger" | "widget" | "onlytext">,
+    default: "primary",
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  small: {
+    type: Boolean,
+    default: false,
+  },
+  outline: {
+    type: Boolean,
+    default: false,
+  },
+  selected: {
+    type: Boolean,
+    default: false,
+  },
+};
 
-export interface VcButtonEmits {
-  /**
-   * Emitted when component is clicked
-   * */
-  (event: "click"): void;
-}
+export const buttonEmits = {
+  click: () => true,
+};
+
+export type VcButtonProps = ExtractTypes<typeof buttonProps>;
+export type VcButtonEmits = typeof buttonEmits;
 
 export interface VcButtonSlots {
-  /**
-   * Slot for component content
-   * */
   default: () => VNode[];
 }