@ray-js/adapter 1.8.0-beta.0 → 1.8.0-beta.2

package/cjs/node/index.d.ts

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

package/esm/node/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/adapter",
-  "version": "1.8.0-beta.0",
+  "version": "1.8.0-beta.2",
   "description": "Ray adapter for tuya",
   "keywords": [
     "ray"
@@ -31,12 +31,12 @@
     "watch": "concurrently 'yarn build:cjs --watch' 'yarn build:esm --watch'"
   },
   "dependencies": {
-    "@ray-core/runtime": "^0.5.0-beta.1",
-    "@ray-core/shared": "^0.5.0-beta.1",
-    "@ray-core/types": "^0.5.0-beta.1"
+    "@ray-core/runtime": "^0.5.0-beta.2",
+    "@ray-core/shared": "^0.5.0-beta.2",
+    "@ray-core/types": "^0.5.0-beta.2"
   },
   "devDependencies": {
-    "@ray-js/types": "1.8.0-beta.0",
+    "@ray-js/types": "1.8.0-beta.2",
     "concurrently": "^6.5.1"
   },
   "publishConfig": {
@@ -44,5 +44,5 @@
     "registry": "https://registry.npmjs.com"
   },
   "esnext": "./esm/index.js",
-  "gitHead": "523885b576e8c52f1d4a209a3d6d61e53183f18c"
+  "gitHead": "ce4bcb6ebbf6c1c9608e62f30fc06015aa4b4167"
 }

package/templates/base.ejs

@@ -1,6 +1,6 @@
 <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 ty:for="{{root.CH}}" ty:key="*this">
+    <template is="{{'REMAX_TPL_' + root.NS[item].TG}}" data="{{i: root.NS[item]}}" />
   </block>
 </template>
 
@@ -19,5 +19,5 @@
 <% } -%>
 
 <template name="REMAX_TPL_plain-text">
-  <block>{{i.text}}</block>
+  <block>{{i.TX}}</block>
 </template>

package/templates/component.ejs

@@ -1,73 +1,73 @@
 <template name="REMAX_TPL_<%=id%>">
   <%_ if (id === 'view') { -%>
-    <block ty:if="{{i.props['catchtouchmove']}}">
-      <<%=id%>
+    <block ty:if="{{i.PS['catchtouchmove']}}">
+      <<%=id%> data-sid="{{i.PS['data-sid']}}"
       <%# view 标签需要区分是否含 catchtouchmove 事件，区分渲染模板 避免冲突 -%>
       <%pp1 = props.filter(k => k !== 'bindtouchmove')-%>
       <%_ for(let i=0;i < pp1.length; i++) { -%>
-        <%=pp1[i]%>="{{i.props['<%=pp1[i]%>']}}"
+        <%=pp1[i]%>="{{i.PS['<%=pp1[i]%>']}}"
       <%_ } -%>
       >
-      <block ty:for="{{i.children}}" ty:key="*this">
-        <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+      <block ty:for="{{i.CH}}" ty:key="*this">
+        <template is="{{'REMAX_TPL_' + i.NS[item].TG}}" data="{{i: i.NS[item]}}" />
       </block>
       </<%=id%>>
     </block>
     <block ty:else>
-      <<%=id%>
+      <<%=id%> data-sid="{{i.PS['data-sid']}}"
       <%pp2 = props.filter(k => k !== 'catchtouchmove')-%>
       <%_ for(let i=0;i < pp2.length; i++) { -%>
-        <%=pp2[i]%>="{{i.props['<%=pp2[i]%>']}}"
+        <%=pp2[i]%>="{{i.PS['<%=pp2[i]%>']}}"
       <%_ } -%>
       >
-      <block ty:for="{{i.children}}" ty:key="*this">
-        <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+      <block ty:for="{{i.CH}}" ty:key="*this">
+        <template is="{{'REMAX_TPL_' + i.NS[item].TG}}" data="{{i: i.NS[item]}}" />
       </block>
       </<%=id%>>
     </block>
   <%_ } else { -%>
-    <<%=id%>
+    <<%=id%> data-sid="{{i.PS['data-sid']}}"
     <%_ for(let i=0;i < props.length; i++) { -%>
-      <%=props[i]%>="{{i.props['<%=props[i]%>']}}"
+      <%=props[i]%>="{{i.PS['<%=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 ty:for="{{i.CH}}" ty:key="*this">
+        <swiper-item key="{{i.NS[item].PS.key}}">
+          <block ty:for="{{i.NS[item].CH}}" ty:key="*this" ty:for-item="sItem">
+            <template is="{{'REMAX_TPL_' + i.NS[item].NS[sItem].TG}}" data="{{i: i.NS[item].NS[sItem]}}" />
           </block>
         </swiper-item>
       </block>
       <%_ } else if (id === 'picker-view') { -%>
-      <block ty:for="{{i.children}}" ty:key="*this">
+      <block ty:for="{{i.CH}}" 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 ty:for="{{i.NS[item].CH}}" ty:for-item="sItem">
+            <template is="{{'REMAX_TPL_' + i.NS[item].NS[sItem].TG}}" data="{{i: i.NS[item].NS[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']}}">
+      <block ty:for="{{i.CH}}" ty:key="*this">
+        <block ty:if="{{i.NS[item].PS['slot']}}">
           <view
-            slot="{{i.nodes[item].props['slot']}}"
+            slot="{{i.NS[item].PS['slot']}}"
           <%_ for(let i=0;i < slotView.props.length; i++) { -%>
-            <%=slotView.props[i]%>="{{i.nodes[item].props['<%=slotView.props[i]%>']}}"
+            <%=slotView.props[i]%>="{{i.NS[item].PS['<%=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 ty:for="{{i.NS[item].CH}}" ty:key="*this" ty:for-item="sItem">
+              <template is="{{'REMAX_TPL_' + i.NS[item].NS[sItem].TG}}" data="{{i: i.NS[item].NS[sItem]}}" />
             </block>
           </view>
         </block>
         <block ty:else>
-          <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+          <template is="{{'REMAX_TPL_' + i.NS[item].TG}}" data="{{i: i.NS[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 ty:for="{{i.CH}}" ty:key="*this">
+        <template is="{{'REMAX_TPL_' + i.NS[item].TG}}" data="{{i: i.NS[item]}}" />
       </block>
       <%_ } -%>
     </<%=id%>>