@ray-js/adapter 0.5.7-beta-2

package/esm/hostComponents/View/index.d.ts

@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { BaseProps, TouchEvent } from '../../types/component';
+export interface ViewProps extends BaseProps {
+    slot?: string;
+    /** 指定按下去的样式类。当为 "none" 时，没有点击态效果 1.0.0  */
+    hoverClassName?: string;
+    /** 指定是否阻止本节点的祖先节点出现点击态 1.5.0  */
+    hoverStopPropagation?: boolean;
+    /** (default: 50) 按住后多久出现点击态，单位毫秒 1.0.0  */
+    hoverStartTime?: number;
+    /** (default: 400) 手指松开后点击态保留时间，单位毫秒 1.0.0  */
+    hoverStayTime?: number;
+    disableScroll?: boolean;
+    onTouchStart?: (event: TouchEvent) => any;
+    onTouchMove?: (event: TouchEvent) => any;
+    onTouchEnd?: (event: TouchEvent) => any;
+    onTouchCancel?: (event: TouchEvent) => any;
+    onLongClick?: (event: TouchEvent) => any;
+    onTransitionEnd?: (event: any) => any;
+    onAnimationIteration?: (event: any) => any;
+    onAnimationStart?: (event: any) => any;
+    onAnimationEnd?: (event: any) => any;
+}
+export declare const View: React.ComponentType<ViewProps>;

package/esm/hostComponents/View/index.js

@@ -0,0 +1,8 @@
+import { createHostComponent } from '@ray-core/runtime';
+export const View = createHostComponent('view');
+View.defaultProps = {
+    hoverClassName: 'none',
+    hoverStopPropagation: false,
+    hoverStartTime: 50,
+    hoverStayTime: 400,
+};

package/esm/hostComponents/View/node.d.ts

@@ -0,0 +1,27 @@
+export declare const alias: {
+    id: string;
+    disableScroll: string;
+    hoverClass: string;
+    hoverClassName: string;
+    hoverStartTime: string;
+    hoverStayTime: string;
+    hidden: string;
+    className: string;
+    animation: string;
+    style: string;
+    hoverStopPropagation: string;
+    onTap: string;
+    onClick: string;
+    onTouchStart: string;
+    onTouchMove: string;
+    onTouchEnd: string;
+    onTouchCancel: string;
+    onLongTap: string;
+    onLongClick: string;
+    onLongPress: string;
+    onTransitionEnd: string;
+    onAnimationIteration: string;
+    onAnimationStart: string;
+    onAnimationEnd: string;
+};
+export declare const props: string[];

package/esm/hostComponents/View/node.js

@@ -0,0 +1,28 @@
+export const alias = {
+    id: 'id',
+    disableScroll: 'disable-scroll',
+    hoverClass: 'hover-class',
+    hoverClassName: 'hover-class',
+    hoverStartTime: 'hover-start-time',
+    hoverStayTime: 'hover-stay-time',
+    hidden: 'hidden',
+    className: 'class',
+    animation: 'animation',
+    style: 'style',
+    hoverStopPropagation: 'hover-stop-propagation',
+    onTap: 'bindtap',
+    onClick: 'bindtap',
+    onTouchStart: 'bindtouchstart',
+    onTouchMove: 'bindtouchmove',
+    onTouchEnd: 'bindtouchend',
+    onTouchCancel: 'bindtouchcancel',
+    onLongTap: 'bindlongtap',
+    onLongClick: 'bindlongtap',
+    onLongPress: 'bindlongpress',
+    onTransitionEnd: 'bindtransitionend',
+    onAnimationIteration: 'bindanimationiteration',
+    onAnimationStart: 'bindanimationstart',
+    onAnimationEnd: 'bindanimationend',
+    // catchTouchMove: 'catchtouchmove',
+};
+export const props = Object.values(alias);

package/esm/hostComponents/index.d.ts

