@shwfed/nuxt 0.11.3 → 0.11.5

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

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

@@ -1,7 +1,7 @@
 import { Effect } from 'effect';
 import { type FieldsConfigInput } from './ui/fields/Fields.vue.js';
 export { CalendarFieldC, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, NumberFieldC, SelectFieldC, SlotFieldC, StringFieldC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createFieldsConfig, } from './ui/fields/Fields.vue.js';
-export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { EmptyField, Field, FieldsInstance, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

package/dist/runtime/components/fields.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { Effect } from "effect";
+import { ref } from "vue";
 import UiFields, {
   createFieldsConfig
 } from "./ui/fields/Fields.vue";
@@ -23,6 +24,33 @@ function handleConfigUpdate(config2) {
 function handleInitialValueReady() {
   emit("initial-value-ready");
 }
+const fieldsRef = ref(null);
+defineExpose(new Proxy({}, {
+  get(_target, property) {
+    return fieldsRef.value ? Reflect.get(fieldsRef.value, property) : void 0;
+  },
+  has(_target, property) {
+    return fieldsRef.value ? Reflect.has(fieldsRef.value, property) : false;
+  },
+  ownKeys() {
+    return fieldsRef.value ? Reflect.ownKeys(fieldsRef.value) : [];
+  },
+  getOwnPropertyDescriptor(_target, property) {
+    if (!fieldsRef.value || !Reflect.has(fieldsRef.value, property)) {
+      return void 0;
+    }
+    return {
+      configurable: true,
+      enumerable: true,
+      get() {
+        if (!fieldsRef.value) {
+          return void 0;
+        }
+        return Reflect.get(fieldsRef.value, property);
+      }
+    };
+  }
+}));
 </script>
 
 <script>
@@ -47,6 +75,7 @@ export {
 
 <template>
   <UiFields
+    ref="fieldsRef"
     v-bind="$attrs"
     v-model="modelValue"
     :config="config"

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

@@ -1,7 +1,7 @@
 import { Effect } from 'effect';
 import { type FieldsConfigInput } from './ui/fields/Fields.vue.js';
 export { CalendarFieldC, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, NumberFieldC, SelectFieldC, SlotFieldC, StringFieldC, CURRENT_COMPATIBILITY_DATE, KIND, SUPPORTED_COMPATIBILITY_DATES, createFieldsConfig, } from './ui/fields/Fields.vue.js';
-export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
+export type { EmptyField, Field, FieldsInstance, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, } from './ui/fields/Fields.vue.js';
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{

package/dist/runtime/components/ui/app/OverlayHost.vue

@@ -28,17 +28,6 @@ function handleOpenUpdate(sessionId, open) {
     reason: "dismiss"
   });
 }
-function patchFooter(sessionId, definitionId, nextProps) {
-  if (!definitionId) {
-    return;
-  }
-  overlay.patchSync(sessionId, {
-    footer: {
-      id: definitionId,
-      props: nextProps
-    }
-  });
-}
 const renderedSessions = computed(() => {
   const nextSessions = [];
   for (const session of overlay.sessions) {
@@ -46,7 +35,6 @@ const renderedSessions = computed(() => {
     if (!definition) {
       continue;
     }
-    const footerDefinition = session.footer ? overlay.definitions[session.footer.id] : void 0;
     nextSessions.push({
       sessionId: session.sessionId,
       definitionId: session.definitionId,
@@ -59,11 +47,6 @@ const renderedSessions = computed(() => {
       },
       descriptionSrOnly: session.shell.descriptionSrOnly,
       props: session.props,
-      footer: session.footer && footerDefinition ? {
-        definitionId: session.footer.id,
-        props: session.footer.props,
-        definition: footerDefinition
-      } : void 0,
       definition
     });
   }
@@ -115,23 +98,6 @@ const renderedSessions = computed(() => {
   close: (value) => overlay.closeSync(session.sessionId, value),
   patch: (nextProps) => overlay.patchSync(session.sessionId, { props: nextProps }),
   isDesktop: modalSlotProps.isDesktop
-}"
-        />
-      </template>
-
-      <template
-        v-if="session.footer"
-        #footer="modalSlotProps"
-      >
-        <OverlayBody
-          :render="session.footer.definition.render"
-          :slot-props="{
-  props: session.footer.props,
-  shell: session.shell,
-  sessionId: session.sessionId,
-  close: (value) => overlay.closeSync(session.sessionId, value),
-  patch: (nextProps) => patchFooter(session.sessionId, session.footer?.definitionId, nextProps),
-  isDesktop: modalSlotProps.isDesktop
 }"
         />
       </template>

package/dist/runtime/components/ui/buttons/Buttons.vue

@@ -54,16 +54,32 @@ watch(currentConfig, (value) => {
 }, { immediate: true });
 const modalDefinitions = computed(() => {
   const nextDefinitions = [];
-  for (const [slotName, render] of Object.entries(slots)) {
-    if (!uuidPattern.test(slotName) || typeof render !== "function") {
-      continue;
+  for (const group of displayConfig.value.groups) {
+    for (const item of group.items) {
+      if (isDropdownItem(item)) {
+        for (const child of item.items) {
+          const render2 = slots[child.id];
+          if (render2) {
+            nextDefinitions.push({
+              definitionId: child.id,
+              ownerId: overlayOwnerId,
+              render: render2,
+              shell: getModalShell(child.modal)
+            });
+          }
+        }
+        continue;
+      }
+      const render = slots[item.id];
+      if (render) {
+        nextDefinitions.push({
+          definitionId: item.id,
+          ownerId: overlayOwnerId,
+          render,
+          shell: getModalShell(item.modal)
+        });
+      }
     }
-    nextDefinitions.push({
-      definitionId: slotName,
-      ownerId: overlayOwnerId,
-      render,
-      shell: getModalShell(findButtonAction(slotName)?.modal)
-    });
   }
   return nextDefinitions;
 });

package/dist/runtime/components/ui/fields/Fields.d.vue.ts

@@ -2,6 +2,9 @@ import { Effect } from 'effect';
 import type { CSSProperties } from 'vue';
 export { CalendarFieldC, CURRENT_COMPATIBILITY_DATE, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, KIND, NumberFieldC, SelectFieldC, SlotFieldC, SUPPORTED_COMPATIBILITY_DATES, StringFieldC, ValidationRuleC, createFieldsConfig, validationC, } from './schema.js';
 export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, ValidationRule, } from './schema.js';
+export type FieldsInstance = {
+    valid: import('effect').Effect.Effect<boolean, never>;
+};
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
@@ -127,7 +130,9 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
     }> | undefined>;
 } & {
     modelValue?: Record<string, unknown>;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, {
+    valid: Effect.Effect<boolean, never, never>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: Record<string, unknown>) => any;
     "update:config": (args_0: Readonly<{
         fields: readonly ({

package/dist/runtime/components/ui/fields/Fields.vue

@@ -41,8 +41,10 @@ const displayConfig = ref(defaultConfig);
 const validationErrors = ref({});
 const calendarOpen = ref({});
 const selectOpen = ref({});
+const isReady = ref(false);
 const hasInitializedFieldValues = ref(false);
 const hasEmittedInitialValueReady = ref(false);
+const readyResolvers = [];
 function cloneConfig(config2) {
   const nextConfig = {
     kind: config2.kind,
@@ -214,6 +216,24 @@ function handleSelectCommandValueChange(field, state, value) {
 function clearFieldValidation(path) {
   Reflect.deleteProperty(validationErrors.value, path);
 }
+function markReady() {
+  if (isReady.value) {
+    return;
+  }
+  isReady.value = true;
+  while (readyResolvers.length > 0) {
+    const resolve = readyResolvers.shift();
+    resolve?.();
+  }
+}
+function waitForReady() {
+  if (isReady.value) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve) => {
+    readyResolvers.push(resolve);
+  });
+}
 function snapshotValidationContext(field) {
   const form = structuredClone(toRaw(modelValue.value));
   return {
@@ -221,10 +241,9 @@ function snapshotValidationContext(field) {
     form
   };
 }
-function validateField(field) {
+function getValidationFailure(field) {
   if (!field.validation?.length || isFieldHidden(field) || isFieldDisabled(field)) {
-    clearFieldValidation(field.path);
-    return;
+    return void 0;
   }
   const context = {
     value: getFieldValue(field),
@@ -232,14 +251,39 @@ function validateField(field) {
   };
   for (const rule of field.validation) {
     if (!$dsl.evaluate`${rule.expression}`(context)) {
-      validationErrors.value[field.path] = {
+      return {
         message: rule.message,
         context: snapshotValidationContext(field)
       };
-      return;
     }
   }
+  return void 0;
+}
+function syncFieldValidation(field) {
+  const failure = getValidationFailure(field);
+  if (failure) {
+    validationErrors.value[field.path] = failure;
+    return false;
+  }
   clearFieldValidation(field.path);
+  return true;
+}
+function validateField(field) {
+  syncFieldValidation(field);
+}
+function validateFields() {
+  const nextValidationErrors = {};
+  for (const field of displayConfig.value.fields) {
+    if (isPassiveField(field)) {
+      continue;
+    }
+    const failure = getValidationFailure(field);
+    if (failure) {
+      nextValidationErrors[field.path] = failure;
+    }
+  }
+  validationErrors.value = nextValidationErrors;
+  return Object.keys(nextValidationErrors).length === 0;
 }
 function isFieldInvalid(field) {
   return validationErrors.value[field.path] !== void 0;
@@ -274,6 +318,14 @@ function handleConfiguratorConfirm(nextConfig) {
   displayConfig.value = cloneConfig(nextConfig);
   emit("update:config", nextConfig);
 }
+const fieldsApi = {
+  valid: Effect.async((resume) => {
+    void waitForReady().then(() => {
+      resume(Effect.sync(() => validateFields()));
+    });
+  })
+};
+defineExpose(fieldsApi);
 watch(config, (value) => {
   if (!value) {
     return;
@@ -287,6 +339,7 @@ watch(config, (value) => {
     hasEmittedInitialValueReady.value = true;
     emit("initial-value-ready");
   }
+  markReady();
 }, { immediate: true });
 watchEffect(() => {
   const activePaths = /* @__PURE__ */ new Set();

package/dist/runtime/components/ui/fields/Fields.vue.d.ts

@@ -2,6 +2,9 @@ import { Effect } from 'effect';
 import type { CSSProperties } from 'vue';
 export { CalendarFieldC, CURRENT_COMPATIBILITY_DATE, EmptyFieldC, FieldC, FieldsBodyC, FieldsBodyInputC, FieldsConfigC, FieldsConfigInputC, KIND, NumberFieldC, SelectFieldC, SlotFieldC, SUPPORTED_COMPATIBILITY_DATES, StringFieldC, ValidationRuleC, createFieldsConfig, validationC, } from './schema.js';
 export type { EmptyField, Field, FieldsBody, FieldsBodyInput, FieldsConfig, FieldsConfigInput, SlotField, ValidationRule, } from './schema.js';
+export type FieldsInstance = {
+    valid: import('effect').Effect.Effect<boolean, never>;
+};
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
@@ -127,7 +130,9 @@ declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<{
     }> | undefined>;
 } & {
     modelValue?: Record<string, unknown>;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, {
+    valid: Effect.Effect<boolean, never, never>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: Record<string, unknown>) => any;
     "update:config": (args_0: Readonly<{
         fields: readonly ({

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

@@ -14,19 +14,13 @@ export type OverlayShellProps = Readonly<{
     dismissible?: boolean;
 }>;
 export type OverlayBodyProps = Readonly<Record<string, unknown>>;
-export type OverlaySectionReferenceInput = Readonly<{
-    id: string;
-    props?: Record<string, unknown>;
-}>;
 export type OverlaySessionInput = Readonly<{
     shell?: Partial<OverlayShellProps>;
     props?: Record<string, unknown>;
-    footer?: OverlaySectionReferenceInput;
 }>;
 export type OverlaySessionPatch = Readonly<{
     shell?: Partial<OverlayShellProps>;
     props?: Record<string, unknown>;
-    footer?: OverlaySectionReferenceInput | null;
 }>;
 export type OverlaySlotProps = Readonly<{
     props: OverlayBodyProps;
@@ -51,10 +45,6 @@ type OverlaySession = {
     definitionId: string;
     shell: OverlayShellState;
     props: Record<string, unknown>;
-    footer?: {
-        id: string;
-        props: Record<string, unknown>;
-    };
     deferred: Deferred.Deferred<OverlayResult, never>;
 };
 export type OverlayHandle = Readonly<{

package/dist/runtime/composables/useOverlay.js

@@ -112,18 +112,6 @@ function createOverlayRuntime() {
         ...patch.props
       };
     }
-    if (Reflect.has(patch, "footer")) {
-      if (patch.footer === null || patch.footer === void 0) {
-        session.footer = void 0;
-        return;
-      }
-      session.footer = {
-        id: patch.footer.id,
-        props: {
-          ...patch.footer.props
-        }
-      };
-    }
   }
   function closeSync(sessionId, value) {
     void Effect.runPromise(closeInternal(sessionId, value));
@@ -175,9 +163,6 @@ function createOverlayRuntime() {
         if (!definition) {
           return yield* Effect.fail(createDefinitionNotFoundError(definitionId));
         }
-        if (options?.footer && !getDefinition(options.footer.id)) {
-          return yield* Effect.fail(createDefinitionNotFoundError(options.footer.id));
-        }
         const buttonActionOption = yield* Effect.serviceOption(ButtonActionService);
         const buttonAction = Option.match(buttonActionOption, {
           onNone: () => void 0,
@@ -206,12 +191,6 @@ function createOverlayRuntime() {
           props: {
             ...options?.props
           },
-          footer: options?.footer ? {
-            id: options.footer.id,
-            props: {
-              ...options.footer.props
-            }
-          } : void 0,
           deferred
         };
         sessions.value.push(session);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "",
   "license": "MIT",
   "type": "module",