@shwfed/nuxt 0.1.17 → 0.1.18

package/dist/module.json

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

package/dist/module.mjs

@@ -18,7 +18,6 @@ const module$1 = defineNuxtModule({
       prefix: "shwfed",
       extensions: ["vue"]
     });
-    nuxt.options.typescript.tsConfig.include?.push(resolver.resolve("runtime/types/directive.d.ts"));
   }
 });
 

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

@@ -1,5 +1,6 @@
 import type { RowData, TableOptions } from '@tanstack/vue-table';
 export type Expression = string;
+export type Markdown = string;
 export type Render = string | Readonly<{
     id: string;
     props: unknown;
@@ -41,6 +42,8 @@ declare const __VLS_export: import("vue").DefineComponent<Readonly<{
     data: Array<unknown>;
     cellStyles?: Expression;
     props?: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
+    paginationLeft?: Markdown;
+    paginationRight?: Markdown;
 }>, import("@tanstack/vue-table").Table<unknown>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<Readonly<{
     id: string;
     getRowId?: Expression;
@@ -51,6 +54,8 @@ declare const __VLS_export: import("vue").DefineComponent<Readonly<{
     data: Array<unknown>;
     cellStyles?: Expression;
     props?: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
+    paginationLeft?: Markdown;
+    paginationRight?: Markdown;
 }>> & Readonly<{}>, {
     readonly props: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
     readonly getRowId: Expression;

package/dist/runtime/components/table.vue

@@ -20,14 +20,13 @@ const props = defineProps({
   columns: { type: Array, required: true },
   data: { type: Array, required: true },
   cellStyles: { type: String, required: false, default: void 0 },
-  props: { type: Object, required: false, default: void 0 }
+  props: { type: Object, required: false, default: void 0 },
+  paginationLeft: { type: String, required: false },
+  paginationRight: { type: String, required: false }
 });
-const { $dsl, $markdown } = useNuxtApp();
+const { $dsl } = useNuxtApp();
 const { resolveTableRenderer } = useTableRenderers();
 const containerRef = ref(null);
-function renderInline(source) {
-  return $markdown.renderInline(source);
-}
 function genColumnId(column) {
   if (typeof column.accessor === "string") {
     return column.accessor;
@@ -292,7 +291,7 @@ function getSortIcon(column) {
                 <Tooltip
                   v-if="!header.isPlaceholder && header.column.columnDef.meta?.tooltip"
                   :delay-duration="180"
-                  :content="renderInline(header.column.columnDef.meta.tooltip)"
+                  :content="$md.inline`${header.column.columnDef.meta.tooltip}`"
                 >
                   <Icon icon="fluent:info-20-regular" />
                 </Tooltip>
@@ -408,7 +407,9 @@ function getSortIcon(column) {
     </div>
 
     <div class="flex items-center justify-between w-full p-4 text-sm text-zinc-600">
-      <div />
+      <div>
+        <div />
+      </div>
       <div class="flex items-center gap-4">
         <span class="text-xs">{{ `\u5171 ${props.data.length} \u6761` }}</span>
         <Pagination.Root

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

@@ -1,5 +1,6 @@
 import type { RowData, TableOptions } from '@tanstack/vue-table';
 export type Expression = string;
+export type Markdown = string;
 export type Render = string | Readonly<{
     id: string;
     props: unknown;
@@ -41,6 +42,8 @@ declare const __VLS_export: import("vue").DefineComponent<Readonly<{
     data: Array<unknown>;
     cellStyles?: Expression;
     props?: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
+    paginationLeft?: Markdown;
+    paginationRight?: Markdown;
 }>, import("@tanstack/vue-table").Table<unknown>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<Readonly<{
     id: string;
     getRowId?: Expression;
@@ -51,6 +54,8 @@ declare const __VLS_export: import("vue").DefineComponent<Readonly<{
     data: Array<unknown>;
     cellStyles?: Expression;
     props?: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
+    paginationLeft?: Markdown;
+    paginationRight?: Markdown;
 }>> & Readonly<{}>, {
     readonly props: Omit<TableOptions<unknown>, "columns" | "data" | "getRowId" | "getCoreRowModel">;
     readonly getRowId: Expression;

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

@@ -1,25 +1,28 @@
 import { defineNuxtPlugin } from "#app";
 import defu from "defu";
 import { createEnvironment } from "./env.js";
-export default defineNuxtPlugin(() => {
-  const env = createEnvironment();
-  return {
-    provide: {
-      dsl: {
-        check: (source) => {
-          return env.check(source);
-        },
-        /**
-         * Synchronous evaluation for render-time usage (e.g. table accessors).
-         *
-         * Will throw `TypeError` / `EvaluationError` on failure.
-         */
-        evaluate: (source, context) => {
-          return env.evaluate(source, defu(context, {
-            now: /* @__PURE__ */ new Date()
-          }));
+export default defineNuxtPlugin({
+  name: "shwfed-nuxt:cel",
+  setup: () => {
+    const env = createEnvironment();
+    return {
+      provide: {
+        dsl: {
+          check: (source) => {
+            return env.check(source);
+          },
+          /**
+           * Synchronous evaluation for render-time usage (e.g. table accessors).
+           *
+           * Will throw `TypeError` / `EvaluationError` on failure.
+           */
+          evaluate: (source, context) => {
+            return env.evaluate(source, defu(context, {
+              now: /* @__PURE__ */ new Date()
+            }));
+          }
         }
       }
-    }
-  };
+    };
+  }
 });

package/dist/runtime/plugins/markdown/index.d.ts

@@ -1,15 +1,23 @@
 import { md } from './md.js';
 declare const _default: import("#app").Plugin<{
-    md: typeof md;
-    markdown: {
-        render: (source: string) => string;
-        renderInline: (source: string) => string;
+    md: {
+        raw: typeof md;
+        inline: (template: {
+            raw: readonly string[] | ArrayLike<string>;
+        }, ...substitutions: any[]) => string;
+        block: (template: {
+            raw: readonly string[] | ArrayLike<string>;
+        }, ...substitutions: any[]) => string;
     };
 }> & import("#app").ObjectPlugin<{
-    md: typeof md;
-    markdown: {
-        render: (source: string) => string;
-        renderInline: (source: string) => string;
+    md: {
+        raw: typeof md;
+        inline: (template: {
+            raw: readonly string[] | ArrayLike<string>;
+        }, ...substitutions: any[]) => string;
+        block: (template: {
+            raw: readonly string[] | ArrayLike<string>;
+        }, ...substitutions: any[]) => string;
     };
 }>;
 export default _default;

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

@@ -1,33 +1,34 @@
-import { defineNuxtPlugin } from "#app";
+import { defineNuxtPlugin, useNuxtApp } from "#app";
 import MarkdownIt from "markdown-it";
 import { md } from "./md.js";
-export default defineNuxtPlugin((app) => {
-  const engine = new MarkdownIt("commonmark", {
-    html: true
-  });
-  app.vueApp.directive("md", {
-    beforeMount(el, v) {
-      if (["inline", "inline-flex", "inline-block"].includes(getComputedStyle(el).display)) {
-        el.innerHTML = engine.renderInline(v.value);
-      } else {
-        el.innerHTML = engine.render(v.value);
-      }
-    },
-    beforeUpdate(el, v) {
-      if (["inline", "inline-flex", "inline-block"].includes(getComputedStyle(el).display)) {
-        el.innerHTML = engine.renderInline(v.value);
-      } else {
-        el.innerHTML = engine.render(v.value);
-      }
+export default defineNuxtPlugin({
+  name: "shwfed-nuxt:markdown",
+  dependsOn: ["shwfed-nuxt:cel"],
+  setup: () => {
+    const engine = new MarkdownIt("commonmark", {
+      html: true
+    });
+    const { $dsl } = useNuxtApp();
+    function evaluateBlock(source) {
+      return source.replace(/\{\{([\s\S]+?)\}\}/g, (_, expression) => {
+        if (!expression)
+          return "";
+        try {
+          return $dsl.evaluate(expression);
+        } catch (e) {
+          console.error(e);
+          return "";
+        }
+      });
     }
-  });
-  return {
-    provide: {
-      md,
-      markdown: {
-        render: (source) => engine.render(source),
-        renderInline: (source) => engine.renderInline(source)
+    return {
+      provide: {
+        md: {
+          raw: md,
+          inline: (...args) => engine.renderInline(evaluateBlock(md(...args))),
+          block: (...args) => engine.render(evaluateBlock(md(...args)))
+        }
       }
-    }
-  };
+    };
+  }
 });

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

@@ -400,10 +400,9 @@ defineTableRenderer(
   },
   {
     cell: ({ ctx, options }) => {
-      const { $markdown } = useNuxtApp();
+      const { $md } = useNuxtApp();
       const source = options.source ?? String(ctx.cell.getValue());
-      const html = $markdown.renderInline(source);
-      return /* @__PURE__ */ jsx("div", { class: "relative w-full py-2 px-1 flex items-center justify-center text-xs", children: /* @__PURE__ */ jsx("span", { class: "prose prose-zinc text-xs", innerHTML: html }) });
+      return /* @__PURE__ */ jsx("div", { class: "relative w-full py-2 px-1 flex items-center justify-center text-xs", children: /* @__PURE__ */ jsx("span", { class: "prose prose-zinc text-xs", innerHTML: $md.inline`${source}` }) });
     },
     config: TableRendererMarkdownConfig
   }

package/package.json

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

package/dist/runtime/types/directive.d.ts

@@ -1,9 +0,0 @@
-import type { Directive } from 'vue'
-
-export type MdDirective = Directive<HTMLElement, string>
-
-declare module 'vue' {
-  export interface ComponentCustomProperties {
-    vMd: MdDirective
-  }
-}