@@ -0,0 +1,27 @@
+export * from './Button';
+export * from './Canvas';
+export * from './Checkbox';
+export * from './CheckboxGroup';
+export * from './Form';
+export * from './Image';
+export * from './Input';
+export * from './Label';
+export * from './MovableArea';
+export * from './MovableView';
+export * from './Picker';
+export * from './PickerView';
+export * from './PickerViewColumn';
+export * from './Radio';
+export * from './RadioGroup';
+export * from './ScrollView';
+export * from './Swiper';
+export * from './SwiperItem';
+export * from './Switch';
+export * from './Slider';
+export * from './Text';
+export * from './Textarea';
+export * from './Video';
+export * from './View';
+export * from './PageContainer';
+export * from './IpcPlayer';
+export * from './CoverView';

package/esm/hostComponents/index.js

@@ -0,0 +1,27 @@
+export * from './Button';
+export * from './Canvas';
+export * from './Checkbox';
+export * from './CheckboxGroup';
+export * from './Form';
+export * from './Image';
+export * from './Input';
+export * from './Label';
+export * from './MovableArea';
+export * from './MovableView';
+export * from './Picker';
+export * from './PickerView';
+export * from './PickerViewColumn';
+export * from './Radio';
+export * from './RadioGroup';
+export * from './ScrollView';
+export * from './Swiper';
+export * from './SwiperItem';
+export * from './Switch';
+export * from './Slider';
+export * from './Text';
+export * from './Textarea';
+export * from './Video';
+export * from './View';
+export * from './PageContainer';
+export * from './IpcPlayer';
+export * from './CoverView';

package/esm/hostComponents/node.d.ts

@@ -0,0 +1,2 @@
+declare const hostComponents: Map<any, any>;
+export default hostComponents;

package/esm/hostComponents/node.js

@@ -0,0 +1,56 @@
+import * as Button from './Button/node';
+import * as Canvas from './Canvas/node';
+import * as Checkbox from './Checkbox/node';
+import * as CheckboxGroup from './CheckboxGroup/node';
+import * as Form from './Form/node';
+import * as Image from './Image/node';
+import * as Input from './Input/node';
+import * as Label from './Label/node';
+import * as MovableArea from './MovableArea/node';
+import * as MovableView from './MovableView/node';
+import * as Picker from './Picker/node';
+import * as PickerView from './PickerView/node';
+import * as PickerViewColumn from './PickerViewColumn/node';
+import * as Radio from './Radio/node';
+import * as RadioGroup from './RadioGroup/node';
+import * as ScrollView from './ScrollView/node';
+import * as Swiper from './Swiper/node';
+import * as SwiperItem from './SwiperItem/node';
+import * as Switch from './Switch/node';
+import * as Slider from './Slider/node';
+import * as Text from './Text/node';
+import * as Textarea from './Textarea/node';
+import * as Video from './Video/node';
+import * as View from './View/node';
+import * as PageContainer from './PageContainer/node';
+import * as IpcPlayer from './IpcPlayer/node';
+import * as CoverView from './CoverView/node';
+const hostComponents = new Map();
+hostComponents.set('button', Button);
+hostComponents.set('canvas', Canvas);
+hostComponents.set('checkbox', Checkbox);
+hostComponents.set('checkbox-group', CheckboxGroup);
+hostComponents.set('form', Form);
+hostComponents.set('image', Image);
+hostComponents.set('input', Input);
+hostComponents.set('label', Label);
+hostComponents.set('movable-area', MovableArea);
+hostComponents.set('movable-view', MovableView);
+hostComponents.set('picker', Picker);
+hostComponents.set('picker-view', PickerView);
+hostComponents.set('picker-view-column', PickerViewColumn);
+hostComponents.set('radio', Radio);
+hostComponents.set('radio-group', RadioGroup);
+hostComponents.set('scroll-view', ScrollView);
+hostComponents.set('swiper', Swiper);
+hostComponents.set('swiper-item', SwiperItem);
+hostComponents.set('switch', Switch);
+hostComponents.set('slider', Slider);
+hostComponents.set('text', Text);
+hostComponents.set('textarea', Textarea);
+hostComponents.set('video', Video);
+hostComponents.set('view', View);
+hostComponents.set('page-container', PageContainer);
+hostComponents.set('ipc-player', IpcPlayer);
+hostComponents.set('cover-view', CoverView);
+export default hostComponents;

