@vunk/plus 1.12.2 → 1.13.0

package/components/bubble-templates/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const l=require("@vunk/core/components/strategy-renderer"),e=require("vue"),u=require("@vunk/markdown"),o="vk-bubble-template-renderer",{Templates:b,Template:n,Data:s,Renderer:c,useData:d}=l.createStrategyRenderer(o),t=e.defineComponent({name:"VkBubbleTemplates",__name:"index",props:{markdownProps:{type:Object,default:()=>({containers:["thinking","echarts"]})}},setup(r){return(k,m)=>(e.openBlock(),e.createBlock(e.unref(n),{type:"VkMarkdown"},{default:e.withCtx(({props:a})=>[e.createVNode(e.unref(u.VkMarkdown),e.mergeProps({source:a.content},r.markdownProps),null,16,["source"])]),_:1}))}}),p=Object.freeze(Object.defineProperty({__proto__:null},Symbol.toStringTag,{value:"Module"}));t.install=r=>{r.component(t.name||"VkBubbleTemplates",t)};exports.VkBubbleData=s;exports.VkBubbleRenderTemplate=n;exports.VkBubbleRenderTemplates=b;exports.VkBubbleRenderer=c;exports.VkBubbleTemplates=t;exports.__VkBubbleTemplates=p;exports.default=t;exports.useBubbleData=d;

package/components/bubble-templates/index.mjs

@@ -1,21 +1,14 @@
-import { createStrategyRenderer } from '@vunk/core/components/strategy-renderer';
-import { defineComponent, openBlock, createBlock, withCtx, createVNode, mergeProps } from 'vue';
-import { VkMarkdown } from '@vunk/markdown';
-import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
-
-const key = "vk-bubble-template-renderer";
-const {
-  Templates: VkBubbleRenderTemplates,
-  Template: VkBubbleRenderTemplate,
-  Data: VkBubbleData,
-  Renderer: VkBubbleRenderer,
-  useData: useBubbleData
-} = createStrategyRenderer(key);
-
-var _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{
-    name: "VkBubbleTemplates"
-  },
+import { createStrategyRenderer as n } from "@vunk/core/components/strategy-renderer";
+import { defineComponent as o, createBlock as l, openBlock as p, unref as r, withCtx as s, createVNode as b, mergeProps as m } from "vue";
+import { VkMarkdown as u } from "@vunk/markdown";
+const c = "vk-bubble-template-renderer", {
+  Templates: V,
+  Template: k,
+  Data: T,
+  Renderer: y,
+  useData: g
+} = n(c), t = /* @__PURE__ */ o({
+  name: "VkBubbleTemplates",
   __name: "index",
   props: {
     markdownProps: {
@@ -25,37 +18,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       })
     }
   },
-  setup(__props, { expose: __expose }) {
-    __expose();
-    const __returned__ = { get VkMarkdown() {
-      return VkMarkdown;
-    }, get VkBubbleRenderTemplate() {
-      return VkBubbleRenderTemplate;
-    } };
-    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
-    return __returned__;
+  setup(e) {
+    return (d, i) => (p(), l(r(k), { type: "VkMarkdown" }, {
+      default: s(({ props: a }) => [
+        b(r(u), m({
+          source: a.content
+        }, e.markdownProps), null, 16, ["source"])
+      ]),
+      _: 1
+    }));
   }
-});
-
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createBlock($setup["VkBubbleRenderTemplate"], { type: "VkMarkdown" }, {
-    default: withCtx(({ props }) => [
-      createVNode($setup["VkMarkdown"], mergeProps({
-        source: props.content
-      }, $props.markdownProps), null, 16, ["source"])
-    ]),
-    _: 1
-    /* STABLE */
-  });
-}
-var VkBubbleTemplates = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/vunk-plus/vunk-plus/packages/components/bubble-templates/src/index.vue"]]);
-
-var types = /*#__PURE__*/Object.freeze({
+}), w = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null
-});
-
-VkBubbleTemplates.install = (app) => {
-  app.component(VkBubbleTemplates.name || "VkBubbleTemplates", VkBubbleTemplates);
+}, Symbol.toStringTag, { value: "Module" }));
+t.install = (e) => {
+  e.component(t.name || "VkBubbleTemplates", t);
+};
+export {
+  T as VkBubbleData,
+  k as VkBubbleRenderTemplate,
+  V as VkBubbleRenderTemplates,
+  y as VkBubbleRenderer,
+  t as VkBubbleTemplates,
+  w as __VkBubbleTemplates,
+  t as default,
+  g as useBubbleData
 };
-
-export { VkBubbleData, VkBubbleRenderTemplate, VkBubbleRenderTemplates, VkBubbleRenderer, VkBubbleTemplates, types as __VkBubbleTemplates, VkBubbleTemplates as default, useBubbleData };

package/components/bubble-templates/src/index.vue.d.ts

@@ -1,235 +1,13 @@
 import type { PropType } from 'vue';
 import type { MarkdownProps } from './types';
-declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+declare const __VLS_export: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     markdownProps: {
         type: PropType<Partial<MarkdownProps>>;
         default: () => {
             containers: string[];
         };
     };
-}>, {
-    readonly VkMarkdown: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-        source: {
-            type: StringConstructor;
-            default: string;
-        };
-        containers: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => string[];
-        };
-        fences: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => string[];
-        };
-        tags: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => never[];
-        };
-        markdownItOptions: {
-            type: import("vue").PropType<import("markdown-it").Options>;
-            default: () => {};
-        };
-        markdownItSetup: {
-            type: import("vue").PropType<import("@vunk/shared").AnyFunc>;
-            default: import("@vunk/shared").AnyFunc;
-        };
-        dev: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-    }>, {
-        items: import("vue").ComputedRef<import("@vunk/markdown/components/markdown/src/types").RendererToken[]>;
-        handlelog: () => void;
-        md: import("markdown-it");
-    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        source: {
-            type: StringConstructor;
-            default: string;
-        };
-        containers: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => string[];
-        };
-        fences: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => string[];
-        };
-        tags: {
-            type: {
-                (arrayLength: number): string[];
-                (...items: string[]): string[];
-                new (arrayLength: number): string[];
-                new (...items: string[]): string[];
-                isArray(arg: any): arg is any[];
-                readonly prototype: any[];
-                from<T>(arrayLike: ArrayLike<T>): T[];
-                from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                from<T>(iterable: Iterable<T> | ArrayLike<T>): T[];
-                from<T, U>(iterable: Iterable<T> | ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[];
-                of<T>(...items: T[]): T[];
-                fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
-                fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
-                readonly [Symbol.species]: ArrayConstructor;
-            };
-            default: () => never[];
-        };
-        markdownItOptions: {
-            type: import("vue").PropType<import("markdown-it").Options>;
-            default: () => {};
-        };
-        markdownItSetup: {
-            type: import("vue").PropType<import("@vunk/shared").AnyFunc>;
-            default: import("@vunk/shared").AnyFunc;
-        };
-        dev: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-    }>> & Readonly<{}>, {
-        source: string;
-        containers: string[];
-        fences: string[];
-        tags: string[];
-        markdownItOptions: import("markdown-it").Options;
-        markdownItSetup: import("@vunk/shared").AnyFunc;
-        dev: boolean;
-    }, {}, {
-        VkRenderer: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-            source: {
-                type: import("vue").PropType<import("@vunk/core/components/renderer/src/types").SourceItem[]>;
-                default: () => any[];
-            };
-            templateInstances: {
-                type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-                default: any;
-            };
-            k: {
-                type: import("vue").PropType<(string | number)[]>;
-                default: () => any[];
-            };
-        }>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-            source: {
-                type: import("vue").PropType<import("@vunk/core/components/renderer/src/types").SourceItem[]>;
-                default: () => any[];
-            };
-            templateInstances: {
-                type: import("vue").PropType<Record<string, import("vue").ComponentInternalInstance>>;
-                default: any;
-            };
-            k: {
-                type: import("vue").PropType<(string | number)[]>;
-                default: () => any[];
-            };
-        }>> & Readonly<{}>, {
-            source: import("@vunk/core/components/renderer/src/types").SourceItem[];
-            templateInstances: Record<string, import("vue").ComponentInternalInstance>;
-            k: (string | number)[];
-        }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-        VkTemplatesDefault: {
-            new (...args: any[]): any;
-            __isFragment?: never;
-            __isTeleport?: never;
-            __isSuspense?: never;
-        } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<Record<string | symbol, any>>>, Record<string | symbol, any>, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-            [x: string]: any;
-            [x: symbol]: any;
-        }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & {
-            install(app: import("vue").App): void;
-        };
-    }, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-    readonly VkBubbleRenderTemplate: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-        type: {
-            type: StringConstructor;
-            required: boolean;
-            default: string;
-        };
-    }>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        type: {
-            type: StringConstructor;
-            required: boolean;
-            default: string;
-        };
-    }>> & Readonly<{}>, {
-        type: string;
-    }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     markdownProps: {
         type: PropType<Partial<MarkdownProps>>;
         default: () => {
@@ -239,4 +17,5 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{}>, {
     markdownProps: Partial<MarkdownProps>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: typeof __VLS_export;
 export default _default;

package/components/chat-independent/index.cjs

@@ -0,0 +1 @@
+"use strict";var N=Object.create;var T=Object.defineProperty;var q=Object.getOwnPropertyDescriptor;var E=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,j=Object.prototype.hasOwnProperty;var A=(t,r,u,b)=>{if(r&&typeof r=="object"||typeof r=="function")for(let l of E(r))!j.call(t,l)&&l!==u&&T(t,l,{get:()=>r[l],enumerable:!(b=q(r,l))||b.enumerable});return t};var I=(t,r,u)=>(u=t!=null?N(R(t)):{},A(r||!t||!t.__esModule?T(u,"default",{value:t,enumerable:!0}):u,t));Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),L=require("@vunk/plus/components/agent-chat-provider"),O=require("@vunk/plus/components/bubble-list"),P=require("@vunk/plus/components/bubble-templates"),$=require("@vunk/plus/components/sender"),z=require("@vunk/plus/icons/keyboard"),F=require("@vunk/plus/icons/voice"),M=require("@vunk/core"),_=require("@vunk/core/composables"),K=require("@vunk/shared/object"),U=require("@vunk/shared/promise");var a=(t=>(t.Voice="voice",t.Text="text",t))(a||{});const G={data:{type:Object},speechToText:{type:Function},textToSpeech:{type:Function}},H={setData:t=>t},J={class:"vk-chat-independent"},Q={class:"vk-chat-independent-main__bubbles"},W={class:"vk-chat-independent-footer"},X={class:"vk-chat-independent-background"},d=e.defineComponent({name:"VkChatIndependent",__name:"index",props:G,emits:H,setup(t,{emit:r}){const u=t,b=r,l=e.defineAsyncComponent(()=>import("@vunk/plus/components/recorder-button")),[i,y]=_.useDataComputed({},u,b),f=e.ref(),s=e.ref(a.Text),m=e.ref(""),h=_.useDeferred(),C=h.resolve,{simplicity:S}=L.useAgentChat(),{items:p,onRequest:g}=S,k=e.computed(()=>p.value.at(-1)),v=e.computed(()=>B(-1)),D=e.computed(()=>!!(k.value?.loading===!0||K.isNotEmptyObject(v.value)&&v.value.completed!==!0)),V=e.computed(()=>v.value.error===!0?!1:k.value?.loading===!0||v.value.completed===!1);function x(n){n&&(g(n),e.nextTick(()=>{m.value=""}),setTimeout(()=>{h.value?.scrollToBottom()},400))}function w(){const n=p.value.at(-1);n&&(n.abortController?.abort(),U.waiting(()=>i.value[n.key],60).then(o=>{o.elRef?.interrupt(),i.value[n.key].completed=!0}))}function B(n){const o=p.value.at(n);return o?.key&&i.value[o.key]?i.value[o.key]:{}}return(n,o)=>(e.openBlock(),e.createElementBlock("div",J,[e.createElementVNode("div",{ref_key:"mainRef",ref:f,class:"vk-chat-independent-main"},[e.createVNode(e.unref(M.VkDuplex),{"with-flex":"one",class:"vk-chat-independent-main__duplex"},{one:e.withCtx(()=>[e.createVNode(e.unref(P.VkBubbleData),{data:e.unref(i),onSetData:e.unref(y)},{default:e.withCtx(()=>[e.createElementVNode("div",Q,[e.createVNode(e.unref(O.VkBubbleList),{"el-ref":e.unref(C),items:e.unref(p),"text-to-speech":n.textToSpeech},{renderer:e.withCtx(()=>[e.renderSlot(n.$slots,"bubble_renderer")]),footer:e.withCtx(c=>[e.renderSlot(n.$slots,"bubble_footer",e.normalizeProps(e.guardReactiveProps(c)))]),_:3},8,["el-ref","items","text-to-speech"])])]),_:3},8,["data","onSetData"])]),two:e.withCtx(()=>[e.createElementVNode("div",W,[n.speechToText?(e.openBlock(),e.createElementBlock(e.Fragment,{key:0},[e.withDirectives(e.createVNode(e.unref(z.VkKeyboardAvatar),{size:40,onClick:o[0]||(o[0]=c=>s.value=e.unref(a).Text)},null,512),[[e.vShow,s.value===e.unref(a).Voice]]),e.withDirectives(e.createVNode(e.unref(l),{"append-to":f.value,disabled:V.value,"speech-to-text":n.speechToText,"submit-to-text":!0,onSubmitText:x},null,8,["append-to","disabled","speech-to-text"]),[[e.vShow,s.value===e.unref(a).Voice]]),e.withDirectives(e.createVNode(e.unref(F.VkVoiceAvatar),{size:40,onClick:o[1]||(o[1]=c=>s.value=e.unref(a).Voice)},null,512),[[e.vShow,s.value===e.unref(a).Text]])],64)):e.createCommentVNode("",!0),e.withDirectives(e.createVNode(e.unref($.VkSender),{modelValue:m.value,"onUpdate:modelValue":o[2]||(o[2]=c=>m.value=c),placeholder:"请输入内容","send-disabled":V.value,loading:D.value,onSubmit:x,onCancel:w},null,8,["modelValue","send-disabled","loading"]),[[e.vShow,s.value===e.unref(a).Text]])])]),_:3})],512),e.createElementVNode("div",X,[e.renderSlot(n.$slots,"background")])]))}}),Y=Object.freeze(Object.defineProperty({__proto__:null},Symbol.toStringTag,{value:"Module"}));d.install=t=>{t.component(d.name||"VkChatIndependent",d)};exports.VkChatIndependent=d;exports.__VkChatIndependent=Y;exports.default=d;