@shwfed/config 2.3.4 → 2.3.5

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "shwfed",
   "configKey": "shwfed",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/components/actions/components/group.d.vue.ts

@@ -9,9 +9,9 @@ type __VLS_ModelProps = {
     'config': ActionConfigType;
 };
 type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
-declare var __VLS_171: {};
+declare var __VLS_181: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_171) => any;
+    default?: (props: typeof __VLS_181) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:config": (value: {
@@ -19,7 +19,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (import("../schema.js").RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -52,9 +52,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (import("../schema.js").RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -75,7 +73,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;
@@ -88,7 +88,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (import("../schema.js").RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -121,9 +121,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (import("../schema.js").RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -144,7 +142,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;

package/dist/runtime/components/actions/components/group.vue

@@ -14,7 +14,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "../../ui/tooltip";
 import { cel as _rawCel } from "../../../utils/cel";
 import { celBindings, injectCELContext } from "../../../utils/cel-context";
 import { buttonRegistryKey } from "../utils/button-registry";
-import { findButton } from "../utils/resolve";
+import { findButton, findItem } from "../utils/resolve";
 import { Fetch } from "fx-fetch";
 import { toast } from "vue-sonner";
 defineOptions({
@@ -82,8 +82,10 @@ const declaredActions = reactive({});
 const actionRuntimes = computed(() => {
   const list = [];
   for (const item of config.value.items) {
+    if (isRegistryItem(item)) continue;
     if (isDropdownItem(item)) {
       for (const child of item.items) {
+        if (isRegistrySubItem(child)) continue;
         if (!child.action) continue;
         const entry2 = findButton(child.action.type, child.action.compatibilityDate);
         if (!entry2) {
@@ -115,8 +117,9 @@ const actionRuntimes = computed(() => {
   return list;
 });
 const actionIds = computed(() => config.value.items.flatMap((item) => {
+  if (isRegistryItem(item)) return [];
   if (isDropdownItem(item)) {
-    return item.items.map((child) => child.id);
+    return item.items.filter((child) => !isRegistrySubItem(child)).map((child) => child.id);
   }
   return [item.id];
 }));
@@ -177,8 +180,10 @@ watch(actionIdSet, () => {
 const modalDefinitions = computed(() => {
   const nextDefinitions = [];
   for (const item of config.value.items) {
+    if (isRegistryItem(item)) continue;
     if (isDropdownItem(item)) {
       for (const child of item.items) {
+        if (isRegistrySubItem(child)) continue;
         const declaration2 = declaredActions[child.id];
         if (!declaration2?.render) continue;
         nextDefinitions.push({
@@ -260,14 +265,30 @@ function isButtonDisabled(button) {
   return evaluateExpression(button.disabled, false) || isPending(button.id) || !(isEffectValue(effect) || isEffectFactory(effect));
 }
 function isDropdownPending(dropdown) {
-  return dropdown.items.some((item) => !isButtonHidden(item) && isPending(item.id));
+  return dropdown.items.some(
+    (item) => !isRegistrySubItem(item) && !isButtonHidden(item) && isPending(item.id)
+  );
 }
 function hasVisibleDropdownItems(dropdown) {
-  return dropdown.items.some((item) => !isButtonHidden(item));
+  return dropdown.items.some(
+    (item) => isRegistrySubItem(item) || !isButtonHidden(item)
+  );
 }
 function isDropdownItem(item) {
   return "items" in item;
 }
+function isRegistryItem(item) {
+  return "type" in item && "compatibilityDate" in item;
+}
+function isRegistrySubItem(item) {
+  return "type" in item && "compatibilityDate" in item;
+}
+function getItemRuntime(item) {
+  return findItem(item.type, item.compatibilityDate)?.runtime;
+}
+function isButtonDropdownChild(item) {
+  return !isRegistrySubItem(item);
+}
 function getResolvedButtonVariant(group, button) {
   return button.variant ?? group.variant ?? "default";
 }
@@ -283,9 +304,9 @@ function hasLeadingPrimaryGap(group, itemIndex) {
   }
   const item = group.items[itemIndex];
   const previousItem = group.items[itemIndex - 1];
-  if (!item || !previousItem || isDropdownItem(item) || isDropdownItem(previousItem)) {
-    return false;
-  }
+  if (!item || !previousItem) return false;
+  if (isDropdownItem(item) || isDropdownItem(previousItem)) return false;
+  if (isRegistryItem(item) || isRegistryItem(previousItem)) return false;
   return getResolvedButtonVariant(group, item) === "primary" && getResolvedButtonVariant(group, previousItem) === "primary";
 }
 function handleBadResponse(error) {
@@ -346,7 +367,7 @@ async function runButton(buttonId) {
   <ClientOnly>
     <div
       data-slot="buttons"
-      :class="cn('relative flex flex-wrap items-start')"
+      :class="cn('relative flex flex-wrap items-baseline')"
       :style="[
   rootStyle,
   config.style
@@ -374,8 +395,14 @@ async function runButton(buttonId) {
           v-for="(item, itemIndex) in group.items"
           :key="item.id"
         >
+          <component
+            :is="getItemRuntime(item)"
+            v-if="isRegistryItem(item) && getItemRuntime(item)"
+            :config="item"
+          />
+
           <Button
-            v-if="!isDropdownItem(item) && !isButtonHidden(item) && !hasButtonTooltip(item)"
+            v-else-if="!isRegistryItem(item) && !isDropdownItem(item) && !isButtonHidden(item) && !hasButtonTooltip(item)"
             data-slot="buttons-item"
             :variant="getResolvedButtonVariant(group, item)"
             :size="getResolvedSize()"
@@ -395,7 +422,7 @@ async function runButton(buttonId) {
           </Button>
 
           <Tooltip
-            v-else-if="!isDropdownItem(item) && !isButtonHidden(item)"
+            v-else-if="!isRegistryItem(item) && !isDropdownItem(item) && !isButtonHidden(item)"
             :delay-duration="180"
           >
             <TooltipTrigger as-child>
@@ -457,8 +484,15 @@ async function runButton(buttonId) {
                 v-for="child in item.items"
                 :key="child.id"
               >
+                <component
+                  :is="getItemRuntime(child)"
+                  v-if="isRegistrySubItem(child) && getItemRuntime(child)"
+                  data-slot="buttons-dropdown-item-registry"
+                  :config="child"
+                />
+
                 <DropdownMenuItem
-                  v-if="!isButtonHidden(child) && !hasButtonTooltip(child)"
+                  v-else-if="isButtonDropdownChild(child) && !isButtonHidden(child) && !hasButtonTooltip(child)"
                   data-slot="buttons-dropdown-item"
                   :disabled="isButtonDisabled(child)"
                   @select="void runButton(child.id)"
@@ -475,7 +509,7 @@ async function runButton(buttonId) {
                 </DropdownMenuItem>
 
                 <Tooltip
-                  v-else-if="!isButtonHidden(child)"
+                  v-else-if="isButtonDropdownChild(child) && !isButtonHidden(child)"
                   :delay-duration="180"
                 >
                   <TooltipTrigger as-child>

package/dist/runtime/components/actions/components/group.vue.d.ts

@@ -9,9 +9,9 @@ type __VLS_ModelProps = {
     'config': ActionConfigType;
 };
 type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
-declare var __VLS_171: {};
+declare var __VLS_181: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_171) => any;
+    default?: (props: typeof __VLS_181) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:config": (value: {
@@ -19,7 +19,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (import("../schema.js").RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -52,9 +52,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (import("../schema.js").RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -75,7 +73,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;
@@ -88,7 +88,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (import("../schema.js").RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -121,9 +121,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (import("../schema.js").RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -144,7 +142,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;

package/dist/runtime/components/actions/config.d.vue.ts

@@ -1,4 +1,4 @@
-import { type ActionsConfigValue } from './schema.js';
+import { type ActionsConfigValue, type RegistryItemValue, type RegistrySubItemValue } from './schema.js';
 import { Environment } from '../../vendor/cel-js/lib/index.js';
 type __VLS_Props = {
     configure?: (env: Environment) => void;
@@ -7,9 +7,9 @@ type __VLS_ModelProps = {
     'modelValue': ActionsConfigValue;
 };
 type __VLS_PublicProps = __VLS_Props & __VLS_ModelProps;
-declare var __VLS_183: {};
+declare var __VLS_196: {};
 type __VLS_Slots = {} & {
-    'general-extra'?: (props: typeof __VLS_183) => any;
+    'general-extra'?: (props: typeof __VLS_196) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: {
@@ -17,7 +17,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -50,9 +50,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -73,7 +71,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;
@@ -86,7 +86,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
         readonly style?: string | undefined;
         readonly gap: number;
         readonly kind: "shwfed.component.action";
-        readonly items: readonly ({
+        readonly items: readonly (RegistryItemValue | {
             readonly disabled?: string | undefined;
             readonly id: string;
             readonly title: readonly [{
@@ -119,9 +119,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 readonly message: string;
             }[]];
             readonly icon?: string | undefined;
-            readonly groupId: string;
-            readonly hideTitle?: boolean | undefined;
-            readonly items: readonly {
+            readonly items: readonly (RegistrySubItemValue | {
                 readonly disabled?: string | undefined;
                 readonly id: string;
                 readonly title: readonly [{
@@ -142,7 +140,9 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_PublicProps, {}, {
                 }[]] | undefined;
                 readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 readonly action?: any;
-            }[];
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
         })[];
         readonly groups: readonly {
             readonly id: string;