babel-plugin-hylid-bridge 2.12.0-alpha.2 → 2.12.0-alpha.4

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.12.0-alpha.4] (2023-07-20)
+
+
+### Features
+
+* 指定编译 src 目录
+
+
+
+## [2.12.0-alpha.3] (2023-07-20)
+
+
+### Bug Fixes
+
+* type error
+
+
+
 ## [2.12.0-alpha.2] (2023-07-20)
 
 **Note:** Version bump only for package babel-plugin-hylid-bridge

package/lib/combineExports.d.ts

@@ -0,0 +1 @@
+export default function combileExports(index1Path: string, index2Path: string): string;

package/lib/combineExports.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = combileExports;
+var _path = _interopRequireDefault(require("path"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _hashIt = _interopRequireDefault(require("hash-it"));
+function combileExports(index1Path, index2Path) {
+  var indexPath = _path.default.resolve(__dirname, '..', '.temp', (0, _hashIt.default)("".concat(index1Path).concat(index2Path)) + '.js');
+  _fsExtra.default.ensureFileSync(indexPath);
+  _fsExtra.default.writeFileSync(indexPath, "\n    import index1 from '".concat(index1Path, "';\n    import index2 from '").concat(index2Path, "';\n\n    export default {\n      ...index1,\n      ...index2,\n    };\n  "));
+  return indexPath;
+}

package/lib/index.d.ts

@@ -3,5 +3,10 @@ import { PluginPass } from '@babel/core';
 interface IState extends PluginPass {
     usedJSAPIList: 'all' | string[];
 }
-declare const _default: (core: typeof babelCore, opts?: Record<string, any>) => babelCore.PluginObj<IState>;
+declare const _default: (core: typeof babelCore, opts?: {
+    targets?: string[];
+    appEnvPath?: string;
+    libraryDir?: string;
+    polyfillDir?: string;
+}) => babelCore.PluginObj<IState>;
 export default _default;

package/lib/index.js

@@ -13,6 +13,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
 var _getLibraryDir = _interopRequireDefault(require("./getLibraryDir"));
 var utils = _interopRequireWildcard(require("./utils"));
+var _combineExports = _interopRequireDefault(require("./combineExports"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -21,15 +22,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var identifierPrefix = '__hylid_bridge__';
 var libraryName = 'hylid-bridge';
-var libraryDir = (0, _getLibraryDir.default)();
 function snakeCaseTarget(value) {
   if (value === 'H5') {
     return 'h5';
   }
   return _lodash.default.snakeCase(value);
 }
-function isTargetSupported(target) {
-  var libraryDir = (0, _getLibraryDir.default)();
+function isTargetSupported(target, libraryDir) {
   return ['MpWeb', 'Mp', 'Web'].some(function (prefix) {
     if (target.startsWith(prefix)) {
       var targetClientDir = _path.default.resolve(libraryDir, 'lib/clients', snakeCaseTarget(prefix), snakeCaseTarget(target.replace(prefix, '')));
@@ -38,16 +37,18 @@ function isTargetSupported(target) {
     return false;
   });
 }
-function getTargets(customTargets) {
+function getTargets(libraryDir, customTargets) {
   var targets = customTargets || (process.env.HYLID_BRIDGE_TARGETS ? process.env.HYLID_BRIDGE_TARGETS.split(',') : []);
-  return targets.filter(isTargetSupported);
+  return targets.filter(function (target) {
+    return isTargetSupported(target, libraryDir);
+  });
 }
-function isApiExists(name, target) {
+function isApiExists(name, target, libraryDir, polyfillDir) {
   var targetSplit = splitTarget(target);
   if (targetSplit.length !== 2) {
     throw new Error("Wrong target configuration: ".concat(target, "."));
   }
-  return _fsExtra.default.existsSync(_path.default.resolve(libraryDir, "./lib/clients/".concat(targetSplit[0], "/").concat(targetSplit[1], "/").concat(name, ".js")));
+  return _fsExtra.default.existsSync(_path.default.resolve(libraryDir, "./lib/clients/".concat(targetSplit[0], "/").concat(targetSplit[1], "/").concat(name, ".js"))) || polyfillDir && _fsExtra.default.existsSync(_path.default.resolve(polyfillDir, "./".concat(targetSplit[0], "/").concat(targetSplit[1], "/").concat(name, ".js")));
 }
 function getUserAppEnvPath(appEnvPath) {
   var realAppEnvPath = appEnvPath !== null && appEnvPath !== void 0 ? appEnvPath : _path.default.resolve(process.cwd(), './src/appEnv.ts');
@@ -70,23 +71,34 @@ function splitTarget(target) {
 var myLocalName = "".concat(identifierPrefix, "my__");
 function getNames(node, scope, state, targets) {
   var _state$filename;
+  // my.alert || my[a]
   if (node.object.type === 'Identifier' && node.property.type === 'Identifier' &&
   // Remix 中会编译所有 node_modules 下的模块
   !((_state$filename = state.filename) !== null && _state$filename !== void 0 && _state$filename.includes("".concat(_path.default.sep, "node_modules").concat(_path.default.sep, "hylid-bridge").concat(_path.default.sep))) && targets && targets.length && !scope.hasBinding('my')) {
-    return {
+    return node.computed ? {
+      objectName: node.object.name,
+      propertyName: undefined
+    } : {
       objectName: node.object.name,
       propertyName: node.property.name
     };
   }
+  // my['alert']
+  if (node.object.type === 'Identifier' && node.property.type === 'StringLiteral' && node.computed && targets && targets.length && !scope.hasBinding('my')) {
+    return {
+      objectName: node.object.name,
+      propertyName: node.property.value
+    };
+  }
   return {
     objectName: undefined,
     propertyName: undefined
   };
 }
-function isJSAPIInTargets(jsapiName, targets, filename) {
+function isJSAPIInTargets(jsapiName, targets, filename, libraryDir, polyfillDir) {
   return targets.every(function (target) {
     var targetSplit = splitTarget(target);
-    if (!isApiExists(jsapiName, target)) {
+    if (!isApiExists(jsapiName, target, libraryDir, polyfillDir)) {
       utils.warn("Can not find the API `".concat(jsapiName, "` in `").concat(_path.default.resolve(libraryDir, './lib/clients/' + targetSplit[0] + '/' + targetSplit[1]), "`. Fallback to import all API codes of ").concat(target, ". Current file path: `").concat(filename, "`."));
       return false;
     }
@@ -94,8 +106,11 @@ function isJSAPIInTargets(jsapiName, targets, filename) {
   });
 }
 var _default = function _default(core, opts) {
-  var targets = getTargets(opts === null || opts === void 0 ? void 0 : opts.targets);
+  var _opts$libraryDir;
+  var libraryDir = (_opts$libraryDir = opts === null || opts === void 0 ? void 0 : opts.libraryDir) !== null && _opts$libraryDir !== void 0 ? _opts$libraryDir : (0, _getLibraryDir.default)();
+  var targets = getTargets(libraryDir, opts === null || opts === void 0 ? void 0 : opts.targets);
   var userAppEnvPath = getUserAppEnvPath(opts === null || opts === void 0 ? void 0 : opts.appEnvPath);
+  var polyfillDir = opts === null || opts === void 0 ? void 0 : opts.polyfillDir;
   return {
     name: 'babel-plugin-hylid-bridge',
     visitor: {
@@ -103,7 +118,7 @@ var _default = function _default(core, opts) {
         var _getNames = getNames(path.node, path.scope, state, targets),
           objectName = _getNames.objectName,
           propertyName = _getNames.propertyName;
-        if (!propertyName || propertyName === 'call' || objectName !== 'my') {
+        if (propertyName === 'call' || objectName !== 'my') {
           return;
         }
         var newNode = core.types.cloneNode(path.node, true, true);
@@ -112,19 +127,23 @@ var _default = function _default(core, opts) {
           path.replaceWith(newNode);
           return;
         }
-        if (path.node.computed) {
+        if (!propertyName && path.node.computed) {
           state.usedJSAPIList = 'all';
-          utils.warn("Detect visiting the property of `my` with computed mode: my[".concat(propertyName, "]. Fallback to import all API codes of ").concat(targets.join(','), ". Current file path: `").concat(state.filename, "`."));
-        } else {
+          utils.warn("Detect visiting the property of `my` with computed mode. Fallback to import all API codes of ".concat(targets.join(','), ". Current file path: `").concat(state.filename, "`."));
+          path.replaceWith(newNode);
+          return;
+        }
+        if (propertyName) {
           state.usedJSAPIList = state.usedJSAPIList || [];
           var name = propertyName;
-          if (isJSAPIInTargets(name, targets, state.filename)) {
+          if (isJSAPIInTargets(name, targets, state.filename, libraryDir, polyfillDir)) {
             state.usedJSAPIList.push(name);
           } else {
             state.usedJSAPIList = 'all';
           }
+          path.replaceWith(newNode);
+          return;
         }
-        path.replaceWith(newNode);
       },
       CallExpression: function CallExpression(path, state) {
         if (path.node.callee.type !== 'MemberExpression') {
@@ -143,7 +162,7 @@ var _default = function _default(core, opts) {
         }
         state.usedJSAPIList = state.usedJSAPIList || [];
         var name = path.node.arguments[0].value;
-        if (isJSAPIInTargets(name, targets, state.filename)) {
+        if (isJSAPIInTargets(name, targets, state.filename, libraryDir, polyfillDir)) {
           state.usedJSAPIList.push(name);
         } else {
           state.usedJSAPIList = 'all';
@@ -174,7 +193,9 @@ var _default = function _default(core, opts) {
           if (usedJSAPIList === 'all') {
             nodes.push.apply(nodes, (0, _toConsumableArray2.default)(targets.map(function (target) {
               var targetSplit = splitTarget(target);
-              return babelTypes.importDeclaration([babelTypes.importDefaultSpecifier(babelTypes.identifier("".concat(identifierPrefix).concat(targetSplit[0], "_").concat(targetSplit[1], "_my__")))], babelTypes.stringLiteral("".concat(libraryName, "/lib/clients/").concat(targetSplit[0], "/").concat(targetSplit[1], "/index")));
+              var innerIndexPath = "".concat(libraryName, "/lib/clients/").concat(targetSplit[0], "/").concat(targetSplit[1], "/index");
+              var normalizedIndexPath = polyfillDir ? (0, _combineExports.default)(require.resolve(innerIndexPath), _path.default.resolve(polyfillDir, targetSplit[0], targetSplit[1])) : innerIndexPath;
+              return babelTypes.importDeclaration([babelTypes.importDefaultSpecifier(babelTypes.identifier("".concat(identifierPrefix).concat(targetSplit[0], "_").concat(targetSplit[1], "_my__")))], babelTypes.stringLiteral(normalizedIndexPath));
             })));
             var buildElseIf = function buildElseIf(targetList) {
               if (!targetList.length) {
@@ -199,7 +220,9 @@ var _default = function _default(core, opts) {
               targets.forEach(function (target) {
                 var targetSplit = splitTarget(target);
                 var localName = "".concat(identifierPrefix).concat(targetSplit[0], "_").concat(targetSplit[1], "_").concat(name, "__");
-                var n = babelTypes.importDeclaration([babelTypes.importDefaultSpecifier(babelTypes.identifier(localName))], babelTypes.stringLiteral("".concat(libraryName, "/lib/clients/").concat(targetSplit[0], "/").concat(targetSplit[1], "/").concat(name)));
+                var innerSourcePath = "".concat(libraryName, "/lib/clients/").concat(targetSplit[0], "/").concat(targetSplit[1], "/").concat(name);
+                var userSourcePath = polyfillDir ? _path.default.resolve(polyfillDir, targetSplit[0], targetSplit[1], name) : undefined;
+                var n = babelTypes.importDeclaration([babelTypes.importDefaultSpecifier(babelTypes.identifier(localName))], babelTypes.stringLiteral(userSourcePath && (_fsExtra.default.existsSync("".concat(userSourcePath, ".js")) || _fsExtra.default.existsSync("".concat(userSourcePath, ".ts"))) ? userSourcePath : innerSourcePath));
                 nodes.push(n);
               });
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-hylid-bridge",
-  "version": "2.12.0-alpha.2",
+  "version": "2.12.0-alpha.4",
   "description": "babel-plugin-hylid-bridge",
   "main": "lib/index.js",
   "files": [
@@ -16,8 +16,13 @@
     "@types/lodash": "4.14.182",
     "chalk": "3.0.0",
     "fs-extra": "10.1.0",
+    "hash-it": "^6.0.0",
     "lodash": "4.17.21"
   },
+  "devDependencies": {
+    "babel-plugin-tester": "^10.1.0",
+    "hylid-bridge": "^2.12.0-alpha.4"
+  },
   "sideEffects": false,
   "registry": "https://registry.npmjs.org/"
 }