@shwfed/nuxt 0.11.21 → 0.11.23

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.11.21",
+  "version": "0.11.23",
   "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/components/ui/markdown/Markdown.vue

@@ -6,6 +6,7 @@ import { computedAsync } from "@vueuse/core";
 import { Effect } from "effect";
 import { computed, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
+import { mergeDslContexts, useCELContext } from "../../../plugins/cel/context";
 import { getLocalizedText } from "../../../utils/coders";
 import { Button } from "../button";
 import { Skeleton } from "../skeleton";
@@ -22,7 +23,9 @@ const displayConfig = ref(defaultConfig);
 const { $dsl, $md } = useNuxtApp();
 const { t, locale } = useI18n();
 const isCheating = useCheating();
+const inheritedContext = useCELContext();
 const isConfiguratorOpen = ref(false);
+const resolvedContext = computed(() => mergeDslContexts(props.context, inheritedContext));
 function normalizeStyle(value) {
   const style = {};
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -40,7 +43,7 @@ const renderedStyle = computed(() => {
     return {};
   }
   try {
-    return normalizeStyle($dsl.evaluate`${displayConfig.value.style}`(props.context ?? {}));
+    return normalizeStyle($dsl.evaluate`${displayConfig.value.style}`(resolvedContext.value));
   } catch {
     return {};
   }
@@ -51,9 +54,9 @@ const renderedMarkdown = computed(() => {
     return "";
   }
   if (displayConfig.value.inline) {
-    return $md.inline`${markdownSource.value}`(props.context);
+    return $md.inline`${markdownSource.value}`(resolvedContext.value);
   }
-  return $md.block`${markdownSource.value}`(props.context);
+  return $md.block`${markdownSource.value}`(resolvedContext.value);
 });
 function handleConfiguratorConfirm(nextConfig) {
   displayConfig.value = nextConfig;
@@ -107,7 +110,7 @@ export {
       v-if="resolvedConfig !== void 0"
       v-model:open="isConfiguratorOpen"
       :config="displayConfig"
-      :context="props.context"
+      :context="resolvedContext"
       @confirm="handleConfiguratorConfirm"
     />
 

package/dist/runtime/components/ui/menu-tabs/MenuTabs.vue

@@ -6,6 +6,7 @@ import { computedAsync } from "@vueuse/core";
 import { Effect } from "effect";
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
+import { mergeDslContexts, useCELContext } from "../../../plugins/cel/context";
 import { getLocalizedText } from "../../../utils/coders";
 import { Button } from "../button";
 import MenuTabsConfiguratorDialog from "../menu-tabs-configurator/MenuTabsConfiguratorDialog.vue";
@@ -27,6 +28,7 @@ const route = useRoute();
 const router = useRouter();
 const { locale, t } = useI18n();
 const isCheating = useCheating();
+const inheritedContext = useCELContext();
 const resolvedConfig = computedAsync(
   async () => MenuTabsConfigC.parse(await props.config.pipe(Effect.runPromise) ?? defaultConfig)
 );
@@ -43,9 +45,10 @@ function cleanPath(path) {
   return normalizedPath.length > 0 ? normalizedPath : "/";
 }
 function getEvaluationContext() {
+  const context = mergeDslContexts(props.context, inheritedContext);
   return {
-    ...props.context ?? {},
-    context: props.context ?? {}
+    ...context,
+    context
   };
 }
 const resolvedMenus = computed(

package/dist/runtime/components/ui/table/Table.vue

@@ -15,8 +15,9 @@ import { computedAsync } from "@vueuse/core";
 import { getProperty } from "dot-prop";
 import { Effect } from "effect";
 import { Pagination } from "reka-ui/namespaced";
-import { computed, ref, watch } from "vue";
+import { computed, defineComponent, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
+import { mergeDslContexts, provideCELContext, useCELContext } from "../../../plugins/cel/context";
 import { useTableRenderers } from "../../../composables/useTableRenderers";
 import { getLocalizedText } from "../../../utils/coders";
 import {
@@ -53,6 +54,7 @@ const { t, locale } = useI18n();
 const slots = defineSlots();
 const { $dsl } = useNuxtApp();
 const isCheating = useCheating();
+const inheritedDslContext = useCELContext();
 const { resolveTableRenderer } = useTableRenderers();
 const containerRef = ref(null);
 const appliedInitialStateKey = ref("");
@@ -77,6 +79,12 @@ function getColumnTitle(column) {
 function getColumnTooltip(column) {
   return getLocalizedText(column.tooltip, locale.value);
 }
+function getRowDslContext(row, index) {
+  return mergeDslContexts({
+    row,
+    index: BigInt(index)
+  }, inheritedDslContext);
+}
 function translate(column) {
   if (Array.isArray(column.columns) && column.columns.length > 0) {
     return {
@@ -104,7 +112,11 @@ function translate(column) {
       if (slot) {
         return slot({ cell: ctx });
       }
-      return renderer.cell({ ctx, options });
+      return renderer.cell({
+        ctx,
+        dslContext: getRowDslContext(ctx.row.original, ctx.row.index),
+        options
+      });
     },
     accessorFn: (row, index) => {
       const key = column.accessor;
@@ -112,10 +124,7 @@ function translate(column) {
         return getProperty(row, key);
       } else if (key !== void 0) {
         try {
-          return $dsl.evaluate`${key.read}`({
-            row,
-            index: BigInt(index)
-          });
+          return $dsl.evaluate`${key.read}`(getRowDslContext(row, index));
         } catch (e) {
           console.error(e);
           return void 0;
@@ -144,6 +153,25 @@ const paginationLeft = computed(() => currentConfig.value?.paginationLeft ?? "")
 const paginationRight = computed(() => currentConfig.value?.paginationRight ?? "");
 const resolvedPaginationPageSizes = computed(() => normalizePaginationPageSizes(currentConfig.value?.paginationPageSizes));
 const isConfiguratorOpen = ref(false);
+const TableRowCELContext = defineComponent({
+  name: "TableRowCELContext",
+  props: {
+    row: {
+      default: void 0
+    },
+    index: {
+      type: Number,
+      required: true
+    }
+  },
+  setup(props2, { slots: slots2 }) {
+    provideCELContext({
+      row: props2.row,
+      index: BigInt(props2.index)
+    });
+    return () => slots2.default?.();
+  }
+});
 function handleConfiguratorConfirm(nextConfig) {
   currentConfig.value = nextConfig;
   emit("update:config", nextConfig);
@@ -174,7 +202,7 @@ function getRowId(originalRow, index, parent) {
     const key = $dsl.evaluate`${expression}`(
       {
         row: originalRow,
-        index,
+        index: BigInt(index),
         parent: parent ? {
           id: parent.id,
           index: BigInt(parent.index),
@@ -196,10 +224,7 @@ function getSubRows(row, index) {
     return void 0;
   }
   try {
-    const value = $dsl.evaluate`${expression}`({
-      row,
-      index
-    });
+    const value = $dsl.evaluate`${expression}`(getRowDslContext(row, index));
     return Array.isArray(value) ? value : void 0;
   } catch (e) {
     console.error(e);
@@ -212,11 +237,11 @@ function enableRowSelection(row) {
     return true;
   }
   try {
-    return Boolean($dsl.evaluate`${expression}`({
+    return Boolean($dsl.evaluate`${expression}`(mergeDslContexts({
       row: row.original,
       index: BigInt(row.index),
       id: row.id
-    }));
+    }, inheritedDslContext)));
   } catch (e) {
     console.error(e);
     return true;
@@ -228,11 +253,11 @@ function enableMultiRowSelection(row) {
     return true;
   }
   try {
-    return Boolean($dsl.evaluate`${expression}`({
+    return Boolean($dsl.evaluate`${expression}`(mergeDslContexts({
       row: row.original,
       index: BigInt(row.index),
       id: row.id
-    }));
+    }, inheritedDslContext)));
   } catch (e) {
     console.error(e);
     return true;
@@ -352,13 +377,13 @@ function getCellStyles(ctx) {
   if (!expression)
     return {};
   try {
-    const result = $dsl.evaluate`${expression}`({
+    const result = $dsl.evaluate`${expression}`(mergeDslContexts({
       row: ctx.row.original,
       index: BigInt(ctx.row.index),
       id: ctx.column.id,
       selected: ctx.row.getIsSelected(),
       pinned: ctx.column.getIsPinned()
-    });
+    }, inheritedDslContext));
     return isStyleRecord(result) ? result : {};
   } catch (e) {
     console.error(e);
@@ -737,10 +762,15 @@ export {
   ...getCellStyles(cell.getContext())
 }"
                   >
-                    <FlexRender
-                      :render="cell.column.columnDef.cell"
-                      :props="cell.getContext()"
-                    />
+                    <TableRowCELContext
+                      :row="cell.row.original"
+                      :index="cell.row.index"
+                    >
+                      <FlexRender
+                        :render="cell.column.columnDef.cell"
+                        :props="cell.getContext()"
+                      />
+                    </TableRowCELContext>
                   </td>
                 </tr>
               </tbody>

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

@@ -0,0 +1 @@
+export { provideCELContext } from '../plugins/cel/context.js';

package/dist/runtime/composables/provideCELContext.js

@@ -0,0 +1 @@
+export { provideCELContext } from "../plugins/cel/context.js";

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

@@ -0,0 +1 @@
+export { useCELContext } from '../plugins/cel/context.js';

package/dist/runtime/composables/useCELContext.js

@@ -0,0 +1 @@
+export { useCELContext } from "../plugins/cel/context.js";

package/dist/runtime/plugins/cel/context.d.ts

@@ -1,2 +1,6 @@
+export declare function mergeDslContexts(...contexts: Array<Record<string, unknown> | undefined>): Record<string, unknown>;
 export declare function setGlobalDslContext(context: Record<string, unknown>): void;
 export declare function getGlobalDslContext(): Record<string, unknown>;
+export declare function getProvidedDslContext(): Record<string, unknown>;
+export declare function provideCELContext(context: Record<string, unknown>): void;
+export declare function useCELContext(overrides?: Record<string, unknown>): Record<string, unknown>;

package/dist/runtime/plugins/cel/context.js

@@ -1,7 +1,27 @@
+import defu from "defu";
+import { hasInjectionContext, inject, provide } from "vue";
+const dslContextKey = Symbol("shwfed-cel-context");
+const emptyDslContext = {};
 let globalDslContext = {};
+export function mergeDslContexts(...contexts) {
+  const definedContexts = contexts.filter((context) => context !== void 0);
+  return defu({}, ...definedContexts);
+}
 export function setGlobalDslContext(context) {
   globalDslContext = context;
 }
 export function getGlobalDslContext() {
   return globalDslContext;
 }
+export function getProvidedDslContext() {
+  if (!hasInjectionContext()) {
+    return emptyDslContext;
+  }
+  return inject(dslContextKey, emptyDslContext);
+}
+export function provideCELContext(context) {
+  provide(dslContextKey, mergeDslContexts(context, getProvidedDslContext()));
+}
+export function useCELContext(overrides) {
+  return mergeDslContexts(overrides, getProvidedDslContext());
+}

package/dist/runtime/plugins/cel/index.js

@@ -1,7 +1,7 @@
 import { defineNuxtPlugin, useRuntimeConfig } from "#app";
 import defu from "defu";
 import { createEnvironment } from "./env.js";
-import { getGlobalDslContext } from "./context.js";
+import { getGlobalDslContext, getProvidedDslContext } from "./context.js";
 import { useNavigatorLanguage } from "@vueuse/core";
 import { TZDate } from "@date-fns/tz";
 export default defineNuxtPlugin({
@@ -14,7 +14,7 @@ export default defineNuxtPlugin({
       build: config.ci.build !== void 0 ? BigInt(config.ci.build) : void 0
     });
     const evaluate = (...args) => (context) => {
-      return env.evaluate(String.raw(...args), defu({}, getGlobalDslContext(), context, {
+      return env.evaluate(String.raw(...args), defu({}, context, getProvidedDslContext(), getGlobalDslContext(), {
         now: new TZDate(),
         today: new TZDate(),
         location: new URL(location.href),

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

@@ -387,7 +387,7 @@ defineTableRenderer(
     align: z.enum(["left", "center", "right"]).default("left")
   },
   {
-    cell: ({ ctx, options }) => {
+    cell: ({ ctx, dslContext, options }) => {
       const rawValue = ctx.cell.getValue();
       const isEmpty = rawValue === void 0 || rawValue === null;
       const align = isEmpty ? "center" : options.align ?? "left";
@@ -397,10 +397,7 @@ defineTableRenderer(
         try {
           let text = String(ctx.cell.getValue());
           if (options.copyExpression) {
-            text = String($dsl.evaluate`${options.copyExpression}`({
-              row: ctx.row.original,
-              index: BigInt(ctx.row.index)
-            }));
+            text = String($dsl.evaluate`${options.copyExpression}`(dslContext));
           }
           await navigator.clipboard.writeText(text);
         } catch (e) {

package/dist/runtime/table-renderers/registry.d.ts

@@ -5,6 +5,7 @@ export type TableRendererId = string;
 export type TableRendererColumnDefOverrides<TData extends RowData = unknown> = Partial<Pick<ColumnDef<TData, unknown>, 'enableResizing' | 'enableSorting' | 'enableMultiSort' | 'enablePinning' | 'sortingFn' | 'size' | 'meta'>>;
 export type TableRendererCellArgs<TData extends RowData, TValue, TOptions> = Readonly<{
     ctx: CellContext<TData, TValue>;
+    dslContext: Record<string, unknown>;
     options: TOptions;
 }>;
 export type TableRendererHeaderArgs<TData extends RowData, TValue, TOptions> = Readonly<{

package/package.json

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