@shwfed/nuxt 0.11.20 → 0.11.22

package/dist/module.json

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

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

@@ -63,12 +63,34 @@ function cloneConfig(config2) {
 function getConfigOrientation(config2) {
   return config2.orientation ?? "horizontal";
 }
+function tryEvaluateExpression(source, context) {
+  try {
+    return {
+      ok: true,
+      value: $dsl.evaluate`${source}`(context)
+    };
+  } catch {
+    return {
+      ok: false
+    };
+  }
+}
+function evaluateExpression(source, context, fallback) {
+  const result = tryEvaluateExpression(source, context);
+  if (!result.ok) {
+    return fallback;
+  }
+  return result.value;
+}
 function getConfigStyle(config2) {
   const style = {};
   if (!config2.style) {
     return style;
   }
-  const styleMap = $dsl.evaluate`${config2.style}`({ form: modelValue.value });
+  const styleMap = evaluateExpression(config2.style, { form: modelValue.value }, {});
+  if (!styleMap || typeof styleMap !== "object" || Array.isArray(styleMap)) {
+    return style;
+  }
   for (const [key, value] of Object.entries(styleMap)) {
     if (typeof value === "string" || typeof value === "number") {
       Reflect.set(style, key, value);
@@ -80,7 +102,7 @@ function getFieldStyle(field) {
   if (!field.style) {
     return {};
   }
-  const style = $dsl.evaluate`${field.style}`();
+  const style = evaluateExpression(field.style, void 0, {});
   const normalizedStyle = {};
   if (!style || typeof style !== "object" || Array.isArray(style)) {
     return normalizedStyle;
@@ -109,10 +131,10 @@ function displayCalendarValue(stored, displayFormat, valueFormat) {
   return stored ?? "";
 }
 function isFieldHidden(field) {
-  return $dsl.evaluate`${field.hidden || "false"}`({ form: modelValue.value });
+  return evaluateExpression(field.hidden || "false", { form: modelValue.value }, false);
 }
 function isFieldDisabled(field) {
-  return $dsl.evaluate`${field.disabled || "false"}`({ form: modelValue.value });
+  return evaluateExpression(field.disabled || "false", { form: modelValue.value }, false);
 }
 function getFieldValue(field) {
   return getProperty(modelValue.value, field.path);
@@ -122,7 +144,11 @@ function initializeFieldValues(config2) {
     if (isPassiveField(field) || !field.initialValue || hasProperty(modelValue.value, field.path)) {
       continue;
     }
-    const initialValue = $dsl.evaluate`${field.initialValue}`({ form: modelValue.value });
+    const initialValueResult = tryEvaluateExpression(field.initialValue, { form: modelValue.value });
+    if (!initialValueResult.ok) {
+      continue;
+    }
+    const initialValue = initialValueResult.value;
     setProperty(
       modelValue.value,
       field.path,
@@ -155,12 +181,22 @@ function isSelectValueEqual(left, right) {
   return leftValue === rightValue;
 }
 function getSelectOptions(field) {
-  return $dsl.evaluate`${field.options}`().map((option) => {
-    return {
-      key: $dsl.evaluate`${field.key}`({ option }),
-      label: $dsl.evaluate`${field.label}`({ option }),
-      value: $dsl.evaluate`${field.value}`({ option })
-    };
+  const options = evaluateExpression(field.options, void 0, []);
+  if (!Array.isArray(options)) {
+    return [];
+  }
+  return options.flatMap((option) => {
+    const key = tryEvaluateExpression(field.key, { option });
+    const label = tryEvaluateExpression(field.label, { option });
+    const value = tryEvaluateExpression(field.value, { option });
+    if (!key.ok || !label.ok || !value.ok) {
+      return [];
+    }
+    return [{
+      key: key.value,
+      label: label.value,
+      value: value.value
+    }];
   });
 }
 function getSelectFieldState(field) {
@@ -251,7 +287,11 @@ function getValidationFailure(field) {
     form: modelValue.value
   };
   for (const rule of field.validation) {
-    if (!$dsl.evaluate`${rule.expression}`(context)) {
+    const evaluation = tryEvaluateExpression(rule.expression, context);
+    if (!evaluation.ok) {
+      continue;
+    }
+    if (!evaluation.value) {
       return {
         message: rule.message,
         context: snapshotValidationContext(field)
@@ -300,6 +340,16 @@ function renderValidationMessage(field) {
   if (!error) return "";
   return $md.inline`${error.message}`(error.context);
 }
+function isCalendarDateDisabled(field, date) {
+  if (!field.disableDate) {
+    return false;
+  }
+  return evaluateExpression(
+    field.disableDate,
+    { date: new TZDate(date.toDate(getLocalTimeZone())) },
+    false
+  );
+}
 function handleCalendarOpenChange(field, open) {
   if (open) {
     calendarOpen.value[field.path] = true;
@@ -512,7 +562,7 @@ export {
                 :layout="field.mode"
                 :model-value="toCalendarDateValue(getProperty(modelValue, field.path), field.value)"
                 :disabled="isFieldDisabled(field)"
-                :is-date-disabled="field.disableDate ? (date) => !!$dsl.evaluate`${field.disableDate}`({ date: new TZDate(date.toDate(getLocalTimeZone())) }) : void 0"
+                :is-date-disabled="field.disableDate ? (date) => isCalendarDateDisabled(field, date) : void 0"
                 @update:model-value="(value) => {
   if (value === void 0) {
     deleteProperty(modelValue, field.path);

package/dist/runtime/table-renderers/builtins.js

@@ -425,7 +425,7 @@ defineTableRenderer(
                 class: "p-1 w-6 h-6 flex items-center justify-center right-1 top-1/2 -translate-y-1/2 transform-3d group-hover:opacity-100 opacity-0 absolute transition-opacity duration-180",
                 size: "xs",
                 onClick: onCopy,
-                children: /* @__PURE__ */ jsx(Icon, { icon: "fluent:copy-20-regular" })
+                children: () => /* @__PURE__ */ jsx(Icon, { icon: "fluent:copy-20-regular" })
               }
             ) : null
           ]
@@ -500,7 +500,7 @@ defineTableRenderer(
           class: "cursor-pointer hover:bg-transparent text-lg",
           "aria-label": ctx.row.getIsExpanded() ? getTableRendererConfigText("collapse-row") : getTableRendererConfigText("expand-row"),
           onClick: ctx.row.getToggleExpandedHandler(),
-          children: /* @__PURE__ */ jsx(Icon, { icon: ctx.row.getIsExpanded() ? "fluent:subtract-square-20-regular" : "fluent:add-square-20-regular" })
+          children: () => /* @__PURE__ */ jsx(Icon, { icon: ctx.row.getIsExpanded() ? "fluent:subtract-square-20-regular" : "fluent:add-square-20-regular" })
         }
       ) });
     },
@@ -512,7 +512,7 @@ defineTableRenderer(
         class: "cursor-pointer hover:bg-transparent text-lg",
         "aria-label": ctx.table.getIsAllRowsExpanded() ? getTableRendererConfigText("collapse-all-rows") : getTableRendererConfigText("expand-all-rows"),
         onClick: ctx.table.getToggleAllRowsExpandedHandler(),
-        children: /* @__PURE__ */ jsx(Icon, { icon: ctx.table.getIsAllRowsExpanded() ? "fluent:subtract-square-20-regular" : "fluent:add-square-20-regular" })
+        children: () => /* @__PURE__ */ jsx(Icon, { icon: ctx.table.getIsAllRowsExpanded() ? "fluent:subtract-square-20-regular" : "fluent:add-square-20-regular" })
       }
     ) }),
     config: NoOptionsConfig,

package/package.json

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