@dcloudio/uni-cli-shared 2.0.1-alpha-36720221014001 → 2.0.1-alpha-36720221017001

package/lib/index.js

@@ -112,6 +112,5 @@ module.exports = {
   getPlatformGlobal,
   getPlatformStat,
   getPlatformPush,
-  getPlatformUniCloud,
-  uniModulesLoader: normalizePath(require.resolve('./uni_modules-loader'))
+  getPlatformUniCloud
 }

package/lib/uni_modules/uni_modules.js

@@ -1,65 +1,36 @@
-'use strict'
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
-  return (mod && mod.__esModule) ? mod : { default: mod }
-}
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.parseDefines = exports.parseExports = exports.genUniModulesExports = void 0
-const path_1 = __importDefault(require('path'))
-const fs_extra_1 = __importDefault(require('fs-extra'))
-const merge_1 = require('merge')
-function genUniModulesExports () {
-  const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules')
-  if (!fs_extra_1.default.existsSync(uniModulesDir)) {
-    return ''
-  }
-  const importCodes = []
-  const assignCodes = []
-  fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
-    var _a, _b
-    const pkgPath = path_1.default.resolve(uniModulesDir, uniModuleDir, 'package.json')
-    if (!fs_extra_1.default.existsSync(pkgPath)) {
-      return
-    }
-    const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b.exports
-    if (exports) {
-      const [exportsImportCodes, exportsAssignCodes] = parseExports(process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports)
-      importCodes.push(...exportsImportCodes)
-      assignCodes.push(...exportsAssignCodes)
-    }
-  })
-  if (!importCodes.length) {
-    return ''
-  }
-  return `${importCodes.join('\n')}
-${assignCodes.join('\n')}`
-}
-exports.genUniModulesExports = genUniModulesExports
-function parseExports (platform, source, exports = {}) {
-  const rootDefines = {}
-  Object.keys(exports).forEach((name) => {
-    if (name.startsWith('uni')) {
-      rootDefines[name] = exports[name]
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseInject = exports.parseInjects = exports.parseUniExtApis = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const merge_1 = require("merge");
+function parseUniExtApis() {
+    const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
+    if (!fs_extra_1.default.existsSync(uniModulesDir)) {
+        return {};
     }
-  })
-  const platformDefines = exports[platform]
-  // 该平台不支持
-  if (platformDefines === false) {
-    return [[], []]
-  }
-  return parseDefines(source, (0, merge_1.recursive)(true, rootDefines, platformDefines))
+    const injects = {};
+    fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
+        var _a, _b;
+        // 必须以 uni- 开头
+        if (!uniModuleDir.startsWith('uni-')) {
+            return;
+        }
+        const pkgPath = path_1.default.resolve(uniModulesDir, uniModuleDir, 'package.json');
+        if (!fs_extra_1.default.existsSync(pkgPath)) {
+            return;
+        }
+        const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b['uni-ext-api'];
+        if (exports) {
+            Object.assign(injects, parseInjects(process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports));
+        }
+    });
+    return injects;
 }
-exports.parseExports = parseExports
-function parseDefines (source, defines = {}) {
-  const importCodes = []
-  const assignCodes = []
-  Object.keys(defines).forEach((name) => {
-    const [defineImportCodes, defineAssignCodes] = parseDefine(source, name, defines[name])
-    importCodes.push(...defineImportCodes)
-    assignCodes.push(...defineAssignCodes)
-  })
-  return [importCodes, assignCodes]
-}
-exports.parseDefines = parseDefines
+exports.parseUniExtApis = parseUniExtApis;
 /**
  *  uni:'getBatteryInfo'
  * import getBatteryInfo from '..'
@@ -81,29 +52,48 @@ exports.parseDefines = parseDefines
  * @param define
  * @returns
  */
-function parseDefine (source, globalObject, define) {
-  const importCodes = []
-  const assignCodes = []
-  if (typeof define === 'string') {
-    importCodes.push(`import ${define} from '${source}'`)
-    assignCodes.push(`${globalObject}.${define} = ${define}`)
-  } else if (Array.isArray(define)) {
-    importCodes.push(`import { ${define.join(', ')} } from '${source}'`)
-    define.forEach((d) => {
-      assignCodes.push(`${globalObject}.${d} = ${d}`)
-    })
-  } else {
-    const keys = Object.keys(define)
-    const specifiers = []
-    keys.forEach((d) => {
-      if (d !== define[d]) {
-        specifiers.push(`${define[d]} as ${d}`)
-      } else {
-        specifiers.push(d)
-      }
-      assignCodes.push(`${globalObject}.${d} = ${d}`)
-    })
-    importCodes.push(`import { ${specifiers.join(', ')} } from '${source}'`)
-  }
-  return [importCodes, assignCodes]
+function parseInjects(platform, source, exports = {}) {
+    let rootDefines = {};
+    Object.keys(exports).forEach((name) => {
+        if (name.startsWith('uni')) {
+            rootDefines[name] = exports[name];
+        }
+    });
+    const platformDefines = exports[platform];
+    // 该平台不支持
+    if (platformDefines === false) {
+        return {};
+    }
+    if (platformDefines) {
+        rootDefines = (0, merge_1.recursive)(true, rootDefines, platformDefines);
+    }
+    const injects = {};
+    for (const key in rootDefines) {
+        Object.assign(injects, parseInject(source, 'uni', rootDefines[key]));
+    }
+    return injects;
+}
+exports.parseInjects = parseInjects;
+function parseInject(source, globalObject, define) {
+    const injects = {};
+    if (define === false) {
+    }
+    else if (typeof define === 'string') {
+        // {'uni.getBatteryInfo' : '@dcloudio/uni-getbatteryinfo'}
+        injects[globalObject + '.' + define] = source;
+    }
+    else if (Array.isArray(define)) {
+        // {'uni.getBatteryInfo' : ['@dcloudio/uni-getbatteryinfo','getBatteryInfo]}
+        define.forEach((d) => {
+            injects[globalObject + '.' + d] = [source, d];
+        });
+    }
+    else {
+        const keys = Object.keys(define);
+        keys.forEach((d) => {
+            injects[globalObject + '.' + d] = [source, define[d]];
+        });
+    }
+    return injects;
 }
+exports.parseInject = parseInject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-36720221014001",
+  "version": "2.0.1-alpha-36720221017001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -25,5 +25,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "d30323ee8aad81efa6ad05e25053f36257f4f261"
+  "gitHead": "7d7030aaaffab530253dc4cf02f87a13023c0d1f"
 }

package/lib/uni_modules-loader.js

@@ -1,8 +0,0 @@
-const {
-  genUniModulesExports
-} = require('./uni_modules/uni_modules')
-
-module.exports = function () {
-  this.cacheable && this.cacheable()
-  return genUniModulesExports()
-}