:enhance: 增强工具链.

Author: zyao89

.eslintignore

@@ -2,3 +2,4 @@ node_modules
 coverage
 .vscode
 .circleci
+*.d.ts

.eslintrc.js

@@ -8,6 +8,6 @@ module.exports = {
         "eslint-config-2o3t"
     ],
     parserOptions: {
-        parser: "babel-eslint"
+        parser: "babel-eslint",
     },
 }

index.d.ts

@@ -0,0 +1,51 @@
+import fs from 'fs-extra';
+import chalk from 'chalk';
+import cheerio from 'cheerio';
+import semver from 'semver';
+import semverRegex from 'semver-regex';
+import _ from 'lodash';
+import ora from 'ora';
+import dedent from 'dedent';
+import globby from 'globby';
+import globParent from 'glob-parent';
+import isGlob from 'is-glob';
+import npa from 'npm-package-arg';
+import parseGitUrl from 'git-url-parse';
+
+export function tryRequire( id: string, req?: Object): any | null;
+export function assert(value: any, message?: string | Error): void;
+
+import * as moduleAlias from './src/moduleAlias';
+import * as getPadLength from './src/getPadLength';
+import * as injectHtml from './src/injectHtml';
+import * as loadFile from './src/loadFile';
+import * as logger from './src/logger';
+import * as smartMerge from './src/smartMerge';
+import * as virtualFile from './src/virtualFile';
+
+export {
+    moduleAlias,
+    getPadLength,
+    injectHtml,
+    loadFile,
+    logger,
+    smartMerge,
+    virtualFile,
+};
+
+export {
+    assert,
+    fs,
+    chalk,
+    cheerio,
+    semver,
+    semverRegex,
+    _,
+    ora,
+    dedent,
+    globby,
+    globParent,
+    isGlob,
+    npa,
+    parseGitUrl,
+}

index.js

@@ -1,25 +1,44 @@
 'use strict';
 