package/esm/index.d.ts

@@ -0,0 +1,2 @@
+export * from './hostComponents';
+export * from './types';

package/esm/index.js

@@ -0,0 +1,2 @@
+export * from './hostComponents';
+export * from './types';

package/esm/node/index.d.ts

@@ -0,0 +1,3 @@
+import { PluginConstructor } from '@ray-core/types';
+declare const plugin: PluginConstructor;
+export default plugin;

package/esm/node/index.js

@@ -0,0 +1,20 @@
+import * as path from 'path';
+import hostComponents from '../hostComponents/node';
+const EJS_TPL_ROOT = path.join(__dirname, '../../templates');
+const plugin = () => {
+    return {
+        meta: {
+            global: 'ty',
+            template: { extension: '.tyml', tag: 'import', src: 'src' },
+            style: '.tyss',
+            jsHelper: { extension: '.sjs', tag: 'sjs', src: 'src' },
+            ejs: {
+                base: path.join(EJS_TPL_ROOT, 'base.ejs'),
+                page: path.join(EJS_TPL_ROOT, 'page.ejs'),
+            },
+        },
+        hostComponents,
+        skipHostComponents: ['swiper-item'],
+    };
+};
+export default plugin;

package/esm/types/component.d.ts

@@ -0,0 +1,79 @@
+import * as React from 'react';
+/** 微信内置组件公共属性 */
+export interface BaseProps {
+    /** 自定义属性: 组件上触发的事件时，会发送给事件处理函数 */
+    readonly dataset?: DOMStringMap;
+    /** 组件的唯一标示: 保持整个页面唯一 */
+    id?: string;
+    /** 组件的样式类: 在对应的 WXSS 中定义的样式类 */
+    className?: string;
+    /** 组件的内联样式: 可以动态设置的内联样式 */
+    style?: React.CSSProperties;
+    /** 组件是否显示: 所有组件默认显示 */
+    hidden?: boolean;
+    /** 动画对象: 由`ty.createAnimation`创建 */
+    animation?: Array<Record<string, any>>;
+    /** 点击时触发 */
+    onTap?: (event: TouchEvent) => void;
+    /** 点击时触发 */
+    onClick?: (event: TouchEvent) => void;
+    /** 手指触摸动作开始 */
+    onTouchStart?: (event: TouchEvent) => void;
+    /** 手指触摸后移动 */
+    onTouchMove?: (event: TouchEvent) => void;
+    /** 手指触摸动作被打断，如来电提醒，弹窗 */
+    onTouchCancel?: (event: TouchEvent) => void;
+    /** 手指触摸动作结束 */
+    onTouchEnd?: (event: TouchEvent) => void;
+    /** 手指触摸后，超过350ms再离开，如果指定了事件回调函数并触发了这个事件，tap事件将不被触发 */
+    onLongPress?: (event: TouchEvent) => void;
+    /** 手指触摸后，超过350ms再离开（推荐使用longpress事件代替） */
+    onLongTap?: (event: TouchEvent) => void;
+    /** 会在 WXSS transition 或 ty.createAnimation 动画结束后触发 */
+    onTransitionEnd?: (event: GenericEvent) => void;
+    /** 会在一个 WXSS animation 动画开始时触发 */
+    onAnimationStart?: (event: GenericEvent) => void;
+    /** 会在一个 WXSS animation 一次迭代结束时触发 */
+    onAnimationiteration?: (event: GenericEvent) => void;
+    /** 会在一个 WXSS animation 动画完成时触发 */
+    onAnimationEnd?: (event: GenericEvent) => void;
+    /** 在支持 3D Touch 的 iPhone 设备，重按时会触发 */
+    onTouchForceChange?: (event: TouchEvent) => void;
+    /** 点击时触发同时阻止事件冒泡 */
+    catchClick?: (event: any) => any;
+}
+interface Target {
+    /** 事件源组件的id */
+    id: string;
+    /** 事件源组件上的 `dataset` 自定义属性组成的集合 */
+    dataset: any;
+}
+/** 基础事件对象属性列表 */
+export interface BaseEvent {
+    /** 事件类型 */
+    type: string;
+    /** 页面打开到触发事件所经过的毫秒数 */
+    timeStamp: number;
+    /** 触发事件的源组件 */
+    target: Target;
+    /**
+     * 当前组件的一些属性值集合
+     * @特殊事件 canvas 中的触摸事件不可冒泡，所以没有 currentTarget
+     */
+    currentTarget: Target;
+    /** 事件标记数据 */
+    mark: any;
+}
+/** 自定义事件对象属性列表 */
+export interface GenericEvent<Detail = any> extends BaseEvent {
+    /** 额外的信息 */
+    detail: Detail;
+}
+/** 触摸事件对象属性列表 */
+export interface TouchEvent<T = Touch> extends BaseEvent {
+    /** 触摸事件，当前停留在屏幕中的触摸点信息的数组 */
+    touches: T[];
+    /** 触摸事件，当前变化的触摸点信息的数组 */
+    changedTouches: T[];
+}
+export {};

