cabloy 5.1.144 → 5.1.145

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-markdown",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -40,6 +40,7 @@
     "@tiptap/markdown": "^3.30.0",
     "@tiptap/starter-kit": "^3.30.0",
     "@tiptap/static-renderer": "^3.30.0",
+    "lowlight": "^3.3.0",
     "sanitize-html": "^2.17.6"
   },
   "devDependencies": {

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/src/bean/bean.markdown.ts

@@ -7,11 +7,14 @@ import { TableKit } from '@tiptap/extension-table';
 import Youtube from '@tiptap/extension-youtube';
 import { Markdown, MarkdownManager } from '@tiptap/markdown';
 import StarterKit from '@tiptap/starter-kit';
-import { renderToHTMLString } from '@tiptap/static-renderer';
+import { escapeHTML, escapeHTMLAttribute, renderToHTMLString } from '@tiptap/static-renderer';
+import { common, createLowlight } from 'lowlight';
 import sanitizeHtml from 'sanitize-html';
 import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
+const lowlight = createLowlight(common);
+
 const extensions: AnyExtension[] = [
   Markdown,
   StarterKit,
@@ -32,6 +35,33 @@ const markdownManager = new MarkdownManager({
   indentation: { style: 'space', size: 2 },
 });
 
+function renderHighlightedCode(code: string, language?: string | null): string {
+  const highlighted =
+    language && lowlight.registered(language)
+      ? lowlight.highlight(language, code)
+      : lowlight.highlightAuto(code);
+  return highlighted.children.map(renderHighlightedNode).join('');
+}
+
+interface HighlightedNode {
+  children?: HighlightedNode[];
+  properties?: { className?: string[] };
+  tagName?: string;
+  type: string;
+  value?: string;
+}
+
+function renderHighlightedNode(node: HighlightedNode): string {
+  if (node.type === 'text') return escapeHTML(node.value ?? '');
+  const children = node.children?.map(renderHighlightedNode).join('') ?? '';
+  if (node.tagName !== 'span') return children;
+  const classNames = node.properties?.className;
+  const classAttribute = classNames?.length
+    ? ` class="${classNames.map(escapeHTMLAttribute).join(' ')}"`
+    : '';
+  return `<span${classAttribute}>${children}</span>`;
+}
+
 const sanitizeOptions: sanitizeHtml.IOptions = {
   allowedTags: [
     'a',
@@ -53,6 +83,7 @@ const sanitizeOptions: sanitizeHtml.IOptions = {
     'input',
     'label',
     'li',
+    'mark',
     'ol',
     'p',
     'pre',
@@ -131,7 +162,21 @@ export class BeanMarkdown extends BeanBase {
   renderHtml(markdown?: string): string {
     if (!markdown?.trim()) return '';
     const json = markdownManager.parse(markdown);
-    const html = renderToHTMLString({ content: json, extensions });
+    const html = renderToHTMLString({
+      content: json,
+      extensions,
+      options: {
+        nodeMapping: {
+          codeBlock: ({ node }) => {
+            const language = node.attrs.language;
+            const classAttribute = language
+              ? ` class="language-${escapeHTMLAttribute(language)}"`
+              : '';
+            return `<pre><code${classAttribute}>${renderHighlightedCode(node.textContent, language)}</code></pre>`;
+          },
+        },
+      },
+    });
     return sanitizeHtml(html, sanitizeOptions);
   }
 }

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.46",
+  "version": "5.1.47",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-a-cabloy": "workspace:^",
-    "vona-module-a-markdown": "^5.0.2",
+    "vona-module-a-markdown": "^5.0.3",
     "vona-module-a-rbac": "^5.0.1",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.87",
+  "version": "1.1.88",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.87"
+    "zova-core": "^5.1.88"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.152",
+  "version": "5.1.153",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.87",
-    "zova-suite-a-zova": "^5.1.151"
+    "zova-core": "^5.1.88",
+    "zova-suite-a-zova": "^5.1.152"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.87",
+  "version": "5.1.88",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/core/component/locale.ts

@@ -70,6 +70,7 @@ export class AppLocale extends BeanSimple {
 
   /** @internal */
   public createLocaleText(moduleScope?: string): IModuleLocaleText {
+    // eslint-disable-next-line
     const self = this;
     const getText = function (text: string, ...args: any[]): string {
       return self.getText(false, moduleScope, undefined, text, ...args);
@@ -86,6 +87,7 @@ export class AppLocale extends BeanSimple {
 
   /** @internal */
   public createScopeLocaleText(moduleScope: string, text: string): IModuleLocale {
+    // eslint-disable-next-line
     const self = this;
     const getText = function (...args: any[]): string {
       return self.getText(false, moduleScope, undefined, text, ...args);

package/zova/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -1,6 +1,5 @@
 // eslint-disable
 /** service: begin */
-export * from '../service/locale.js';
 export * from '../service/routerGuards.js';
 export * from '../service/ssr.js';
 export * from '../service/ssrLayout.js';
@@ -9,8 +8,7 @@ import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
 
     export interface IServiceRecord {
-      'home-base:locale': never;
-'home-base:routerGuards': never;
+      'home-base:routerGuards': never;
 'home-base:ssr': never;
 'home-base:ssrLayout': never;
     }
@@ -19,17 +17,6 @@ declare module 'zova-module-a-bean' {
 }
 declare module 'zova-module-home-base' {
 
-        export interface ServiceLocale {
-          /** @internal */
-          get scope(): ScopeModuleHomeBase;
-        }
-
-        export interface ServiceLocale {
-          get $beanFullName(): 'home-base.service.locale';
-          get $onionName(): 'home-base:locale';
-
-        }
-
         export interface ServiceRouterGuards {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -65,15 +52,13 @@ declare module 'zova-module-home-base' {
 }
 /** service: end */
 /** service: begin */
-import { ServiceLocale } from '../service/locale.js';
 import { ServiceRouterGuards } from '../service/routerGuards.js';
 import { ServiceSsr } from '../service/ssr.js';
 import { ServiceSsrLayout } from '../service/ssrLayout.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordGeneral {
-    'home-base.service.locale': ServiceLocale;
-'home-base.service.routerGuards': ServiceRouterGuards;
+    'home-base.service.routerGuards': ServiceRouterGuards;
 'home-base.service.ssr': ServiceSsr;
 'home-base.service.ssrLayout': ServiceSsrLayout;
   }

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -1,17 +1,11 @@
 import type { BeanRouter } from 'zova-module-a-router';
 
 import { catchError } from '@cabloy/utils';
-import { Use } from 'zova';
 import { Service } from 'zova-module-a-bean';
 import { BeanRouterGuardsBase } from 'zova-module-a-router';
 
-import { ServiceLocale } from './locale.js';
-
 @Service()
 export class ServiceRouterGuards extends BeanRouterGuardsBase {
-  @Use()
-  $$serviceLocale: ServiceLocale;
-
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
       if (to.meta.requiresAuth === false) return;

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/controller.tsx

@@ -3,7 +3,7 @@ import type { ModelTabs, ModelTabsOptions } from 'zova-module-a-routertabs';
 import { BeanControllerBase, Use, usePrepareArg } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
-import { IServiceSsrLayoutOptions, ServiceLocale, ServiceSsrLayout } from 'zova-module-home-base';
+import { IServiceSsrLayoutOptions, ServiceSsrLayout } from 'zova-module-home-base';
 
 import { ModelLayout } from '../../model/layout.js';
 import { ModelMenu } from '../../model/menu.js';
@@ -33,9 +33,6 @@ export class ControllerLayoutAdmin extends BeanControllerBase {
     } satisfies IServiceSsrLayoutOptions);
   }
 
-  @Use()
-  $$serviceLocale: ServiceLocale;
-
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.locale.tsx

@@ -19,7 +19,7 @@ export class RenderLocale extends BeanRenderBase {
                   <li key={key} class={this.app.meta.locale.current === key ? 'disabled' : ''}>
                     <a
                       onClick={event => {
-                        this.$$serviceLocale.setLocale(key as any);
+                        this.app.meta.locale.current = key as any;
                         closeNearestDetails(event);
                       }}
                     >

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/controller.tsx

@@ -2,7 +2,7 @@ import { BeanControllerBase, Use, usePrepareArg } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ModelTabs, ModelTabsOptions, RouteTabInitial } from 'zova-module-a-routertabs';
-import { IServiceSsrLayoutOptions, ServiceLocale, ServiceSsrLayout } from 'zova-module-home-base';
+import { IServiceSsrLayoutOptions, ServiceSsrLayout } from 'zova-module-home-base';
 
 import { ModelLayout } from '../../model/layout.js';
 import { ModelMenu } from '../../model/menu.js';
@@ -32,9 +32,6 @@ export class ControllerLayoutWeb extends BeanControllerBase {
     } satisfies IServiceSsrLayoutOptions);
   }
 
-  @Use()
-  $$serviceLocale: ServiceLocale;
-
   leftDrawerOpen: boolean;
   leftDrawerOpenMobile: boolean = false;
   belowBreakpoint: boolean;

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.locale.tsx

@@ -27,7 +27,7 @@ export class RenderLocale extends BeanRenderBase {
                             query: currentRoute.query,
                           });
                         } else {
-                          this.$$serviceLocale.setLocale(key as any);
+                          this.app.meta.locale.current = key as any;
                         }
                         closeNearestDetails(event);
                       }}

package/zova/src/suite-vendor/a-zova/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.37",
+  "version": "5.1.38",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/monkey.ts

@@ -77,6 +77,7 @@ export class Monkey
   }
 
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
+    // eslint-disable-next-line
     const self = this;
     // $ssr
     bean.defineProperty(beanInstance, '$ssr', {

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.102",
+  "version": "5.1.103",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.87"
+    "zova-jsx": "^1.1.88"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.29",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.151",
+  "version": "5.1.152",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -26,13 +26,13 @@
     "zova-module-a-router": "^5.1.34",
     "zova-module-a-routerstack": "^5.1.27",
     "zova-module-a-routertabs": "^5.1.34",
-    "zova-module-a-ssr": "^5.1.37",
+    "zova-module-a-ssr": "^5.1.38",
     "zova-module-a-ssrhmr": "^5.1.23",
     "zova-module-a-ssrserver": "^5.1.26",
     "zova-module-a-style": "^5.1.35",
     "zova-module-a-table": "^5.1.38",
     "zova-module-a-zod": "^5.1.37",
-    "zova-module-a-zova": "^5.1.102"
+    "zova-module-a-zova": "^5.1.103"
   },
   "title": "a-zova"
 }

package/zova/src/suite/a-home/modules/home-base/src/service/locale.ts

@@ -1,11 +0,0 @@
-import { BeanBase, ILocaleRecord } from 'zova';
-import { Service } from 'zova-module-a-bean';
-
-@Service()
-export class ServiceLocale extends BeanBase {
-  protected async __init__() {}
-
-  public setLocale(locale: keyof ILocaleRecord) {
-    this.app.meta.locale.current = locale;
-  }
-}