-[
+const internal = [
     'moduleAlias',
     'getPadLength',
     'injectHtml',
     'loadFile',
     'logger',
     'smartMerge',
     'virtualFile',
-].forEach(m => {
-    Object.assign(exports, {
-        [m]: require(`./src/${m}`),
+].reduce((obj, key) => {
+    obj[key] = require(`./src/${key}`);
+    return obj;
+}, {});
+
+internal.assert = internal.logger.assert.bind(internal.logger);
+
+const thirdParty = {
+    fs: 'fs-extra',
+    chalk: 'chalk',
+    cheerio: 'cheerio',
+    semver: 'semver',
+    semverRegex: 'semver-regex',
+    _: 'lodash',
+    tryRequire: 'try-require',
+    ora: 'ora',
+    dedent: 'dedent',
+    globby: 'globby',
+    globParent: 'glob-parent',
+    isGlob: 'is-glob',
+    npa: 'npm-package-arg',
+    parseGitUrl: 'git-url-parse',
+};
+
+Object.keys(thirdParty).forEach(key => {
+    // lazy
+    Object.defineProperty(internal, key, {
+        get() {
+            return require(thirdParty[key]);
+        },
     });
 });
 
-exports.assert = require('assert');
-exports.fs = require('fs-extra');
-exports.chalk = require('chalk');
-exports.cheerio = require('cheerio');
-exports.semver = require('semver');
-exports.semverRegex = require('semver-regex');
-exports._ = require('lodash');
-exports.tryRequire = require('try-require');
-exports.ora = require('ora');
+module.exports = internal;

package.json

@@ -53,14 +53,23 @@
         "assert": "^2.0.0",
         "chalk": "^2.4.2",
         "cheerio": "^1.0.0-rc.3",
+        "dedent": "^0.7.0",
         "fs-extra": "^8.1.0",
+        "git-url-parse": "^11.1.2",
+        "glob-parent": "^5.1.0",
+        "globby": "^10.0.1",
+        "import-fresh": "^3.1.0",
+        "is-glob": "^4.0.1",
         "lodash": "^4.17.15",
+        "npm-package-arg": "^6.1.1",
         "npmlog": "^4.1.2",
         "ora": "^3.4.0",
+        "parse-json": "^5.0.0",
         "semver": "^6.3.0",
         "semver-regex": "^3.1.0",
         "stream-to-string": "^1.2.0",
-        "try-require": "^1.2.1"
+        "try-require": "^1.2.1",
+        "yaml": "^1.7.2"
     },
     "engines": {
         "node": ">=8"

src/loadFile/index.js

@@ -1,12 +1,27 @@
 'use strict';
 
-const tryRequire = require('try-require');
 const fs = require('fs-extra');
 const path = require('path');
 
+const loaders = require('./loaders');
+const logger = require('../logger');
+
+const DEFAULT_LOADERS = Object.freeze({
+    '.js': loaders.loadJs,
+    '.json': loaders.loadJson,
+    '.yaml': loaders.loadYaml,
+    '.yml': loaders.loadYaml,
+    // noExt: loaders.loadYaml,
+});
+
+function loaderExt(filename) {
+    return path.extname(filename) || 'noExt';
+}
+
 function isSupport(filename) {
-    return [ '.js', '.json' ].some(ext => {
-        return filename.endsWith(ext);
+    const _ext = loaderExt(filename);
+    return Object.keys(DEFAULT_LOADERS).some(ext => {
+        return ext === _ext;
     });
 }
 
@@ -18,14 +33,24 @@ function load(root, filename) {
     if (!fs.statSync(filePath).isFile()) {
         return null;
     }
-    return tryRequire(filePath);
+    const loaderKey = loaderExt(filename);
+    const loader = DEFAULT_LOADERS[loaderKey];
+    if (!loader) {
+        logger.throw(`No loader specified for extension "${loaderKey}", so "${filename}" is invalid`);
+    }
+    try {
+        return loader(filePath);
+    } catch (err) {
+        logger.throw(err);
+    }
 }
 
 function loadFile(root, filename, { before, after } = {}) {
     if (!root || !filename) {
         return null;
     }
     if (!isSupport(filename)) {
+        logger.warn(`Not Support extension, so "${filename}" is invalid`);
         return null;
     }
     if (before && !before(root, filename)) {

src/loadFile/loadFile.test.js

@@ -13,19 +13,31 @@ describe('loadFile', () => {
     });
 
     it('not exist', () => {
-        const file = loadFile(__dirname, 'abc.jsx');
+        const file = loadFile(process.cwd(), 'abc.jsx');
 
         expect(file).toBeNull();
     });
 
     it('not file', () => {
-        const file = loadFile(__dirname, '../');
+        const file = loadFile(process.cwd(), './');
 
         expect(file).toBeNull();
     });
 
     it('success', () => {
-        const file = loadFile(__dirname, '../../test/a.js');
+        const file = loadFile(process.cwd(), 'test/a.js');
+
+        expect(file).not.toBeNull();
+    });
+
+    it('json', () => {
+        const file = loadFile(process.cwd(), 'package.json');
+
+        expect(file).not.toBeNull();
+    });
+
+    it('yaml', () => {
+        const file = loadFile(process.cwd(), 'test/a.yaml');
 
         expect(file).not.toBeNull();
     });

src/loadFile/loaders.js

@@ -0,0 +1,55 @@
+'use strict';
+
+const fs = require('fs-extra');
+const _ = require('lodash');
+
+const loadFile = function loadFile(filepath) {
+    const content = fs.readFileSync(filepath, 'utf8');
+    return content;
+};
+
+let importFresh;
+const loadJs = function loadJs(filepath) {
+    if (!importFresh) {
+        importFresh = require('import-fresh');
+    }
+
+    const result = importFresh(filepath);
+    return result;
+};
+
+let parseJson;
+const loadJson = function loadJson(filepath, content) {
+    if (!parseJson) {
+        parseJson = require('parse-json');
+    }
+    if (_.isUndefined(content)) {
+        content = loadFile(filepath);
+    }
+    try {
+        const result = parseJson(content);
+        return result;
+    } catch (error) {
+        error.message = `JSON Error in ${filepath}:\n${error.message}`;
+        throw error;
+    }
+};
+
+let yaml;
+const loadYaml = function loadYaml(filepath, content) {
+    if (!yaml) {
+        yaml = require('yaml');
+    }
+    if (_.isUndefined(content)) {
+        content = loadFile(filepath);
+    }
+    try {
+        const result = yaml.parse(content, { prettyErrors: true });
+        return result;
+    } catch (error) {
+        error.message = `YAML Error in ${filepath}:\n${error.message}`;
+        throw error;
+    }
+};
+
+module.exports = { loadJs, loadJson, loadYaml };

src/logger/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const npmlog = require('npmlog');
-
+const assert = require('assert');
 const chalk = require('chalk');
 const utils = require('util');
 const ora = require('ora');
@@ -14,21 +14,15 @@ if (process.env.MICRO_APP_LOGGER_LEVEL) {
 }
 // npmlog.prefixStyle = {};
 const CUSTOM_LEVEL = {
-    debug: {
-        disp: '*DEBUG*',
-        bg: 'magenta',
-    },
-    info: {
-        fg: 'brightGreen',
-    },
     success: {
+        level: 3001,
         fg: 'brightWhite',
         bg: 'green',
         bold: true,
     },
     noise: {
-        fg: 'blue',
         level: 10000,
+        bg: 'magenta',
         beep: true,
     },
 };
@@ -55,6 +49,9 @@ const getStdoutMethod = function(type) {
 };
 
 const getNpmlogMethod = function(type) {
+    if ([ 'debug' ].includes(type)) {
+        type = 'verbose';
+    }
     return npmlog[type].bind(npmlog);
 };
 
@@ -98,7 +95,7 @@ const getMethod = function(type) {
 const logger = {
     toString,
     debug() {
-        if (!process.env.MICRO_APP_DEBUG_LOGGER) return; // 是否开启
+        // if (!process.env.MICRO_APP_DEBUG_LOGGER) return; // 是否开启
         return getMethod('debug')(...arguments);
     },
     warn() {
@@ -143,6 +140,14 @@ const logger = {
         }
         process.exit(1);
     },
+
+    assert(...args) {
+        try {
+            assert(...args);
+        } catch (err) {
+            this.throw('[assert]', err.message);
+        }
+    },
 };
 module.exports = new Proxy(logger, {
     get(target, prop) {

test/a.yaml

@@ -0,0 +1 @@
+- name: 'abc'