package/esm/types/component.js

@@ -0,0 +1 @@
+export {};

package/esm/types/config.d.ts

@@ -0,0 +1,185 @@
+export interface PageConfig {
+    /**
+     *	HexColor	#000000	导航栏背景颜色，如 #000000
+     */
+    navigationBarBackgroundColor?: string;
+    /**
+     *	string	white	导航栏标题颜色，仅支持 black / white
+     */
+    navigationBarTextStyle?: string;
+    /**
+     *	string		导航栏标题文字内容
+     */
+    navigationBarTitleText?: string;
+    /**
+     *	string	default	导航栏样式
+     */
+    navigationStyle?: string;
+    /**
+     *	HexColor	#ffffff	窗口的背景色
+     */
+    backgroundColor?: string;
+    /**
+     *	string	dark	下拉 loading 的样式，仅支持 dark / light
+     */
+    backgroundTextStyle?: string;
+    /**
+     *	string	#ffffff	顶部窗口的背景色
+     */
+    backgroundColorTop?: string;
+    /**
+     *	string	#ffffff	底部窗口的背景色
+     */
+    backgroundColorBottom?: string;
+    /**
+     *	boolean	false	是否开启当前页面下拉刷新
+     */
+    enablePullDownRefresh?: boolean;
+    /**
+     *	number	50	页面上拉触底事件触发时距页面底部距离，单位为 px
+     */
+    onReachBottomDistance?: number;
+    /**
+     *	string	portrait	屏幕旋转设置，支持 auto / portrait / landscape
+     */
+    pageOrientation?: string;
+    /**
+     *	boolean	false	设置为 true 则页面整体不能上下滚动
+     */
+    disableScroll?: boolean;
+    /**
+     *	Object	否	页面自定义组件配置
+     */
+    usingComponents?: Record<string, string>;
+    /**
+     *	string		页面初始渲染缓存配置
+     */
+    initialRenderingCache?: string;
+}
+export interface AppConfig {
+    /**
+     * 指定小程序的默认启动路径（首页），常见情景是从微信聊天列表页下拉启动、小程序列表启动等。如果不填，将默认为 pages 列表的第一项。不支持带页面路径参数。
+     */
+    entryPagePath?: string;
+    /**
+     * 自定义 theme.json 的路径，配置了 themeLocation 自动支持主题配置。
+     */
+    themeLocation?: string;
+    /**
+     * 用于指定小程序由哪些页面组成，每一项都对应一个页面的 路径（含文件名） 信息。文件名不需要写文件后缀，框架会自动去寻找对应位置的 .json, .js, .xml, .css/less 四个文件进行处理。
+     * 未指定 entryPagePath 时，数组的第一项代表小程序的初始页面（首页）。
+     * 小程序中新增/减少页面，都需要对 pages 数组进行修改。
+     */
+    pages: string[];
+    tabBar?: TabBar;
+    /**
+     * 用于设置小程序的状态栏、导航条、标题、窗口背景色。
+     */
+    window?: Window;
+    networkTimeout?: NetworkTimeout;
+}
+interface TabBar {
+    /**
+     *	HexColor	是		tab 上的文字默认颜色，仅支持十六进制颜色
+     */
+    color: string;
+    /**
+     *	HexColor	是		tab 上的文字选中时的颜色，仅支持十六进制颜色
+     */
+    selectedColor: string;
+    /**
+     *	HexColor	是		tab 的背景色，仅支持十六进制颜色
+     */
+    backgroundColor?: string;
+    /**
+     *	string	否	black	tabbar 上边框的颜色， 仅支持 black / white
+     */
+    borderStyle?: string;
+    /**
+     *	Array	是		tab 的列表，详见 list 属性说明，最少 2 个、最多 5 个 tab
+     */
+    list: List[];
+    /**
+     *	string	否	bottom	tabBar 的位置，仅支持 bottom / top
+     */
+    position?: 'top' | 'bottom';
+    /**
+     *	boolean	否	false	自定义 tabBar，见详情
+     */
+    custom?: boolean;
+}
+interface List {
+    /**
+     * 页面路径，必须在 pages 中先定义
+     */
+    pagePath: string;
+    /**
+     * tab 上按钮文字
+     */
+    text: string;
+    /**
+     * 图片路径，icon 大小限制为 40kb，建议尺寸为 81px * 81px，不支持网络图片。
+     */
+    iconPath?: string;
+    /**
+     * 选中时的图片路径，icon 大小限制为 40kb，建议尺寸为 81px * 81px，不支持网络图片。 当 position 为 top 时，不显示 icon。
+     */
+    selectedIconPath?: string;
+}
+interface Window {
+    /**
+     *	HexColor	#000000	导航栏背景颜色，如 #000000
+     */
+    navigationBarBackgroundColor?: string;
+    /**
+     *	string	white	导航栏标题颜色，仅支持 black / white
+     */
+    navigationBarTextStyle?: string;
+    /**
+     *	string		导航栏标题文字内容
+     */
+    navigationBarTitleText?: string;
+    /**
+     *	string	default	导航栏样式
+     */
+    navigationStyle?: string;
+    /**
+     *	Boolean	false	自定义导航栏，只保留右上角胶囊按钮。
+     */
+    custom?: string;
+    /**
+     *	HexColor	#ffffff	窗口的背景色
+     */
+    backgroundColor?: string;
+    /**
+     *	string	dark	下拉 loading 的样式，仅支持 dark / light
+     */
+    backgroundTextStyle?: 'dark' | 'light';
+    /**
+     *	string	#ffffff	顶部窗口的背景色，仅 iOS 支持
+     */
+    backgroundColorTop?: string;
+    /**
+     *	string	#ffffff	底部窗口的背景色，仅 iOS 支持
+     */
+    backgroundColorBottom?: string;
+    /**
+     *	boolean	false	是否开启全局的下拉刷新。
+     */
+    enablePullDownRefresh?: boolean;
+    /**
+     *	number	50	页面上拉触底事件触发时距页面底部距离，单位为 px。
+     */
+    onReachBottomDistance?: number;
+    /**
+     *	string	portrait	屏幕旋转设置，支持 auto / portrait / landscape
+     */
+    pageOrientation?: 'auto' | 'portrait' | 'landscape';
+}
+interface NetworkTimeout {
+    request: number;
+    connectSocket: number;
+    uploadFile: number;
+    downloadFile: number;
+}
+export {};

