@dcloudio/uni-cli-shared 3.0.0-alpha-3030820220114003 → 3.0.0-alpha-3030820220114006

package/dist/mp/event.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatMiniProgramEvent = void 0;
+const uni_shared_1 = require("@dcloudio/uni-shared");
 function formatMiniProgramEvent(eventName, { isCatch, isCapture, isComponent, }) {
+    if (isComponent) {
+        // 自定义组件的自定义事件需要格式化，因为 triggerEvent 时也会格式化
+        eventName = (0, uni_shared_1.customizeEvent)(eventName);
+    }
     if (!isComponent && eventName === 'click') {
         eventName = 'tap';
     }

package/dist/mp/index.d.ts

@@ -1,4 +1,5 @@
 export * from './ast';
+export * from './wxs';
 export * from './nvue';
 export * from './event';
 export * from './style';

package/dist/mp/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.parseExternalClasses = exports.hasExternalClasses = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
 __exportStar(require("./ast"), exports);
+__exportStar(require("./wxs"), exports);
 __exportStar(require("./nvue"), exports);
 __exportStar(require("./event"), exports);
 __exportStar(require("./style"), exports);

package/dist/mp/usingComponents.js

@@ -130,8 +130,22 @@ function findBindingComponent(tag, bindingComponents) {
         return tag === componentTag || tag === camelName || tag === PascalName;
     });
 }
+function normalizeComponentId(id) {
+    // _unref(test) => test
+    if (id.includes('_unref(')) {
+        return id.replace('_unref(', '').replace(')', '');
+    }
+    // $setup["test"] => test
+    if (id.includes('$setup[')) {
+        return id.replace('$setup["', '').replace('"', '');
+    }
+    return id;
+}
 function parseBindingComponents(templateBindingComponents, scriptBindingComponents) {
-    const bindingComponents = { ...templateBindingComponents };
+    const bindingComponents = {};
+    Object.keys(templateBindingComponents).forEach((id) => {
+        bindingComponents[normalizeComponentId(id)] = templateBindingComponents[id];
+    });
     Object.keys(scriptBindingComponents).forEach((id) => {
         const { tag } = scriptBindingComponents[id];
         const name = findBindingComponent(tag, templateBindingComponents);

package/dist/mp/wxs.d.ts

@@ -0,0 +1,2 @@
+export declare function parseWxsCallMethods(code: string): string[];
+export declare function genWxsCallMethodsCode(code: string): string;

package/dist/mp/wxs.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genWxsCallMethodsCode = exports.parseWxsCallMethods = void 0;
+const types_1 = require("@babel/types");
+const estree_walker_1 = require("estree-walker");
+const ast_1 = require("./ast");
+function parseWxsCallMethods(code) {
+    if (!code.includes('callMethod')) {
+        return [];
+    }
+    const ast = (0, ast_1.parseProgram)(code, '', {});
+    const wxsCallMethods = new Set();
+    estree_walker_1.walk(ast, {
+        enter(child) {
+            if (!(0, types_1.isCallExpression)(child)) {
+                return;
+            }
+            const { callee } = child;
+            // .callMethod
+            if (!(0, types_1.isMemberExpression)(callee) ||
+                !(0, types_1.isIdentifier)(callee.property) ||
+                callee.property.name !== 'callMethod') {
+                return;
+            }
+            // .callMethod('test',...)
+            const args = child.arguments;
+            if (!args.length) {
+                return;
+            }
+            const [name] = args;
+            if (!(0, types_1.isStringLiteral)(name)) {
+                return;
+            }
+            wxsCallMethods.add(name.value);
+        },
+    });
+    return [...wxsCallMethods];
+}
+exports.parseWxsCallMethods = parseWxsCallMethods;
+function genWxsCallMethodsCode(code) {
+    const wxsCallMethods = parseWxsCallMethods(code);
+    if (!wxsCallMethods.length) {
+        return `export default {}`;
+    }
+    return `export default (Component) => {
+  if(!Component.wxsCallMethods){
+    Component.wxsCallMethods = []
+  }
+  Component.wxsCallMethods.push(${wxsCallMethods
+        .map((m) => `'${m}'`)
+        .join(', ')})
+}
+`;
+}
+exports.genWxsCallMethodsCode = genWxsCallMethodsCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030820220114003",
+  "version": "3.0.0-alpha-3030820220114006",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.16.5",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030820220114003",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030820220114003",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3030820220114006",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3030820220114006",
     "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.27",
     "@vue/compiler-dom": "3.2.27",