@tmsfe/tmskit 0.0.5-beta.1 → 0.0.5-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.1",
+  "version": "0.0.5-beta.2",
   "description": "tmskit",
   "main": "main.js",
   "bin": {

package/src/gulp/compile.js

@@ -5,7 +5,8 @@ const rename = require('gulp-rename');
 const watch = require('gulp-watch');
 const image = require('gulp-image');
 const replaceEnv = require('./replaceEnv');
-const includeDep = require('./includeDep');
+const { jsDep } = require('./jsDep');
+const { mpJsonDep } = require('./mpJsonDep');
 
 module.exports = function (
   tmsConfig,
@@ -20,7 +21,6 @@ module.exports = function (
 ) {
   Object.keys(glob).forEach((globKey) => {
     const globValue = glob[globKey];
-
     let srcPipe = src(globValue, srcOption);
     if (isWatch) {
       srcPipe = srcPipe.pipe(watch(globValue, watchOption));
@@ -30,7 +30,7 @@ module.exports = function (
       case 'js':
         srcPipe
           .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
-          .pipe(includeDep(tmsConfig, module))
+          .pipe(jsDep(tmsConfig, module))
           .pipe(dest(destPath));
         break;
       case 'css':
@@ -45,6 +45,7 @@ module.exports = function (
         break;
       case 'json':
         srcPipe
+          .pipe(mpJsonDep(tmsConfig, module))
           .pipe(dest(destPath));
         break;
       case 'html':

package/src/gulp/dev.js

@@ -4,6 +4,24 @@ const { buildOutputAppJson } = require('../utils/buildAppJson');
 const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
 
+function handleOtherGlob(glob) {
+  const otherArr = [];
+  Object.keys(glob).forEach((globKey) => {
+    if (typeof glob[globKey] === 'string') {
+      const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
+      otherArr.push(data);
+    } if (Array.isArray(glob[globKey])) {
+      glob[globKey].forEach((value) => {
+        if (typeof value === 'string') {
+          const data = value.startsWith('!') ? value : `!${value}`;
+          otherArr.push(data);
+        }
+      });
+    }
+  });
+  return otherArr;
+}
+
 module.exports = async (tmsConfig, newModules, isWatch = true) => {
   // 监听app.json
   if (isWatch) {
@@ -28,27 +46,33 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   });
 
   // 监听模块的文件
-  for (const module of newModules) {
+  for (let module of newModules) {
+    // 处理默认参数
+    module = {
+      ...{ excludes: [] },
+      ...module,
+    };
+
     if (isWatch) {
       // 监听模块配置文件
       watch(`${resolve(module.path)}/**/module.config.json`, {  events: ['change'] }, () => {
         buildOutputAppJson(tmsConfig, newModules);
       });
-    } else {
-      buildOutputAppJson(tmsConfig, newModules);
     }
 
+    const excludes = module.exclude.map(key => `!${resolve(key)}`);
     const glob = {
-      js: `${resolve(module.path)}/**/*.{js,ts,wxs}`,
-      json: `${resolve(module.path)}/**/*.json`,
-      css: `${resolve(module.path)}/**/*.{less,wxss}`,
-      html: `${resolve(module.path)}/**/*.wxml`,
-      image: `${resolve(module.path)}/**/*.{png,jpg,jpeg,gif,svg}`,
+      js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
+      json: [`${resolve(module.path)}/**/*.json`, ...excludes],
+      css: [`${resolve(module.path)}/**/*.{less,wxss}`, ...excludes],
+      html: [`${resolve(module.path)}/**/*.wxml`, ...excludes],
+      image: [`${resolve(module.path)}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes],
     };
+
     compile(tmsConfig, {
       glob: {
         ...glob,
-        other: [`${resolve(module.path)}/**/*`, ...Object.keys(glob).map(key => `!${glob[key]}`)],
+        other: [`${resolve(module.path)}/**/*`, ...handleOtherGlob(glob)],
       },
       destPath: resolve(tmsConfig.gulp.outputDir, module.root),
       module: { from: module.path, to: module.root },
@@ -71,7 +95,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       compile(tmsConfig, {
         glob: {
           ...glob,
-          other: [`${item.from}/**/*`, ...Object.keys(glob).map(key => `!${glob[key]}`)],
+          other: [`${item.from}/**/*`, ...handleOtherGlob(glob)],
         },
         destPath: item.to,
         module: item,

package/src/gulp/jsDep.js

@@ -0,0 +1,150 @@
+const through = require('through2');
+const precinct = require('precinct');
+const path = require('path');
+const { copyFile, ext, fileInDir } = require('../utils/io');
+const { resolve } = require('../utils/widgets');
+const fs = require('fs');
+const { fail } = require('../utils/log');
+
+const dfsFindJsDep = function (anaFileOriginFile, anaFileDestFile, extensions) {
+  const resDep = new Map();
+  function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
+    const contents = fs.readFileSync(anaFileOriginFile, 'utf8');
+    const deps = precinct(contents);
+    deps.forEach((depItem) => {
+      if (depItem.startsWith('.')) {
+        // 被依赖文件的存在的绝对路径
+        const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+        // 被依赖文件加上后缀
+        const depOriginPathExt = ext(depOriginPath, extensions);
+
+        if (!depOriginPathExt) {
+          fail(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
+        }
+
+        // 被依赖文件是否存在 include的path中 (只处理include的文件)
+        if (depOriginPathExt) {
+          const depOriginFile =  depOriginPathExt.file;
+          const depDestPath = resolve(path.dirname(anaFileDestFile), depItem);
+          const depDestFile = depDestPath.endsWith(depOriginPathExt.ext)
+            ? depDestPath
+            : depDestPath + depOriginPathExt.ext;
+
+          if (!resDep.has(depDestFile)) {
+            resDep.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile,
+            });
+            dfs(depOriginFile, depDestFile, extensions);
+          }
+        }
+      }
+    });
+  }
+  dfs(anaFileOriginFile, anaFileDestFile, extensions);
+
+  return resDep;
+};
+
+function handleCopyFile(depDestFile, depOriginFile) {
+  if (fs.existsSync(depDestFile)) {
+    const depDestContent = fs.readFileSync(depDestFile, 'utf8');
+    const depOriginContent = fs.readFileSync(depOriginFile, 'utf8');
+    if (depDestContent !== depOriginContent) {
+      console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
+      copyFile(depOriginFile, depDestFile);
+    }
+  } else {
+    console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
+    copyFile(depOriginFile, depDestFile);
+  }
+}
+
+function jsDep(tmsConfig, module, extensions = ['.js', '.ts', '.wxs']) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 依赖分析的文件
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      const deps = precinct(contents);
+      const copyModules = new Map();
+
+      Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
+        const includePath = tmsConfig.gulp.dependencies[includeName];
+        deps.forEach((depItem) => {
+          if (depItem.indexOf(includeName) > -1) {
+            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
+            const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+            // 被依赖文件加上后缀
+            const depOriginPathExt = ext(depOriginPath, extensions);
+
+            if (!depOriginPathExt) {
+              fail(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
+            }
+
+            const isFileInDir = fileInDir(includePath, depOriginPathExt.file);
+            if (!isFileInDir) {
+              fail(`${depOriginPathExt.file}不在${includePath}不在文件夹内, 请检查应用路径`);
+            }
+
+            // 被依赖文件是否存在 include的path中 (只处理include的文件)
+            if (depOriginPathExt && isFileInDir) {
+              // eslint-disable-next-line
+              const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+              const regRes = depItem.match(reg) || [];
+              if (regRes[2]) {
+                const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                const depDestFile = depDestPath.endsWith(depOriginPathExt.ext)
+                  ? depDestPath
+                  : depDestPath + depOriginPathExt.ext;
+                // {
+                //   depOriginFile: '/Users/odile/workspace/tms-frontend1/miniprogram/thirdparty/libs/timer.js',
+                //   depDestFile: `/Users/odile/workspace/tms-frontend1/tools/demo1/dist/modules/
+                //                 aggredriving/thirdparty/libs/timer.js`,
+                //   beforeDepPath: '../../../../thirdparty/libs/timer',
+                //   afterDepPath: '../../thirdparty/libs/timer'
+                // }
+                if (!copyModules.has(depDestFile)) {
+                  copyModules.set(depDestFile, {
+                    depOriginFile: depOriginPathExt.file,
+                    depDestFile,
+                    beforeDepPath: depItem,
+                    afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                  });
+                }
+              }
+            }
+          }
+        });
+      });
+
+      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
+        handleCopyFile(depDestFile, depOriginFile);
+        contents = contents.replace(beforeDepPath, afterDepPath);
+
+        const defs = dfsFindJsDep(depOriginFile, depDestFile, extensions);
+        defs.forEach((item) => {
+          handleCopyFile(item.depDestFile, item.depOriginFile);
+        });
+      });
+
+      // eslint-disable-next-line
+      file.contents = new Buffer(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  jsDep,
+  dfsFindJsDep,
+};

package/src/gulp/mpJsonDep.js

@@ -0,0 +1,122 @@
+const through = require('through2');
+const path = require('path');
+const { copyFile, ext, fileInDir } = require('../utils/io');
+const { resolve } = require('../utils/widgets');
+const fs = require('fs');
+const { fail } = require('../utils/log');
+const { dfsFindJsDep } = require('./jsDep');
+
+function handleCopyFile(depDestFile, depOriginFile) {
+  if (fs.existsSync(depDestFile)) {
+    const depDestContent = fs.readFileSync(depDestFile, 'utf8');
+    const depOriginContent = fs.readFileSync(depOriginFile, 'utf8');
+    if (depDestContent !== depOriginContent) {
+      console.log(`json拷贝${depOriginFile}内容到${depDestFile}`);
+      copyFile(depOriginFile, depDestFile);
+    }
+  } else {
+    console.log(`json拷贝${depOriginFile}内容到${depDestFile}`);
+    copyFile(depOriginFile, depDestFile);
+  }
+}
+
+function mpJsonDep(
+  tmsConfig,
+  module,
+  extensions = ['.wxml'],
+  filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'],
+) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 当前分析的文件的路径
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      const copyModules = new Map();
+      let contents = String(file.contents);
+      try {
+        contents = JSON.parse(contents);
+        if (contents.usingComponents) {
+          Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
+            const includePath = tmsConfig.gulp.dependencies[includeName];
+            Object.keys(contents.usingComponents).forEach((componentKey) => {
+              const componentPath = contents.usingComponents[componentKey];
+              if (componentPath.indexOf(includeName) > -1) {
+                const depOriginPath = path.join(path.dirname(anaFileOriginFile), componentPath);
+                // 被依赖文件加上后缀
+                const depOriginPathExt = ext(depOriginPath, extensions);
+
+                if (!depOriginPathExt) {
+                  fail(`${anaFileOriginFile}的${componentPath}引用路径存找不到文件，请检查引用路径`);
+                }
+
+                const isFileInDir = fileInDir(includePath, depOriginPathExt.file);
+
+                if (!isFileInDir) {
+                  fail(`${depOriginPathExt.file}不在${includePath}不在文件夹内, 请检查应用路径`);
+                }
+
+                if (depOriginPathExt && isFileInDir) {
+                  // eslint-disable-next-line
+                  const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                  const regRes = componentPath.match(reg) || [];
+                  if (regRes[2]) {
+                    const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                    const depDestFile = depDestPath.endsWith(depOriginPathExt.ext)
+                      ? depDestPath
+                      : depDestPath + depOriginPathExt.ext;
+
+                    if (!copyModules.has(depDestFile)) {
+                      copyModules.set(depDestFile, {
+                        depOriginFile: depOriginPathExt.file,
+                        depOriginExt: depOriginPathExt.ext,
+                        depDestFile,
+                        beforeDepPath: componentPath,
+                        afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                      });
+                    }
+                  }
+                }
+              }
+            });
+          });
+        }
+      } catch (e) {
+        fail(`解析jsonDep出现错误:${e}`);
+      }
+      copyModules.forEach(({ depOriginFile, depOriginExt, depDestFile, beforeDepPath, afterDepPath }) => {
+        filesExt.forEach((extKey) => {
+          const originFile = depOriginFile.replace(depOriginExt, extKey);
+          const destFile = depDestFile.replace(depOriginExt, extKey);
+
+          if (fs.existsSync(originFile)) {
+            handleCopyFile(destFile, originFile);
+
+            const jsExtensions = ['.js', '.ts'];
+            if (jsExtensions.indexOf(extKey) > -1) {
+              const defs = dfsFindJsDep(originFile, destFile, jsExtensions);
+              defs.forEach((item) => {
+                handleCopyFile(item.depDestFile, item.depOriginFile);
+              });
+            }
+          }
+        });
+        contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+        contents = contents.replace(beforeDepPath, afterDepPath);
+      });
+      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+      // eslint-disable-next-line
+      file.contents = new Buffer(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpJsonDep,
+};

package/src/gulp/includeDep.js

@@ -1,130 +0,0 @@
-const through = require('through2');
-const precinct = require('precinct');
-const path = require('path');
-const { copyFile, ext, fileInDir } = require('../utils/io');
-const { resolve } = require('../utils/widgets');
-const fs = require('fs');
-const { fail } = require('../utils/log');
-
-const dfsDep = function (includePath, anaFileOriginFile, anaFileDestFile, extensions) {
-  const contents = fs.readFileSync(anaFileOriginFile, 'utf8');
-  const deps = precinct(contents);
-  deps.forEach((depItem) => {
-    if (depItem.startsWith('.')) {
-      // 被依赖文件的存在的绝对路径
-      const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
-      // 被依赖文件加上后缀
-      const depOriginPathExt = ext(depOriginPath, extensions);
-
-      if (!depOriginPathExt) {
-        fail(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
-      }
-
-      // 被依赖文件是否存在 include的path中 (只处理include的文件)
-      if (depOriginPathExt && fileInDir(includePath, depOriginPathExt.file)) {
-        const depOriginFile =  depOriginPathExt.file;
-        const depDestPath = resolve(path.dirname(anaFileDestFile), depItem);
-        const depDestFile = depDestPath.endsWith(depOriginPathExt.ext)
-          ? depDestPath
-          : depDestPath + depOriginPathExt.ext;
-
-        if (fs.existsSync(depDestFile)) {
-          const depDestContent = fs.readFileSync(depDestFile, 'utf8');
-          const depOriginContent = fs.readFileSync(depOriginFile, 'utf8');
-          if (depDestContent !== depOriginContent) {
-            console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-            copyFile(depOriginFile, depDestFile);
-          }
-        } else {
-          console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-          copyFile(depOriginFile, depDestFile);
-        }
-        dfsDep(includePath, depOriginFile, depDestFile, extensions);
-      }
-    }
-  });
-};
-
-function includeThirdParty(tmsConfig, module, extensions = ['.js', '.ts', '.wxs']) {
-  const stream = through.obj(function (file, enc, cb) {
-    // 依赖分析的文件
-    const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
-
-    if (file.isBuffer()) {
-      let contents = String(file.contents);
-      const deps = precinct(contents);
-      const copyModules = [];
-
-      Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
-        const includePath = tmsConfig.gulp.dependencies[includeName];
-        deps.forEach((depItem) => {
-          if (depItem.indexOf(includeName) > -1) {
-            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
-            const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
-            // 被依赖文件加上后缀
-            const depOriginPathExt = ext(depOriginPath, extensions);
-
-            if (!depOriginPathExt) {
-              fail(`${anaFileOriginFile}的${depItem}引用路径存找不到文件，请检查引用路径`);
-            }
-
-            // 被依赖文件是否存在 include的path中 (只处理include的文件)
-            if (depOriginPathExt && fileInDir(includePath, depOriginPathExt.file)) {
-              // eslint-disable-next-line
-              const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-              const regRes = depItem.match(reg) || [];
-              if (regRes[2]) {
-                const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
-                const depDestFile = depDestPath.endsWith(depOriginPathExt.ext)
-                  ? depDestPath
-                  : depDestPath + depOriginPathExt.ext;
-                // {
-                //   depOriginFile: '/Users/odile/workspace/tms-frontend1/miniprogram/thirdparty/libs/timer.js',
-                //   depDestFile: `/Users/odile/workspace/tms-frontend1/tools/demo1/dist/modules/
-                //                 aggredriving/thirdparty/libs/timer.js`,
-                //   beforeDepPath: '../../../../thirdparty/libs/timer',
-                //   afterDepPath: '../../thirdparty/libs/timer'
-                // }
-                copyModules.push({
-                  depOriginFile: depOriginPathExt.file,
-                  depDestFile,
-                  beforeDepPath: depItem,
-                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
-                  includePath,
-                });
-              }
-            }
-          }
-        });
-      });
-
-      copyModules.forEach(({ includePath, depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
-        if (fs.existsSync(depDestFile)) {
-          const depDestContent = fs.readFileSync(depDestFile, 'utf8');
-          const depOriginContent = fs.readFileSync(depOriginFile, 'utf8');
-          if (depDestContent !== depOriginContent) {
-            console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-            copyFile(depOriginFile, depDestFile);
-          }
-        } else {
-          console.log(`拷贝${depOriginFile}内容到${depDestFile}`);
-          copyFile(depOriginFile, depDestFile);
-        }
-        contents = contents.replace(beforeDepPath, afterDepPath);
-        dfsDep(includePath, depOriginFile, depDestFile, extensions);
-      });
-
-      // eslint-disable-next-line
-      file.contents = new Buffer(contents);
-    }
-
-    this.push(file);
-    cb();
-  });
-
-  return stream;
-}
-
-module.exports = includeThirdParty;