@tmsfe/tmskit 0.0.5-beta.5 → 0.0.7

package/src/gulp/plugins/mpCommonDep.js

@@ -1,131 +1,131 @@
-/* eslint-disable no-param-reassign */
-const through = require('through2');
-const precinct = require('precinct');
-const path = require('path');
-const { findCssImports }  = require('../../utils/findCssImport');
-const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
-const { resolve } = require('../../utils/widgets');
-const fs = require('fs');
-const { pluginError } = require('./utils/pluginError');
-
-const cssFilter = ['.less', '.wxss'];
-const dfsFindCommonDep = function (anaFileOriginFile, anaFileDestFile, extensions, isWatch = true) {
-  const resDep = new Map();
-  function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
-    let contents = '';
-    try {
-      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
-    } catch (e) {
-      pluginError(e, isWatch);
-    }
-    const deps = cssFilter.indexOf(path.extname(anaFileOriginFile)) > -1
-      ? findCssImports(contents)
-      : precinct(contents);
-    deps.forEach((depItem) => {
-      if (depItem.startsWith('.')) {
-        // 被依赖文件的存在的绝对路径
-        const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
-        // 被依赖文件加上后缀
-        const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
-
-        if (!fs.existsSync(depOriginFile)) {
-          pluginError(
-            new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`),
-            isWatch,
-          );
-          return;
-        }
-
-        const depDestPath = resolve(path.dirname(anaFileDestFile), depItem);
-        const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
-        if (!resDep.has(depDestFile)) {
-          resDep.set(depDestFile, {
-            anaFileOriginFile,
-            anaFileDestFile,
-            depDestFile,
-            depOriginFile,
-          });
-          dfs(depOriginFile, depDestFile, extensions);
-        }
-      }
-    });
-  }
-  dfs(anaFileOriginFile, anaFileDestFile, extensions);
-
-  return resDep;
-};
-
-function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
-  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.outputDir, module.to, anaFileRelativeModule);
-
-    if (file.isBuffer()) {
-      let contents = String(file.contents);
-      const deps = cssFilter.indexOf(path.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
-
-      const copyModules = new Map();
-      Object.keys(tmsConfig.dependencies).forEach((includeName) => {
-        const includePath = tmsConfig.dependencies[includeName];
-        deps.forEach((depItem) => {
-          if (depItem.indexOf(includeName) > -1) {
-            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
-            const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
-            // 被依赖文件加上后缀
-            const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
-
-            if (!fileInDir(includePath, depOriginFile)) {
-              pluginError(
-                new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
-                isWatch,
-              );
-              return;
-            }
-
-            // eslint-disable-next-line
-            const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-            const regRes = depItem.match(reg) || [];
-            if (regRes[2]) {
-              const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
-              const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
-              if (!copyModules.has(depDestFile)) {
-                copyModules.set(depDestFile, {
-                  depOriginFile,
-                  depDestFile,
-                  beforeDepPath: depItem,
-                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
-                });
-              }
-            }
-          }
-        });
-      });
-
-      // console.log('mpCommonDep copyModules', copyModules);
-      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
-        diffContentCopyFile(depOriginFile, depDestFile);
-        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
-        contents = contents.replace(reg, `"${afterDepPath}"`);
-
-        const defs = dfsFindCommonDep(depOriginFile, depDestFile, extensions, isWatch);
-        defs.forEach((item) => {
-          diffContentCopyFile(item.depOriginFile, item.depDestFile);
-        });
-        // console.log('mpCommonDep defs', defs);
-      });
-
-      file.contents = new Buffer(contents);
-    }
-    this.push(file);
-    cb();
-  });
-
-  return stream;
-}
-
-module.exports = {
-  mpCommonDep,
-  dfsFindCommonDep,
-};
+/* eslint-disable no-param-reassign */
+const through = require('through2');
+const precinct = require('precinct');
+const path = require('path');
+const { findCssImports }  = require('../../utils/findCssImport');
+const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
+const { resolve } = require('../../utils/widgets');
+const fs = require('fs');
+const { pluginError } = require('./utils/pluginError');
+
+const cssFilter = ['.less', '.wxss'];
+const dfsFindCommonDep = function (anaFileOriginFile, anaFileDestFile, extensions, isWatch = true) {
+  const resDep = new Map();
+  function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
+    let contents = '';
+    try {
+      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError(e, isWatch);
+    }
+    const deps = cssFilter.indexOf(path.extname(anaFileOriginFile)) > -1
+      ? findCssImports(contents)
+      : precinct(contents);
+    deps.forEach((depItem) => {
+      if (depItem.startsWith('.')) {
+        // 被依赖文件的存在的绝对路径
+        const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+        // 被依赖文件加上后缀
+        const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+        if (!fs.existsSync(depOriginFile)) {
+          pluginError(
+            new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`),
+            isWatch,
+          );
+          return;
+        }
+
+        const depDestPath = resolve(path.dirname(anaFileDestFile), depItem);
+        const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+        if (!resDep.has(depDestFile)) {
+          resDep.set(depDestFile, {
+            anaFileOriginFile,
+            anaFileDestFile,
+            depDestFile,
+            depOriginFile,
+          });
+          dfs(depOriginFile, depDestFile, extensions);
+        }
+      }
+    });
+  }
+  dfs(anaFileOriginFile, anaFileDestFile, extensions);
+
+  return resDep;
+};
+
+function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
+  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.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      const deps = cssFilter.indexOf(path.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
+
+      const copyModules = new Map();
+      Object.keys(tmsConfig.dependencies).forEach((includeName) => {
+        const includePath = tmsConfig.dependencies[includeName];
+        deps.forEach((depItem) => {
+          if (depItem.indexOf(includeName) > -1) {
+            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
+            const depOriginPath = path.join(path.dirname(anaFileOriginFile), depItem);
+            // 被依赖文件加上后缀
+            const { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+            if (!fileInDir(includePath, depOriginFile)) {
+              pluginError(
+                new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
+                isWatch,
+              );
+              return;
+            }
+
+            // eslint-disable-next-line
+            const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+            const regRes = depItem.match(reg) || [];
+            if (regRes[2]) {
+              const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+              const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+              if (!copyModules.has(depDestFile)) {
+                copyModules.set(depDestFile, {
+                  depOriginFile,
+                  depDestFile,
+                  beforeDepPath: depItem,
+                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/'),
+                });
+              }
+            }
+          }
+        });
+      });
+
+      // console.log('mpCommonDep copyModules', copyModules);
+      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
+        diffContentCopyFile(depOriginFile, depDestFile);
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+
+        const defs = dfsFindCommonDep(depOriginFile, depDestFile, extensions, isWatch);
+        defs.forEach((item) => {
+          diffContentCopyFile(item.depOriginFile, item.depDestFile);
+        });
+        // console.log('mpCommonDep defs', defs);
+      });
+
+      file.contents = Buffer.from(contents);
+    }
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpCommonDep,
+  dfsFindCommonDep,
+};