package/esm/types/config.js

@@ -0,0 +1 @@
+export {};

package/esm/types/index.d.ts

@@ -0,0 +1,2 @@
+export * from './config';
+export type { TouchEvent, GenericEvent } from './component';

package/esm/types/index.js

@@ -0,0 +1 @@
+export * from './config';

package/node.js

@@ -0,0 +1 @@
+module.exports = require('./cjs/node')

package/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@ray-js/adapter",
+  "version": "0.5.7-beta-2",
+  "description": "Ray adapter for tuya",
+  "keywords": [
+    "ray"
+  ],
+  "license": "MIT",
+  "esnext": "./esm/index.js",
+  "module": "./esm/index.js",
+  "typings": "./esm/index.d.ts",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
+  "scripts": {
+    "clean": "rm -rf cjs esm",
+    "build": "yarn build:cjs && yarn build:esm",
+    "build:cjs": "tsc -p ./tsconfig.build.json --module commonjs --outDir cjs",
+    "build:esm": "tsc -p ./tsconfig.build.json --module esnext --outDir esm",
+    "watch": "concurrently 'yarn build:cjs --watch' 'yarn build:esm --watch'"
+  },
+  "devDependencies": {
+    "@ray-js/types": "^0.5.7-beta-2",
+    "concurrently": "^6.2.1"
+  },
+  "maintainers": [
+    {
+      "name": "tuyafe",
+      "email": "tuyafe@tuya.com"
+    }
+  ],
+  "dependencies": {
+    "@ray-core/runtime": "^0.0.x",
+    "@ray-core/shared": "^0.0.x",
+    "@ray-core/types": "^0.0.x"
+  },
+  "gitHead": "290d921f04a74cf0df8415c91bd33119e6f8e11e",
+  "repository": {}
+}

