@rsmax/wechat 1.3.14 → 1.3.15-canary.19

package/cjs/index.d.ts

@@ -1,3 +1,2 @@
-export * from './hostComponents';
-export * from './api';
-export * from './types';
+export * as component from './hostComponents';
+export * as types from './types';

package/cjs/index.js

@@ -10,10 +10,19 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./hostComponents"), exports);
-__exportStar(require("./api"), exports);
-__exportStar(require("./types"), exports);
+exports.types = exports.component = void 0;
+exports.component = __importStar(require("./hostComponents"));
+exports.types = __importStar(require("./types"));

package/esm/index.d.ts

@@ -1,3 +1,2 @@
-export * from './hostComponents';
-export * from './api';
-export * from './types';
+export * as component from './hostComponents';
+export * as types from './types';

package/esm/index.js

@@ -1,3 +1,2 @@
-export * from './hostComponents';
-export * from './api';
-export * from './types';
+export * as component from './hostComponents';
+export * as types from './types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsmax/wechat",
-  "version": "1.3.14",
+  "version": "1.3.15-canary.19+89bcd6a",
   "description": "Rsmax for Wechat",
   "repository": "git+https://github.com/remaxjs/remax.git",
   "license": "MIT",
@@ -16,21 +16,52 @@
     "test": "rstest run"
   },
   "dependencies": {
-    "@rsmax/framework-shared": "1.3.14",
-    "@rsmax/runtime": "1.3.14",
-    "@rsmax/shared": "1.3.14",
-    "miniprogram-api-typings": "^4.0.7"
+    "@rsmax/framework-shared": "1.3.15-canary.19+89bcd6a",
+    "@rsmax/runtime": "1.3.15-canary.19+89bcd6a",
+    "@rsmax/shared": "1.3.15-canary.19+89bcd6a",
+    "miniprogram-api-typings": "^4.1.0"
   },
   "devDependencies": {
-    "@rsmax/types": "1.3.14",
+    "@rsmax/types": "1.3.15-canary.19+89bcd6a",
     "@types/react": "^18.3.0",
     "@types/react-test-renderer": "^18.3.0",
     "react": "^18.3.0",
     "react-test-renderer": "^18.3.0"
   },
+  "sideEffects": false,
+  "exports": {
+    "./types": {
+      "types": "./esm/types/index.d.ts",
+      "import": "./esm/types/index.js",
+      "require": "./cjs/types/index.js"
+    },
+    "./component": {
+      "types": "./esm/hostComponents/index.d.ts",
+      "import": "./esm/hostComponents/index.js",
+      "require": "./cjs/hostComponents/index.js"
+    },
+    "./node": {
+      "types": "./esm/node/index.d.ts",
+      "import": "./esm/node/index.js",
+      "require": "./cjs/node/index.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "types": [
+        "esm/types/index.d.ts"
+      ],
+      "component": [
+        "esm/hostComponents/index.d.ts"
+      ],
+      "node": [
+        "esm/node/index.d.ts"
+      ]
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
   "esnext": "./esm/index.js",
-  "gitHead": "a542ee33a167f862ec9db0f7466a33f1cef31106"
+  "gitHead": "89bcd6a55f580707f23f434c59d0f283a44d2597"
 }

package/templates/base.ejs

@@ -5,24 +5,40 @@
 </template>
 
 <wxs module="_h">
-    var elements = {};
+    var __cache = {};
+
     module.exports = {
-    v: function(value) {
-    return value!== undefined ? value : '';
-    },
-    tid: function (type, ancestor) {
-    var items = ancestor.split(',');
-    var depth = 1;
-
-    for (var i = 0; i < items.length; i++) {
-    if (type === items[i]) {
-    depth = depth + 1;
-    }
-    }
-
-    var id = 'REMAX_TPL_' + depth + '_' + type;
-    return id;
-    }
+        v: function (value) {
+            return value == null ? '' : value;
+        },
+
+        tid: function (type, ancestor) {
+            var chain = ancestor || '';
+            var key = type + '::' + chain;
+
+            var cached = __cache[key];
+            if (cached) {
+                return cached;
+            }
+
+            var count = 0;
+            if (chain) {
+                var items = chain.split(',');
+                for (var i = 0; i < items.length; i++) {
+                    if (items[i] === type) {
+                        count = count + 1;
+                    }
+                }
+            }
+
+            var id = 'REMAX_TPL_' + (1 + count) + '_' + type;
+            __cache[key] = id;
+            return id;
+        }
+        
+        container: function (tid) {
+            return 'REMAX_TPL_' + (tid + 1) + '_CONTAINER';
+        }
     };
 </wxs>
 
@@ -48,7 +64,7 @@ slotView: slotView
     <block>{{i.text}}</block>
 </template>
 
-<% for (var i = 1; i <= depth['view']; i++) { -%>
+<% for (var i = 1; i <= depth['view'] + 1; i++) { -%>
 <template name="REMAX_TPL_<%=i%>_CONTAINER" data="{{i: i}}">
     <template is="{{_h.tid(i.type, a)}}" data="{{i: i, a: a + ',' + i.type, tid: <%=i%>}}" />
 </template>

package/templates/children.ejs

@@ -2,7 +2,7 @@
 <block wx:for="{{i.children}}" wx:key="*this">
   <swiper-item class="{{i.nodes[item].props.class}}" item-id="{{i.nodes[item].props.itemId}}" key="{{i.nodes[item].props.key}}">
     <block wx:for="{{i.nodes[item].children}}" wx:key="*this" wx:for-item="sItem">
-      <template is="{{'REMAX_TPL_' + (tid + 1) + '_CONTAINER'}}" data="{{i: i.nodes[item].nodes[sItem], a: a, tid: tid + 1 }}" />
+      <template is="{{_h.container(tid)}}" data="{{i: i.nodes[item].nodes[sItem], a: a, tid: tid + 1 }}" />
     </block>
   </swiper-item>
 </block>
@@ -11,20 +11,20 @@
   <block wx: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]%>']}}"
+      <%=slotView.props[i]%>="{{_h.v(i.nodes[item].props['<%=slotView.props[i]%>'])}}"
     <%_ } -%>
     >
       <block wx:for="{{i.nodes[item].children}}" wx:key="*this" wx:for-item="sItem">
-        <template is="{{'REMAX_TPL_' + (tid + 1) + '_CONTAINER'}}" data="{{i: i.nodes[item].nodes[sItem], a: a, tid: tid + 1 }}" />
+        <template is="{{_h.container(tid)}}" data="{{i: i.nodes[item].nodes[sItem], a: a, tid: tid + 1 }}" />
       </block>
     </view>
   </block>
   <block wx:else>
-    <template is="{{'REMAX_TPL_' + (tid + 1) + '_CONTAINER'}}" data="{{i: i.nodes[item], a: a, tid: tid + 1 }}" />
+    <template is="{{_h.container(tid)}}" data="{{i: i.nodes[item], a: a, tid: tid + 1 }}" />
   </block>
 </block>
 <% } else { -%>
 <block wx:for="{{i.children}}" wx:key="*this">
-  <template is="{{'REMAX_TPL_' + (tid + 1) + '_CONTAINER'}}" data="{{i: i.nodes[item], a: a, tid: tid + 1 }}" />
+  <template is="{{_h.container(tid)}}" data="{{i: i.nodes[item], a: a, tid: tid + 1 }}" />
 </block>
 <% } -%>