package/src/gulp/plugins/mpJsonDep.js

@@ -1,108 +1,108 @@
-/* eslint-disable no-param-reassign */
-const through = require('through2');
-const path = require('path');
-const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
-const { resolve } = require('../../utils/widgets');
-const fs = require('fs');
-const { pluginError } = require('./utils/pluginError');
-const { dfsFindCommonDep } = require('./mpCommonDep');
-
-function mpJsonDep(
-  tmsConfig,
-  module,
-  extensions = ['.json'],
-  filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'],
-  isWatch,
-) {
-  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.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.dependencies).forEach((includeName) => {
-            const includePath = tmsConfig.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 { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
-
-                const isFileInDir = fileInDir(includePath, depOriginFile);
-                if (!isFileInDir) {
-                  pluginError(
-                    new Error(`${anaFileOriginFile}引用的路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
-                    isWatch,
-                  );
-                  return;
-                }
-
-                // eslint-disable-next-line
-                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-                const regRes = componentPath.match(reg) || [];
-                if (regRes[2]) {
-                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
-                  const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
-
-                  if (!copyModules.has(depDestFile)) {
-                    copyModules.set(depDestFile, {
-                      depOriginFile,
-                      depOriginExt: extAlias,
-                      depDestFile,
-                      beforeDepPath: componentPath,
-                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
-                    });
-                  }
-                }
-              }
-            });
-          });
-        }
-      } catch (e) {
-        pluginError(e, isWatch);
-      }
-      // console.log('json copyModules', copyModules);
-      copyModules.forEach(({ depOriginFile, depOriginExt, depDestFile, beforeDepPath, afterDepPath }) => {
-        // 拷贝当前依赖组件几个部分 wxml、wxss、wxs、json
-        filesExt.forEach((extKey) => {
-          const originFile = depOriginFile.replace(depOriginExt, extKey);
-          const destFile = depDestFile.replace(depOriginExt, extKey);
-
-          if (fs.existsSync(originFile)) {
-            diffContentCopyFile(originFile, destFile);
-
-            const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
-            if (extensionsFilter.indexOf(extKey) > -1) {
-              const defs = dfsFindCommonDep(originFile, destFile, extensionsFilter);
-              // console.log('json defs', defs);
-              defs.forEach((item) => {
-                diffContentCopyFile(item.depOriginFile, item.depDestFile);
-              });
-            }
-          }
-        });
-        contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
-        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
-        contents = contents.replace(reg, `"${afterDepPath}"`);
-      });
-      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
-      file.contents = new Buffer(contents);
-    }
-
-    this.push(file);
-    cb();
-  });
-
-  return stream;
-}
-
-module.exports = {
-  mpJsonDep,
-};
+/* eslint-disable no-param-reassign */
+const through = require('through2');
+const path = require('path');
+const { ext, fileInDir, diffContentCopyFile } = require('../../utils/io');
+const { resolve } = require('../../utils/widgets');
+const fs = require('fs');
+const { pluginError } = require('./utils/pluginError');
+const { dfsFindCommonDep } = require('./mpCommonDep');
+
+function mpJsonDep(
+  tmsConfig,
+  module,
+  extensions = ['.json'],
+  filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'],
+  isWatch,
+) {
+  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.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.dependencies).forEach((includeName) => {
+            const includePath = tmsConfig.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 { ext: extAlias, file: depOriginFile, extPath } = ext(depOriginPath, extensions);
+
+                const isFileInDir = fileInDir(includePath, depOriginFile);
+                if (!isFileInDir) {
+                  pluginError(
+                    new Error(`${anaFileOriginFile}引用的路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
+                    isWatch,
+                  );
+                  return;
+                }
+
+                // eslint-disable-next-line
+                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = componentPath.match(reg) || [];
+                if (regRes[2]) {
+                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+
+                  if (!copyModules.has(depDestFile)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depOriginExt: extAlias,
+                      depDestFile,
+                      beforeDepPath: componentPath,
+                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/'),
+                    });
+                  }
+                }
+              }
+            });
+          });
+        }
+      } catch (e) {
+        pluginError(e, isWatch);
+      }
+      // console.log('json copyModules', copyModules);
+      copyModules.forEach(({ depOriginFile, depOriginExt, depDestFile, beforeDepPath, afterDepPath }) => {
+        // 拷贝当前依赖组件几个部分 wxml、wxss、wxs、json
+        filesExt.forEach((extKey) => {
+          const originFile = depOriginFile.replace(depOriginExt, extKey);
+          const destFile = depDestFile.replace(depOriginExt, extKey);
+
+          if (fs.existsSync(originFile)) {
+            diffContentCopyFile(originFile, destFile);
+
+            const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
+            if (extensionsFilter.indexOf(extKey) > -1) {
+              const defs = dfsFindCommonDep(originFile, destFile, extensionsFilter);
+              // console.log('json defs', defs);
+              defs.forEach((item) => {
+                diffContentCopyFile(item.depOriginFile, item.depDestFile);
+              });
+            }
+          }
+        });
+        contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+      });
+      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+      file.contents = Buffer.from(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpJsonDep,
+};