:fix: 修复部分bug等。

Author: zyao89

index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node"/>
+
 import fs from 'fs-extra';
 import chalk from 'chalk';
 import cheerio from 'cheerio';
@@ -11,6 +13,8 @@ import globParent from 'glob-parent';
 import isGlob from 'is-glob';
 import npa from 'npm-package-arg';
 import parseGitUrl from 'git-url-parse';
+import multimatch from 'multimatch';
+import stringifyObject from 'stringify-object';
 
 export function tryRequire( id: string, req?: Object): any | null;
 export function assert(value: any, message?: string | Error): void;
@@ -28,9 +32,9 @@ export {
     getPadLength,
     injectHtml,
     loadFile,
-    logger,
     smartMerge,
     virtualFile,
+    logger,
 };
 
 export {
@@ -48,4 +52,6 @@ export {
     isGlob,
     npa,
     parseGitUrl,
+    multimatch,
+    stringifyObject,
 }

index.js

@@ -1,5 +1,17 @@
 'use strict';
 
+const output = {};
+
+function defineProperty(key, from, to = output) {
+    if (to[key]) throw new Error(`"${key}" already exsits!`);
+    // lazy
+    Object.defineProperty(to, key, {
+        get() {
+            return require(from[key]);
+        },
+    });
+}
+
 const internal = [
     'moduleAlias',
     'getPadLength',
@@ -9,11 +21,13 @@ const internal = [
     'smartMerge',
     'virtualFile',
 ].reduce((obj, key) => {
-    obj[key] = require(`./src/${key}`);
+    obj[key] = `./src/${key}`;
     return obj;
 }, {});
 
-internal.assert = internal.logger.assert.bind(internal.logger);
+Object.keys(internal).forEach(key => {
+    defineProperty(key, internal);
+});
 
 const thirdParty = {
     fs: 'fs-extra',
@@ -30,15 +44,25 @@ const thirdParty = {
     isGlob: 'is-glob',
     npa: 'npm-package-arg',
     parseGitUrl: 'git-url-parse',
+    multimatch: 'multimatch',
+    stringifyObject: 'stringify-object',
 };
 
 Object.keys(thirdParty).forEach(key => {
-    // lazy
-    Object.defineProperty(internal, key, {
-        get() {
-            return require(thirdParty[key]);
-        },
+    defineProperty(key, thirdParty);
+});
+
+const alias = {
+    assert: () => {
+        return output.logger.assert.bind(output.logger);
+    },
+};
+
+Object.keys(alias).forEach(key => {
+    if (output[key]) throw new Error(`"${key}" already exsits!`);
+    Object.defineProperty(output, key, {
+        get: alias[key],
     });
 });
 
-module.exports = internal;
+module.exports = output;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/shared-utils",
-    "version": "0.1.0",
+    "version": "0.1.3",
     "description": "[Shared] shared utilities for micro-app.",
     "main": "index.js",
     "scripts": {
@@ -18,6 +18,7 @@
     },
     "files": [
         "src",
+        "index.d.ts",
         "index.js"
     ],
     "keywords": [
@@ -39,14 +40,14 @@
         ]
     },
     "devDependencies": {
-        "@types/jest": "^24.0.19",
+        "@types/jest": "^24.0.23",
         "babel-eslint": "^10.0.3",
         "coveralls": "^3.0.7",
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
-        "husky": "^3.0.9",
+        "husky": "^3.1.0",
         "jest": "^24.9.0",
-        "lint-staged": "^9.4.2",
+        "lint-staged": "^9.4.3",
         "webpack-merge": "^4.2.2"
     },
     "dependencies": {
@@ -58,16 +59,18 @@
         "git-url-parse": "^11.1.2",
         "glob-parent": "^5.1.0",
         "globby": "^10.0.1",
-        "import-fresh": "^3.1.0",
+        "import-fresh": "^3.2.1",
         "is-glob": "^4.0.1",
         "lodash": "^4.17.15",
+        "multimatch": "^4.0.0",
         "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",
+        "stringify-object": "^3.3.0",
         "try-require": "^1.2.1",
         "yaml": "^1.7.2"
     },

src/loadFile/index.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const _ = require('lodash');
 
 const loaders = require('./loaders');
 const logger = require('../logger');
@@ -46,7 +47,11 @@ function load(root, filename) {
 }
 
 function loadFile(root, filename, { before, after } = {}) {
-    if (!root || !filename) {
+    if (!_.isEmpty(root) && _.isEmpty(filename)) {
+        filename = path.basename(root);
+        root = path.dirname(root);
+    }
+    if (_.isEmpty(root) || _.isEmpty(filename)) {
         return null;
     }
     if (!isSupport(filename)) {

src/loadFile/loadFile.test.js

@@ -42,4 +42,10 @@ describe('loadFile', () => {
         expect(file).not.toBeNull();
     });
 
+    it('json', () => {
+        const file = loadFile(process.cwd() + '/package.json');
+
+        expect(file).not.toBeNull();
+    });
+
 });

src/logger/index.js

@@ -6,12 +6,11 @@ const chalk = require('chalk');
 const utils = require('util');
 const ora = require('ora');
 const os = require('os');
+const stringifyObject = require('stringify-object');
+const _ = require('lodash');
 
 npmlog.heading = require('../constants').SCOPE_NAME || '@micro-app';
 
-if (process.env.MICRO_APP_LOGGER_LEVEL) {
-    npmlog.level = process.env.MICRO_APP_LOGGER_LEVEL === 'true' ? 'silly' : process.env.MICRO_APP_LOGGER_LEVEL;
-}
 // npmlog.prefixStyle = {};
 const CUSTOM_LEVEL = {
     success: {
@@ -48,11 +47,21 @@ const getStdoutMethod = function(type) {
     return process.stdout.write.bind(process.stdout);
 };
 
+function formatObject(message) {
+    if (_.isString(message)) {
+        return message;
+    }
+    return stringifyObject(message, {
+        indent: '  ',
+        singleQuotes: false,
+        inlineCharacterLimit: 12,
+    });
+}
+
+// TODO 优化输出
 function dyeMessage(type, message) {
+    message = formatObject(message);
     switch (type.toLowerCase()) {
-        case 'debug': {
-            return chalk.visible(message);
-        }
         case 'warn': {
             return chalk.yellowBright(message);
         }
@@ -107,7 +116,6 @@ class Logger {
     }
 
     debug() {
-        // if (!process.env.MICRO_APP_DEBUG_LOGGER) return; // 是否开启
         return this.getMethod('debug')(...arguments);
     }
     warn() {
@@ -162,24 +170,26 @@ class Logger {
     }
 
     getMethod(type) {
+        if ([ 'debug' ].includes(type)) { // 不再需要 debug
+            type = 'verbose';
+        }
         const logger = this.getNpmlogMethod(type);
+        if (typeof logger !== 'function') {
+            return logger;
+        }
         return function(...args) {
             if (args.length <= 1) {
                 return logger(false, ...args.map(arg => dyeMessage(type, arg)));
             }
             return logger(args[0], ...args.splice(1).map(arg => dyeMessage(type, arg)));
         };
-        // const logger = getStdoutMethod(type);
-        // return function(...args) {
-        //     return logger(format[type].call(format, ...args));
-        // };
     }
 
     getNpmlogMethod(type) {
-        if ([ 'debug' ].includes(type)) {
-            type = 'verbose';
+        if (typeof this.npmlog[type] === 'function') {
+            return this.npmlog[type].bind(this.npmlog);
         }
-        return this.npmlog[type].bind(this.npmlog);
+        return this.npmlog[type];
     }
 
     setAlias(type, value) {
@@ -194,15 +204,15 @@ class Logger {
         return this.aliasMap.get(type);
     }
 
+    addCustomToString(key, value) {
+        this.customFormatMap.set(key, value);
+    }
+
     newGroup(name, ...args) {
         const newLog = this.npmlog.newGroup(name, ...args);
         return factroy(newLog, { alias: this.aliasMap, customFormat: this.customFormatMap });
     }
 
-    addCustomToString(key, value) {
-        this.customFormatMap.set(key, value);
-    }
-
     get format() { // 兼容 toString
         return new Proxy(this, {
             get(target, prop) {
@@ -215,14 +225,21 @@ class Logger {
 function factroy(log, opts = {}) {
     return new Proxy(new Logger(log, opts), {
         get(target, prop) {
-            if (!(prop in target) && typeof prop === 'string' && (prop in npmlog)) {
+            if (prop in target) {
+                return target[prop];
+            }
+            if ([ 'silly', 'verbose', 'info', 'timing', 'http', 'notice', 'warn', 'error', 'silent' ].includes(prop)) {
                 return target.getMethod(prop);
             }
             const alias = target.getAlias(prop);
             if (alias) {
                 return target.getMethod(alias);
             }
-            return target[prop];
+            return log[prop];
+        },
+        set(target, prop, value) {
+            log[prop] = value;
+            return true;
         },
     });
 }
@@ -231,3 +248,4 @@ module.exports = factroy(npmlog, { customFormat: Object.entries(format) });
 
 module.exports.getStdoutMethod = getStdoutMethod;
 
+module.exports.Logger = Logger;

src/logger/logger.test.js

@@ -53,4 +53,10 @@ describe('Logger', () => {
 
     });
 
+
+    it('logger debug', () => {
+        logger.level = 'silly';
+        logger.debug('abc');
+    });
+
 });

test/npmlog.js

@@ -12,18 +12,32 @@ const logger = require('../src/logger');
 //     bg: 'red',
 // };
 
-logger.npmlog.level = 'verbose';
+// logger.npmlog.level = 'verbose';
+logger.level = 'silly';
+console.warn(logger.level);
+console.warn(logger.npmlog.level);
 
 logger.info('abc', 'haha..');
 logger.error('abc', 'haha..');
 logger.warn('abc', 'haha..');
 logger.warn('', 'haha..');
 logger.success('haha..');
 logger.debug('111haha..');
+logger.verbose('111haha..');
 logger.noise(false, 'haha..');
 
 // logger.throw(new Error('abbdd'), 'abc..');
 
 // console.log(npmlog.record)
 // console.log(npmlog.level)
-logger.assert(1 === 2, 'not eq!!');
+// logger.assert(1 === 2, 'not eq!!');
+
+
+logger.debug('1 abc');
+
+const nl = logger.newGroup('abc');
+nl.error('ccc');
+nl.debug('cccd');
+nl.success('cccd');
+nl.debug('111 scccd');
+nl.silly('cccd');