package/templates/base.ejs

@@ -0,0 +1,23 @@
+<template name="REMAX_TPL">
+  <block ty:for="{{root.children}}" ty:key="*this">
+    <template is="{{'REMAX_TPL_' + root.nodes[item].type}}" data="{{i: root.nodes[item]}}" />
+  </block>
+</template>
+
+<% for (let component of sortBy(Array.from(components.values()), 'id')) { -%>
+  <%_ if (skipComponents.includes(component.id)) {
+    continue;
+  } else { -%>
+<%- include('./component.ejs', {
+  type: component.type,
+  props: component.props,
+  id: component.id,
+  type: component.type,
+  slotView: slotView
+}) -%>
+  <%_ } -%>
+<% } -%>
+
+<template name="REMAX_TPL_plain-text">
+  <block>{{i.text}}</block>
+</template>

package/templates/component.ejs

@@ -0,0 +1,47 @@
+<template name="REMAX_TPL_<%=id%>">
+  <<%=id%>
+  <%_ for(let i=0;i < props.length; i++) { -%>
+    <%=props[i]%>="{{i.props['<%=props[i]%>']}}"
+  <%_ } -%>
+  >
+    <%_ if (id === 'swiper') { -%>
+    <block ty:for="{{i.children}}" ty:key="*this">
+      <swiper-item key="{{i.nodes[item].props.key}}">
+        <block ty:for="{{i.nodes[item].children}}" ty:key="*this" ty:for-item="sItem">
+          <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
+        </block>
+      </swiper-item>
+    </block>
+    <%_ } else if (id === 'picker-view') { -%>
+    <block ty:for="{{i.children}}" ty:key="*this">
+      <picker-view-column>
+        <block ty:for="{{i.nodes[item].children}}" ty:for-item="sItem">
+          <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
+        </block>
+      </picker-view-column>
+    </block>
+    <%_ } else if (type === 'native') { -%>
+    <block ty:for="{{i.children}}" ty:key="*this">
+      <block ty:if="{{i.nodes[item].props['slot']}}">
+        <view
+          slot="{{i.nodes[item].props['slot']}}"
+        <%_ for(let i=0;i < slotView.props.length; i++) { -%>
+          <%=slotView.props[i]%>="{{i.nodes[item].props['<%=slotView.props[i]%>']}}"
+        <%_ } -%>
+        >
+          <block ty:for="{{i.nodes[item].children}}" ty:key="*this" ty:for-item="sItem">
+            <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
+          </block>
+        </view>
+      </block>
+      <block ty:else>
+        <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+      </block>
+    </block>
+    <%_ } else { -%>
+    <block ty:for="{{i.children}}" ty:key="*this">
+      <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+    </block>
+    <%_ } -%>
+  </<%=id%>>
+</template>

package/templates/page.ejs

@@ -0,0 +1,3 @@
+<import src="<%= baseTemplate %>"/>
+<template is="REMAX_TPL" data="{{root: root}}" />
+<template is="REMAX_TPL" data="{{ root: modalRoot }}" />

package/tsconfig.build.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "include": ["./src", "typings"],
+  "compilerOptions": {
+    "baseUrl": ".",
+    "jsx": "preserve"
+  }
+}