@tmsfe/tmskit 0.0.7 → 0.0.8

package/src/{gulp → compile}/plugins/mpJsonDep.js

@@ -1,108 +1,112 @@
-/* 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,
-};
+/* 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()) {
+      let contents = String(file.contents);
+      const copyModules = new Map();
+      try {
+        try {
+          contents = contents ? JSON.parse(contents) : {};
+        } catch (e) {
+          throw new Error(`解析${file.path}出现错误，请检查配置信息: ${e}`);
+        }
+        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,
+};

package/src/{gulp → compile}/plugins/mpWxmlDep.js

@@ -1,194 +1,194 @@
-/* eslint-disable no-param-reassign */
-const through = require('through2');
-const htmlparser2 = require('htmlparser2');
-const fs = require('fs');
-const path = require('path');
-const { diffContentCopyFile, ext, fileInDir } = require('../../utils/io');
-const { resolve } = require('../../utils/widgets');
-const { dfsFindCommonDep } = require('./mpCommonDep');
-const { pluginError } = require('./utils/pluginError');
-
-// 处理后缀(源码引入依赖时，不带后缀的情况)
-const extFile = function (name, file) {
-  const extMap = {
-    import: '.wxml',
-    include: '.wxml',
-    wxs: '.wxs',
-  };
-  let extObj = {};
-
-  if (Object.keys(extMap).indexOf(name) > -1 && !file.endsWith(extMap[name])) {
-    extObj = ext(file, [extMap[name]]);
-  }
-  return {
-    extPath: extObj.extPath || '',
-    ext: extObj.ext || '',
-    file: extObj.file || file,
-  };
-};
-
-const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = true) {
-  const resDep = {
-    image: new Map(),
-    wxml: new Map(),
-    wxs: new Map(),
-  };
-  function dfs(anaFileOriginFile, anaFileDestFile) {
-    let contents = '';
-    try {
-      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
-    } catch (e) {
-      pluginError(e, isWatch);
-    }
-    const parser = new htmlparser2.Parser({
-      onopentag(name, attributes) {
-        if (attributes?.src?.startsWith('.')) {
-          const depOriginPath = path.join(path.dirname(anaFileOriginFile), attributes.src);
-          // 被依赖文件加上后缀
-          const { ext, file: depOriginFile, extPath } = extFile(name, depOriginPath);
-
-          if (!fs.existsSync(depOriginFile)) {
-            pluginError(
-              new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`),
-              isWatch,
-            );
-            return;
-          }
-
-          const depDestPath = path.join(path.dirname(anaFileDestFile), attributes.src);
-          const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
-
-          // 收集wxml依赖
-          if (['import', 'include'].indexOf(name) > -1) {
-            resDep.wxml.set(depDestFile, {
-              anaFileOriginFile,
-              anaFileDestFile,
-              depDestFile,
-              depOriginFile,
-            });
-            dfs(depOriginFile, depDestFile);
-          }
-          // 收集image依赖
-          // if (name === 'image') {
-          //   resDep.image.set(attributes.src, {
-          //     anaFileOriginFile,
-          //     anaFileDestFile,
-          //     depDestFile,
-          //     depOriginFile,
-          //   });
-          //   dfs(depOriginFile, depDestFile);
-          // }
-          // 收集wxs依赖
-          if (name === 'wxs') {
-            resDep.wxs.set(depDestFile, {
-              anaFileOriginFile,
-              anaFileDestFile,
-              depDestFile,
-              depOriginFile,
-            });
-            const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs']);
-            defs.forEach((item, key) => {
-              resDep.wxs.set(key, item);
-            });
-          }
-        }
-      },
-    });
-    parser.write(contents);
-    parser.end();
-  }
-  dfs(anaFileOriginFile, anaFileDestFile);
-
-  return resDep;
-};
-
-function mpWxmlDep(tmsConfig, module, 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()) {
-      let contents = String(file.contents);
-      const copyModules = new Map();
-      const parser = new htmlparser2.Parser({
-        onopentag(name, attributes) {
-          const nameFilter = ['import', 'include', 'wxs'];
-          if (nameFilter.indexOf(name) > -1 && attributes.src) {
-            const depOriginPath = path.join(path.dirname(anaFileOriginFile), attributes.src);
-            // 处理后缀(源码引入依赖时，后缀不全的情况)
-            const { ext, file: depOriginFile, extPath } = extFile(name, depOriginPath);
-
-            Object.keys(tmsConfig.dependencies).forEach((includeName) => {
-              if (attributes.src.indexOf(includeName) > -1) {
-                const includePath = tmsConfig.dependencies[includeName];
-
-                if (!fileInDir(includePath, depOriginFile)) {
-                  pluginError(
-                    new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
-                    isWatch,
-                  );
-                  return;
-                }
-
-                // eslint-disable-next-line
-                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
-                const regRes = attributes.src.match(reg) || [];
-                if (regRes[2]) {
-                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
-                  const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
-                  if (!copyModules.has(depDestFile)) {
-                    copyModules.set(depDestFile, {
-                      depOriginFile,
-                      depDestFile,
-                      beforeDepPath: attributes.src,
-                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/'),
-                    });
-                  }
-                }
-              }
-            });
-          }
-        },
-      });
-      parser.write(contents);
-      parser.end();
-
-      // console.log('wxml copyModules', copyModules);
-      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
-        if (fs.existsSync(depOriginFile)) {
-          diffContentCopyFile(depOriginFile, depDestFile);
-          const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
-          contents = contents.replace(reg, `"${afterDepPath}"`);
-        }
-        if (depOriginFile.endsWith('.wxml')) {
-          const defs = dfsFindWxmlDep(depOriginFile, depDestFile, isWatch);
-          // console.log('wxml defs', defs);
-          [...defs.wxml, ...defs.wxs].forEach(([, item]) => {
-            diffContentCopyFile(item.depOriginFile, item.depDestFile);
-          });
-        }
-        if (depOriginFile.endsWith('.wxs')) {
-          const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs'], isWatch);
-          // console.log('wxs defs', defs);
-          defs.forEach((item) => {
-            diffContentCopyFile(item.depOriginFile, item.depDestFile);
-          });
-        }
-      });
-
-      file.contents = Buffer.from(contents);
-    }
-
-    this.push(file);
-    cb();
-  });
-
-  return stream;
-}
-
-module.exports = {
-  mpWxmlDep,
-  dfsFindWxmlDep,
-};
+/* eslint-disable no-param-reassign */
+const through = require('through2');
+const htmlparser2 = require('htmlparser2');
+const fs = require('fs');
+const path = require('path');
+const { diffContentCopyFile, ext, fileInDir } = require('../../utils/io');
+const { resolve } = require('../../utils/widgets');
+const { dfsFindCommonDep } = require('./mpCommonDep');
+const { pluginError } = require('./utils/pluginError');
+
+// 处理后缀(源码引入依赖时，不带后缀的情况)
+const extFile = function (name, file) {
+  const extMap = {
+    import: '.wxml',
+    include: '.wxml',
+    wxs: '.wxs',
+  };
+  let extObj = {};
+
+  if (Object.keys(extMap).indexOf(name) > -1 && !file.endsWith(extMap[name])) {
+    extObj = ext(file, [extMap[name]]);
+  }
+  return {
+    extPath: extObj.extPath || '',
+    ext: extObj.ext || '',
+    file: extObj.file || file,
+  };
+};
+
+const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = true) {
+  const resDep = {
+    image: new Map(),
+    wxml: new Map(),
+    wxs: new Map(),
+  };
+  function dfs(anaFileOriginFile, anaFileDestFile) {
+    let contents = '';
+    try {
+      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError(e, isWatch);
+    }
+    const parser = new htmlparser2.Parser({
+      onopentag(name, attributes) {
+        if (attributes?.src?.startsWith('.')) {
+          const depOriginPath = path.join(path.dirname(anaFileOriginFile), attributes.src);
+          // 被依赖文件加上后缀
+          const { ext, file: depOriginFile, extPath } = extFile(name, depOriginPath);
+
+          if (!fs.existsSync(depOriginFile)) {
+            pluginError(
+              new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`),
+              isWatch,
+            );
+            return;
+          }
+
+          const depDestPath = path.join(path.dirname(anaFileDestFile), attributes.src);
+          const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
+
+          // 收集wxml依赖
+          if (['import', 'include'].indexOf(name) > -1) {
+            resDep.wxml.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile,
+            });
+            dfs(depOriginFile, depDestFile);
+          }
+          // 收集image依赖
+          // if (name === 'image') {
+          //   resDep.image.set(attributes.src, {
+          //     anaFileOriginFile,
+          //     anaFileDestFile,
+          //     depDestFile,
+          //     depOriginFile,
+          //   });
+          //   dfs(depOriginFile, depDestFile);
+          // }
+          // 收集wxs依赖
+          if (name === 'wxs') {
+            resDep.wxs.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile,
+            });
+            const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs']);
+            defs.forEach((item, key) => {
+              resDep.wxs.set(key, item);
+            });
+          }
+        }
+      },
+    });
+    parser.write(contents);
+    parser.end();
+  }
+  dfs(anaFileOriginFile, anaFileDestFile);
+
+  return resDep;
+};
+
+function mpWxmlDep(tmsConfig, module, 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()) {
+      let contents = String(file.contents);
+      const copyModules = new Map();
+      const parser = new htmlparser2.Parser({
+        onopentag(name, attributes) {
+          const nameFilter = ['import', 'include', 'wxs'];
+          if (nameFilter.indexOf(name) > -1 && attributes.src) {
+            const depOriginPath = path.join(path.dirname(anaFileOriginFile), attributes.src);
+            // 处理后缀(源码引入依赖时，后缀不全的情况)
+            const { ext, file: depOriginFile, extPath } = extFile(name, depOriginPath);
+
+            Object.keys(tmsConfig.dependencies).forEach((includeName) => {
+              if (attributes.src.indexOf(includeName) > -1) {
+                const includePath = tmsConfig.dependencies[includeName];
+
+                if (!fileInDir(includePath, depOriginFile)) {
+                  pluginError(
+                    new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`),
+                    isWatch,
+                  );
+                  return;
+                }
+
+                // eslint-disable-next-line
+                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = attributes.src.match(reg) || [];
+                if (regRes[2]) {
+                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
+                  if (!copyModules.has(depDestFile)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depDestFile,
+                      beforeDepPath: attributes.src,
+                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/'),
+                    });
+                  }
+                }
+              }
+            });
+          }
+        },
+      });
+      parser.write(contents);
+      parser.end();
+
+      // console.log('wxml copyModules', copyModules);
+      copyModules.forEach(({ depOriginFile, depDestFile, beforeDepPath, afterDepPath }) => {
+        if (fs.existsSync(depOriginFile)) {
+          diffContentCopyFile(depOriginFile, depDestFile);
+          const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+          contents = contents.replace(reg, `"${afterDepPath}"`);
+        }
+        if (depOriginFile.endsWith('.wxml')) {
+          const defs = dfsFindWxmlDep(depOriginFile, depDestFile, isWatch);
+          // console.log('wxml defs', defs);
+          [...defs.wxml, ...defs.wxs].forEach(([, item]) => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
+        }
+        if (depOriginFile.endsWith('.wxs')) {
+          const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs'], isWatch);
+          // console.log('wxs defs', defs);
+          defs.forEach((item) => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
+        }
+      });
+
+      file.contents = Buffer.from(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+
+  return stream;
+}
+
+module.exports = {
+  mpWxmlDep,
+  dfsFindWxmlDep,
+};