Comparing version 1.0.15 to 1.1.2
/*! | ||
* Brolog JavaScript Library v0.2.0 | ||
* Brolog JavaScript Library v1.1.0 | ||
* https://github.com/zixia/brolog | ||
* | ||
* Copyright Zhuohuan LI <zixia@zixia.net> | ||
* Copyright Huan LI <zixia@zixia.net> | ||
* Released under the ISC license | ||
@@ -22,25 +22,27 @@ * https://github.com/zixia/brolog/blob/master/LICENSE | ||
export declare class Brolog { | ||
private static logLevel; | ||
private static prefixFilter; | ||
private logLevel; | ||
private prefixFilter; | ||
constructor(); | ||
/** | ||
* Create a global Brolog Instance for sharing between modules | ||
*/ | ||
static instance(levelName?: LevelName, prefix?: string | RegExp): Brolog; | ||
static prefix(filter?: string | RegExp): RegExp; | ||
prefix(filter?: string | RegExp): RegExp; | ||
static prefix(filter?: string | RegExp): RegExp; | ||
static level(levelName?: LevelName): LevelName; | ||
level(levelName?: LevelName): LevelName; | ||
static level(levelName?: LevelName): LevelName; | ||
private static log(levelTitle, prefix, message); | ||
private log(levelTitle, prefix, message); | ||
static error(prefix: string, ...args: any[]): void; | ||
error(prefix: string, ...args: any[]): void; | ||
static error(prefix: string, ...args: any[]): void; | ||
static warn(prefix: string, ...args: any[]): void; | ||
warn(prefix: string, ...args: any[]): void; | ||
static warn(prefix: string, ...args: any[]): void; | ||
static info(prefix: string, ...args: any[]): void; | ||
info(prefix: string, ...args: any[]): void; | ||
static info(prefix: string, ...args: any[]): void; | ||
static verbose(prefix: string, ...args: any[]): void; | ||
verbose(prefix: string, ...args: any[]): void; | ||
static verbose(prefix: string, ...args: any[]): void; | ||
static silly(prefix: string, ...args: any[]): void; | ||
silly(prefix: string, ...args: any[]): void; | ||
static silly(prefix: string, ...args: any[]): void; | ||
private static timestamp(); | ||
static timestamp(): string; | ||
} | ||
export declare const preSetInstance: Brolog; | ||
export { preSetInstance as log }; | ||
export default preSetInstance; | ||
export declare const sharedInstance: Brolog; | ||
export default sharedInstance; |
"use strict"; | ||
/*! | ||
* Brolog JavaScript Library v0.2.0 | ||
* Brolog JavaScript Library v1.1.0 | ||
* https://github.com/zixia/brolog | ||
* | ||
* Copyright Zhuohuan LI <zixia@zixia.net> | ||
* Copyright Huan LI <zixia@zixia.net> | ||
* Released under the ISC license | ||
@@ -22,19 +22,36 @@ * https://github.com/zixia/brolog/blob/master/LICENSE | ||
})(LogLevel = exports.LogLevel || (exports.LogLevel = {})); | ||
var Brolog = (function () { | ||
function Brolog() { | ||
// console.log('constructor') | ||
class Brolog { | ||
constructor() { | ||
this.logLevel = LogLevel.info; | ||
this.prefixFilter = /.*/; // Match all by default | ||
const instance = Brolog.instance(); | ||
if (instance) { | ||
// set level/prefix of this instance | ||
// default to the global instance | ||
this.level(instance.level()); | ||
this.prefix(instance.prefix()); | ||
} | ||
} | ||
Brolog.instance = function (levelName, prefix) { | ||
Brolog.level(levelName); | ||
Brolog.prefix(prefix); | ||
return exports.preSetInstance; | ||
}; | ||
Brolog.prototype.prefix = function (filter) { return Brolog.prefix(filter); }; | ||
Brolog.prefix = function (filter) { | ||
/** | ||
* Create a global Brolog Instance for sharing between modules | ||
*/ | ||
static instance(levelName, prefix) { | ||
if (levelName) { | ||
exports.sharedInstance.level(levelName); | ||
} | ||
if (prefix) { | ||
exports.sharedInstance.prefix(prefix); | ||
} | ||
return exports.sharedInstance; | ||
} | ||
static prefix(filter) { | ||
return Brolog.instance().prefix(filter); | ||
} | ||
prefix(filter) { | ||
if (filter) { | ||
if (typeof filter === 'string') { | ||
Brolog.prefixFilter = new RegExp(filter, 'i'); | ||
this.prefixFilter = new RegExp(filter, 'i'); | ||
} | ||
else if (filter instanceof RegExp) { | ||
Brolog.prefixFilter = filter; | ||
this.prefixFilter = filter; | ||
} | ||
@@ -45,6 +62,8 @@ else { | ||
} | ||
return Brolog.prefixFilter; | ||
}; | ||
Brolog.prototype.level = function (levelName) { return Brolog.level(levelName); }; | ||
Brolog.level = function (levelName) { | ||
return this.prefixFilter; | ||
} | ||
static level(levelName) { | ||
return Brolog.instance().level(levelName); | ||
} | ||
level(levelName) { | ||
if (levelName) { | ||
@@ -54,3 +73,3 @@ // console.log('levelName: ' + levelName) | ||
// XXX: fix the any here? | ||
var logLevel = LogLevel[levelName.toLowerCase()]; | ||
const logLevel = LogLevel[levelName.toLowerCase()]; | ||
if (logLevel === undefined) { | ||
@@ -61,12 +80,12 @@ // console.log(logLevel) | ||
} | ||
Brolog.logLevel = logLevel; | ||
this.logLevel = logLevel; | ||
} | ||
return LogLevel[Brolog.logLevel]; | ||
}; | ||
return LogLevel[this.logLevel]; | ||
} | ||
// private log(levelTitle: LevelTitle, prefix: string, message: string) { return Brolog.log(levelTitle, prefix, message) } | ||
Brolog.log = function (levelTitle, prefix, message) { | ||
if (!Brolog.prefixFilter.test(prefix)) { | ||
log(levelTitle, prefix, message) { | ||
if (!this.prefixFilter.test(prefix)) { | ||
return; // skip message not match prefix filter | ||
} | ||
var args = Array.prototype.slice.call(arguments, 3) || []; | ||
const args = Array.prototype.slice.call(arguments, 3) || []; | ||
args.unshift(Brolog.timestamp() + ' ' + levelTitle + ' ' + prefix + ' ' + (message || '')); | ||
@@ -88,104 +107,69 @@ switch (levelTitle) { | ||
} | ||
}; | ||
Brolog.prototype.error = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
return Brolog.error.apply(null, arguments); | ||
}; | ||
Brolog.error = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
if (Brolog.logLevel < LogLevel.error) { | ||
} | ||
static error(prefix, ...args) { | ||
const instance = Brolog.instance(); | ||
return instance.error.apply(instance, arguments); | ||
} | ||
error(prefix, ...args) { | ||
if (this.logLevel < LogLevel.error) { | ||
return; | ||
} | ||
var argList = Array.prototype.slice.call(arguments); | ||
const argList = Array.prototype.slice.call(arguments); | ||
argList.unshift('ERR'); | ||
Brolog.log.apply(null, argList); | ||
}; | ||
Brolog.prototype.warn = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
return Brolog.warn.apply(null, arguments); | ||
}; | ||
Brolog.warn = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
if (Brolog.logLevel < LogLevel.warn) { | ||
this.log.apply(this, argList); | ||
} | ||
static warn(prefix, ...args) { | ||
const instance = Brolog.instance(); | ||
return instance.warn.apply(instance, arguments); | ||
} | ||
warn(prefix, ...args) { | ||
if (this.logLevel < LogLevel.warn) { | ||
return; | ||
} | ||
var argList = Array.prototype.slice.call(arguments); | ||
const argList = Array.prototype.slice.call(arguments); | ||
argList.unshift('WARN'); | ||
Brolog.log.apply(null, argList); | ||
}; | ||
Brolog.prototype.info = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
return Brolog.info.apply(null, arguments); | ||
}; | ||
Brolog.info = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
if (Brolog.logLevel < LogLevel.info) { | ||
this.log.apply(this, argList); | ||
} | ||
static info(prefix, ...args) { | ||
const instance = Brolog.instance(); | ||
return instance.info.apply(instance, arguments); | ||
} | ||
info(prefix, ...args) { | ||
if (this.logLevel < LogLevel.info) { | ||
return; | ||
} | ||
var argList = Array.prototype.slice.call(arguments); | ||
const argList = Array.prototype.slice.call(arguments); | ||
argList.unshift('INFO'); | ||
Brolog.log.apply(null, argList); | ||
}; | ||
Brolog.prototype.verbose = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
return Brolog.verbose.apply(null, arguments); | ||
}; | ||
Brolog.verbose = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
if (Brolog.logLevel < LogLevel.verbose) { | ||
this.log.apply(this, argList); | ||
} | ||
static verbose(prefix, ...args) { | ||
const instance = Brolog.instance(); | ||
return instance.verbose.apply(instance, arguments); | ||
} | ||
verbose(prefix, ...args) { | ||
if (this.logLevel < LogLevel.verbose) { | ||
return; | ||
} | ||
var argList = Array.prototype.slice.call(arguments); | ||
const argList = Array.prototype.slice.call(arguments); | ||
argList.unshift('VERB'); | ||
Brolog.log.apply(null, argList); | ||
}; | ||
Brolog.prototype.silly = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
return Brolog.silly.apply(null, arguments); | ||
}; | ||
Brolog.silly = function (prefix) { | ||
var args = []; | ||
for (var _i = 1; _i < arguments.length; _i++) { | ||
args[_i - 1] = arguments[_i]; | ||
} | ||
if (Brolog.logLevel < LogLevel.silly) { | ||
this.log.apply(this, argList); | ||
} | ||
static silly(prefix, ...args) { | ||
const instance = Brolog.instance(); | ||
return instance.silly.apply(instance, arguments); | ||
} | ||
silly(prefix, ...args) { | ||
if (this.logLevel < LogLevel.silly) { | ||
return; | ||
} | ||
var argList = Array.prototype.slice.call(arguments); | ||
const argList = Array.prototype.slice.call(arguments); | ||
argList.unshift('SILL'); | ||
Brolog.log.apply(null, argList); | ||
}; | ||
Brolog.timestamp = function () { | ||
var date = new Date(); | ||
var hour = date.getHours(); | ||
var min = date.getMinutes(); | ||
var sec = date.getSeconds(); | ||
var stampStr = ''; | ||
this.log.apply(this, argList); | ||
} | ||
static timestamp() { | ||
const date = new Date(); | ||
const hour = date.getHours(); | ||
const min = date.getMinutes(); | ||
const sec = date.getSeconds(); | ||
let stampStr = ''; | ||
stampStr += (hour < 10) ? ('0' + hour) : hour; | ||
@@ -197,11 +181,7 @@ stampStr += ':'; | ||
return stampStr; | ||
}; | ||
return Brolog; | ||
}()); | ||
Brolog.logLevel = LogLevel.info; | ||
Brolog.prefixFilter = /.*/; // Match all by default | ||
} | ||
} | ||
exports.Brolog = Brolog; | ||
exports.preSetInstance = new Brolog(); | ||
exports.log = exports.preSetInstance; | ||
exports.default = exports.preSetInstance; | ||
exports.sharedInstance = new Brolog(); | ||
exports.default = exports.sharedInstance; | ||
//# sourceMappingURL=brolog.js.map |
{ | ||
"name": "brolog", | ||
"version": "1.0.15", | ||
"version": "1.1.2", | ||
"description": "Npmlog like logger for Browser", | ||
"main": "dist/brolog.js", | ||
"main": "bundles/brolog.js", | ||
"typings": "dist/brolog.d.ts", | ||
"scripts": { | ||
"clean": "rm -fr dist/", | ||
"dist": "npm run clean && npm run build:umd && npm run build && npm run build:amd && npm run build:system", | ||
"clean": "rm -fr dist/* bundles/*", | ||
"dist": "npm run clean && npm run build && npm run build:umd", | ||
"build": "tsc", | ||
"build:umd": "tsc --module umd --outDir dist/umd", | ||
"build:amd": "tsc --module amd --outDir dist/amd", | ||
"build:system": "tsc --module system --outDir dist/system", | ||
"build:umd": "tsc --target es5 --module umd --outDir bundles/", | ||
"build:amd:deprecated": "tsc --module amd --outDir dist/amd", | ||
"build:system:deprecated": "tsc --module system --outDir dist/system", | ||
"e2e": "test/protractor.sh", | ||
@@ -15,0 +15,0 @@ "lint": "npm run tslint", |
@@ -171,4 +171,8 @@ # brolog [![Build Status](https://travis-ci.org/zixia/brolog.svg?branch=master)](https://travis-ci.org/zixia/brolog) | ||
## v1.0 (May 2017) | ||
## V1.1 (May 2017) | ||
1. Support to create individual instances.(We only have one singleton instance before) | ||
## v1.0 (Apr 2017) | ||
Compatible with AOT & WebPack with Angular v4.0 | ||
@@ -202,3 +206,2 @@ | ||
# Reference | ||
@@ -210,1 +213,2 @@ | ||
4. [Angular 2 Errors](https://daveceddia.com/angular-2-errors/) | ||
1. [ES6 vs ES2015 - What to call a JavaScript version?](https://bytearcher.com/articles/es6-vs-es2015-name/) |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
212
21263
6
227
1