@haibun/core 1.13.5 → 1.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.d.ts +1 -2
- package/build/index.js +1 -27
- package/build/index.js.map +1 -1
- package/build/lib/ConnectedLogger.d.ts +3 -4
- package/build/lib/ConnectedLogger.js +3 -9
- package/build/lib/ConnectedLogger.js.map +1 -1
- package/build/lib/Logger.d.ts +10 -11
- package/build/lib/Logger.js +17 -19
- package/build/lib/Logger.js.map +1 -1
- package/build/lib/Logger.test.d.ts +0 -1
- package/build/lib/Logger.test.js +11 -36
- package/build/lib/Logger.test.js.map +1 -1
- package/build/lib/TestLogger.d.ts +1 -2
- package/build/lib/TestLogger.js +1 -4
- package/build/lib/TestLogger.js.map +1 -1
- package/build/lib/Timer.d.ts +0 -1
- package/build/lib/Timer.js +4 -8
- package/build/lib/Timer.js.map +1 -1
- package/build/lib/contexts.d.ts +1 -2
- package/build/lib/contexts.js +9 -14
- package/build/lib/contexts.js.map +1 -1
- package/build/lib/{defs/index.d.ts → defs.d.ts} +57 -57
- package/build/lib/defs.js +28 -0
- package/build/lib/defs.js.map +1 -0
- package/build/lib/domain.d.ts +3 -4
- package/build/lib/domain.js +14 -23
- package/build/lib/domain.js.map +1 -1
- package/build/lib/features.d.ts +1 -2
- package/build/lib/features.js +15 -27
- package/build/lib/features.js.map +1 -1
- package/build/lib/features.test.d.ts +0 -1
- package/build/lib/features.test.js +31 -59
- package/build/lib/features.test.js.map +1 -1
- package/build/lib/interfaces/logger.d.ts +9 -10
- package/build/lib/interfaces/logger.js +1 -4
- package/build/lib/interfaces/logger.js.map +1 -1
- package/build/lib/namedVars.d.ts +7 -8
- package/build/lib/namedVars.js +12 -20
- package/build/lib/namedVars.js.map +1 -1
- package/build/lib/namedVars.test.d.ts +0 -1
- package/build/lib/namedVars.test.js +33 -38
- package/build/lib/namedVars.test.js.map +1 -1
- package/build/lib/run-with-options.d.ts +2 -3
- package/build/lib/run-with-options.js +13 -19
- package/build/lib/run-with-options.js.map +1 -1
- package/build/lib/run.d.ts +3 -4
- package/build/lib/run.domains.test.d.ts +0 -1
- package/build/lib/run.domains.test.js +43 -51
- package/build/lib/run.domains.test.js.map +1 -1
- package/build/lib/run.js +28 -36
- package/build/lib/run.js.map +1 -1
- package/build/lib/run.test.d.ts +0 -1
- package/build/lib/run.test.js +24 -32
- package/build/lib/run.test.js.map +1 -1
- package/build/lib/test/TestSteps.d.ts +12 -13
- package/build/lib/test/TestSteps.js +39 -44
- package/build/lib/test/TestSteps.js.map +1 -1
- package/build/lib/test/TestStepsWithDomain.d.ts +7 -8
- package/build/lib/test/TestStepsWithDomain.js +12 -17
- package/build/lib/test/TestStepsWithDomain.js.map +1 -1
- package/build/lib/test/TestStepsWithOptions.d.ts +6 -7
- package/build/lib/test/TestStepsWithOptions.js +18 -23
- package/build/lib/test/TestStepsWithOptions.js.map +1 -1
- package/build/lib/test/lib.d.ts +5 -6
- package/build/lib/test/lib.js +38 -72
- package/build/lib/test/lib.js.map +1 -1
- package/build/lib/util/index.d.ts +5 -6
- package/build/lib/util/index.js +54 -119
- package/build/lib/util/index.js.map +1 -1
- package/build/lib/util/util.test.d.ts +0 -1
- package/build/lib/util/util.test.js +35 -67
- package/build/lib/util/util.test.js.map +1 -1
- package/build/link-packages.d.ts +0 -1
- package/build/link-packages.js +5 -7
- package/build/link-packages.js.map +1 -1
- package/build/phases/Builder.d.ts +3 -4
- package/build/phases/Builder.js +12 -12
- package/build/phases/Builder.js.map +1 -1
- package/build/phases/Builder.test.d.ts +0 -1
- package/build/phases/Builder.test.js +13 -18
- package/build/phases/Builder.test.js.map +1 -1
- package/build/phases/Executor.d.ts +1 -2
- package/build/phases/Executor.js +16 -17
- package/build/phases/Executor.js.map +1 -1
- package/build/phases/Resolver.d.ts +1 -2
- package/build/phases/Resolver.domains.test.d.ts +0 -1
- package/build/phases/Resolver.domains.test.js +1 -2
- package/build/phases/Resolver.domains.test.js.map +1 -1
- package/build/phases/Resolver.js +19 -20
- package/build/phases/Resolver.js.map +1 -1
- package/build/phases/Resolver.test.d.ts +0 -1
- package/build/phases/Resolver.test.js +31 -36
- package/build/phases/Resolver.test.js.map +1 -1
- package/build/scaffold/index.d.ts +0 -1
- package/build/scaffold/index.js +2 -4
- package/build/scaffold/index.js.map +1 -1
- package/build/scaffold/scaffold.d.ts +1 -2
- package/build/scaffold/scaffold.js +25 -33
- package/build/scaffold/scaffold.js.map +1 -1
- package/build/scaffold/scaffold.test.d.ts +0 -1
- package/build/scaffold/scaffold.test.js +15 -20
- package/build/scaffold/scaffold.test.js.map +1 -1
- package/build/steps/conformance.d.ts +6 -7
- package/build/steps/conformance.js +10 -15
- package/build/steps/conformance.js.map +1 -1
- package/build/steps/credentials.d.ts +7 -8
- package/build/steps/credentials.js +25 -32
- package/build/steps/credentials.js.map +1 -1
- package/build/steps/haibun.d.ts +13 -14
- package/build/steps/haibun.js +66 -71
- package/build/steps/haibun.js.map +1 -1
- package/build/steps/haibun.test.d.ts +0 -1
- package/build/steps/haibun.test.js +4 -6
- package/build/steps/haibun.test.js.map +1 -1
- package/build/steps/vars.d.ts +17 -18
- package/build/steps/vars.js +74 -83
- package/build/steps/vars.js.map +1 -1
- package/build/steps/vars.test.d.ts +0 -1
- package/build/steps/vars.test.js +9 -11
- package/build/steps/vars.test.js.map +1 -1
- package/package.json +19 -5
- package/scaffold/.eslintrc.in +20 -0
- package/scaffold/.prettierrc.in +6 -0
- package/scaffold/src/stepper.test.ts.in +1 -1
- package/scaffold/src/stepper.ts.in +2 -2
- package/scaffold/tsconfig.json.in +2 -2
- package/build/index.d.ts.map +0 -1
- package/build/lib/ConnectedLogger.d.ts.map +0 -1
- package/build/lib/Logger.d.ts.map +0 -1
- package/build/lib/Logger.test.d.ts.map +0 -1
- package/build/lib/TestLogger.d.ts.map +0 -1
- package/build/lib/Timer.d.ts.map +0 -1
- package/build/lib/contexts.d.ts.map +0 -1
- package/build/lib/defs/index.d.ts.map +0 -1
- package/build/lib/defs/index.js +0 -31
- package/build/lib/defs/index.js.map +0 -1
- package/build/lib/domain.d.ts.map +0 -1
- package/build/lib/features.d.ts.map +0 -1
- package/build/lib/features.test.d.ts.map +0 -1
- package/build/lib/interfaces/logger.d.ts.map +0 -1
- package/build/lib/namedVars.d.ts.map +0 -1
- package/build/lib/namedVars.test.d.ts.map +0 -1
- package/build/lib/run-with-options.d.ts.map +0 -1
- package/build/lib/run.d.ts.map +0 -1
- package/build/lib/run.domains.test.d.ts.map +0 -1
- package/build/lib/run.test.d.ts.map +0 -1
- package/build/lib/test/TestSteps.d.ts.map +0 -1
- package/build/lib/test/TestStepsWithDomain.d.ts.map +0 -1
- package/build/lib/test/TestStepsWithOptions.d.ts.map +0 -1
- package/build/lib/test/lib.d.ts.map +0 -1
- package/build/lib/util/index.d.ts.map +0 -1
- package/build/lib/util/util.test.d.ts.map +0 -1
- package/build/link-packages.d.ts.map +0 -1
- package/build/phases/Builder.d.ts.map +0 -1
- package/build/phases/Builder.test.d.ts.map +0 -1
- package/build/phases/Executor.d.ts.map +0 -1
- package/build/phases/Resolver.d.ts.map +0 -1
- package/build/phases/Resolver.domains.test.d.ts.map +0 -1
- package/build/phases/Resolver.test.d.ts.map +0 -1
- package/build/scaffold/index.d.ts.map +0 -1
- package/build/scaffold/scaffold.d.ts.map +0 -1
- package/build/scaffold/scaffold.test.d.ts.map +0 -1
- package/build/scaffold.d.ts +0 -3
- package/build/scaffold.d.ts.map +0 -1
- package/build/scaffold.js +0 -78
- package/build/scaffold.js.map +0 -1
- package/build/steps/conformance.d.ts.map +0 -1
- package/build/steps/credentials.d.ts.map +0 -1
- package/build/steps/haibun.d.ts.map +0 -1
- package/build/steps/haibun.test.d.ts.map +0 -1
- package/build/steps/vars.d.ts.map +0 -1
- package/build/steps/vars.test.d.ts.map +0 -1
package/build/index.d.ts
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export * as defs from './lib/defs';
|
|
2
|
-
//# sourceMappingURL=index.d.ts.map
|
|
1
|
+
export * as defs from './lib/defs.js';
|
package/build/index.js
CHANGED
|
@@ -1,28 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.defs = void 0;
|
|
27
|
-
exports.defs = __importStar(require("./lib/defs"));
|
|
1
|
+
export * as defs from './lib/defs.js';
|
|
28
2
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import Logger from './Logger';
|
|
2
|
-
import { IConnectedLogger, ILoggerKeepAlive, ILogOutput, TLogLevel, TMessageContext } from './interfaces/logger';
|
|
3
|
-
import { TTag } from './defs';
|
|
1
|
+
import Logger from './Logger.js';
|
|
2
|
+
import { IConnectedLogger, ILoggerKeepAlive, ILogOutput, TLogLevel, TMessageContext } from './interfaces/logger.js';
|
|
3
|
+
import { TTag } from './defs.js';
|
|
4
4
|
export declare class ConnectedLogger extends Logger implements IConnectedLogger {
|
|
5
5
|
keepalive?: ILoggerKeepAlive;
|
|
6
6
|
constructor(output: ILogOutput, tag: TTag);
|
|
@@ -9,4 +9,3 @@ export declare class ConnectedLogger extends Logger implements IConnectedLogger
|
|
|
9
9
|
addKeepalive(keepAlive: ILoggerKeepAlive): void;
|
|
10
10
|
out(level: TLogLevel, message: any, mctx?: TMessageContext): void;
|
|
11
11
|
}
|
|
12
|
-
//# sourceMappingURL=ConnectedLogger.d.ts.map
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ConnectedLogger = void 0;
|
|
7
|
-
const Logger_1 = __importDefault(require("./Logger"));
|
|
8
|
-
class ConnectedLogger extends Logger_1.default {
|
|
1
|
+
import Logger from './Logger.js';
|
|
2
|
+
export class ConnectedLogger extends Logger {
|
|
3
|
+
keepalive;
|
|
9
4
|
constructor(output, tag) {
|
|
10
5
|
const res = { output, tag };
|
|
11
6
|
super(res);
|
|
@@ -24,5 +19,4 @@ class ConnectedLogger extends Logger_1.default {
|
|
|
24
19
|
console.error('fixme; topic changed to context');
|
|
25
20
|
}
|
|
26
21
|
}
|
|
27
|
-
exports.ConnectedLogger = ConnectedLogger;
|
|
28
22
|
//# sourceMappingURL=ConnectedLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectedLogger.js","sourceRoot":"","sources":["../../src/lib/ConnectedLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConnectedLogger.js","sourceRoot":"","sources":["../../src/lib/ConnectedLogger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAIjC,MAAM,OAAO,eAAgB,SAAQ,MAAM;IACzC,SAAS,CAAoB;IAC7B,YAAY,MAAkB,EAAE,GAAS;QACvC,MAAM,GAAG,GAAe,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACxC,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IACD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,SAA2B;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,KAAgB,EAAE,OAAY,EAAE,IAAsB;QACxD,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACzC,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACnD,CAAC;CACF"}
|
package/build/lib/Logger.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { TTag } from './defs';
|
|
2
|
-
import { ILogger, ILogOutput, TLogLevel, TMessageContext, TOutputEnv } from './interfaces/logger';
|
|
1
|
+
import { TTag } from './defs.js';
|
|
2
|
+
import { ILogger, ILogOutput, TLogLevel, TMessageContext, TOutputEnv } from './interfaces/logger.js';
|
|
3
3
|
export declare const LOGGER_LOG: {
|
|
4
4
|
level: string;
|
|
5
5
|
};
|
|
6
|
-
export declare const
|
|
6
|
+
export declare const LOGGER_NOTHING: {
|
|
7
7
|
level: string;
|
|
8
8
|
};
|
|
9
9
|
export declare const LOGGER_LEVELS: {
|
|
@@ -14,11 +14,11 @@ export declare const LOGGER_LEVELS: {
|
|
|
14
14
|
error: number;
|
|
15
15
|
none: number;
|
|
16
16
|
};
|
|
17
|
-
|
|
17
|
+
type TLevel = {
|
|
18
18
|
level: string;
|
|
19
19
|
follow?: string;
|
|
20
20
|
};
|
|
21
|
-
|
|
21
|
+
type TConf = TLevel | TOutputEnv;
|
|
22
22
|
export default class Logger implements ILogger, ILogOutput {
|
|
23
23
|
level: number | undefined;
|
|
24
24
|
env: TOutputEnv | undefined;
|
|
@@ -29,11 +29,10 @@ export default class Logger implements ILogger, ILogOutput {
|
|
|
29
29
|
static shouldLogLevel(level: number, name: TLogLevel): boolean;
|
|
30
30
|
static shouldLogFollow(match: string, tag: TTag): boolean;
|
|
31
31
|
out(level: TLogLevel, args: any, messageContext?: TMessageContext): void;
|
|
32
|
-
debug: (args: any, mctx?: TMessageContext
|
|
33
|
-
log: (args: any, mctx?: TMessageContext
|
|
34
|
-
info: (args: any, mctx?: TMessageContext
|
|
35
|
-
warn: (args: any, mctx?: TMessageContext
|
|
36
|
-
error: (args: any, mctx?: TMessageContext
|
|
32
|
+
debug: (args: any, mctx?: TMessageContext) => void;
|
|
33
|
+
log: (args: any, mctx?: TMessageContext) => void;
|
|
34
|
+
info: (args: any, mctx?: TMessageContext) => void;
|
|
35
|
+
warn: (args: any, mctx?: TMessageContext) => void;
|
|
36
|
+
error: (args: any, mctx?: TMessageContext) => void;
|
|
37
37
|
}
|
|
38
38
|
export {};
|
|
39
|
-
//# sourceMappingURL=Logger.d.ts.map
|
package/build/lib/Logger.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const util_1 = require("./util");
|
|
5
|
-
exports.LOGGER_LOG = { level: 'log' };
|
|
6
|
-
exports.LOGGER_NONE = { level: 'none' };
|
|
1
|
+
import { descTag } from './util/index.js';
|
|
2
|
+
export const LOGGER_LOG = { level: 'log' };
|
|
3
|
+
export const LOGGER_NOTHING = { level: 'none' };
|
|
7
4
|
const WIDTH = process.cwd().length + 40;
|
|
8
|
-
|
|
5
|
+
export const LOGGER_LEVELS = {
|
|
9
6
|
debug: 1,
|
|
10
7
|
log: 2,
|
|
11
8
|
info: 3,
|
|
@@ -13,18 +10,15 @@ exports.LOGGER_LEVELS = {
|
|
|
13
10
|
error: 5,
|
|
14
11
|
none: 9,
|
|
15
12
|
};
|
|
16
|
-
class Logger {
|
|
13
|
+
export default class Logger {
|
|
14
|
+
level = 1;
|
|
15
|
+
env;
|
|
16
|
+
subscribers = [];
|
|
17
|
+
follow;
|
|
17
18
|
constructor(conf) {
|
|
18
|
-
this.level = 1;
|
|
19
|
-
this.subscribers = [];
|
|
20
|
-
this.debug = (args, mctx) => this.out('debug', args, mctx);
|
|
21
|
-
this.log = (args, mctx) => this.out('log', args, mctx);
|
|
22
|
-
this.info = (args, mctx) => this.out('info', args, mctx);
|
|
23
|
-
this.warn = (args, mctx) => this.out('warn', args, mctx);
|
|
24
|
-
this.error = (args, mctx) => this.out('error', args, mctx);
|
|
25
19
|
// passed a log level and possibly a follow
|
|
26
20
|
if (conf.level) {
|
|
27
|
-
this.level =
|
|
21
|
+
this.level = LOGGER_LEVELS[conf.level];
|
|
28
22
|
this.follow = conf.follow;
|
|
29
23
|
}
|
|
30
24
|
else {
|
|
@@ -38,7 +32,7 @@ class Logger {
|
|
|
38
32
|
if (!level) {
|
|
39
33
|
throw Error(`undefined logger level ${level}`);
|
|
40
34
|
}
|
|
41
|
-
return
|
|
35
|
+
return LOGGER_LEVELS[name] >= level;
|
|
42
36
|
}
|
|
43
37
|
static shouldLogFollow(match, tag) {
|
|
44
38
|
if (!match || !tag) {
|
|
@@ -60,9 +54,13 @@ class Logger {
|
|
|
60
54
|
for (const subscriber of this.subscribers) {
|
|
61
55
|
subscriber.out(level, args, messageContext);
|
|
62
56
|
}
|
|
63
|
-
const tag = messageContext?.tag ?
|
|
57
|
+
const tag = messageContext?.tag ? descTag(messageContext.tag) : '';
|
|
64
58
|
console[level](`${ln}${tag}: `.padStart(WIDTH), args, level.padStart(6));
|
|
65
59
|
}
|
|
60
|
+
debug = (args, mctx) => this.out('debug', args, mctx);
|
|
61
|
+
log = (args, mctx) => this.out('log', args, mctx);
|
|
62
|
+
info = (args, mctx) => this.out('info', args, mctx);
|
|
63
|
+
warn = (args, mctx) => this.out('warn', args, mctx);
|
|
64
|
+
error = (args, mctx) => this.out('error', args, mctx);
|
|
66
65
|
}
|
|
67
|
-
exports.default = Logger;
|
|
68
66
|
//# sourceMappingURL=Logger.js.map
|
package/build/lib/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/lib/Logger.ts"],"names":[],"mappings":"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"}
|
package/build/lib/Logger.test.js
CHANGED
|
@@ -1,55 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
const logger_1 = require("./interfaces/logger");
|
|
27
|
-
const Logger_1 = __importStar(require("./Logger"));
|
|
28
|
-
const lib_1 = require("./test/lib");
|
|
1
|
+
import { TEST_RESULT } from './interfaces/logger.js';
|
|
2
|
+
import Logger, { LOGGER_LEVELS } from './Logger.js';
|
|
3
|
+
import { getDefaultTag } from './test/lib.js';
|
|
29
4
|
describe('log levels', () => {
|
|
30
5
|
test('logs none with none', () => {
|
|
31
|
-
expect(
|
|
32
|
-
expect(
|
|
6
|
+
expect(Logger.shouldLogLevel(LOGGER_LEVELS['none'], 'debug')).toBe(false);
|
|
7
|
+
expect(Logger.shouldLogLevel(LOGGER_LEVELS['none'], 'info')).toBe(false);
|
|
33
8
|
});
|
|
34
9
|
test('logs log with log', () => {
|
|
35
|
-
expect(
|
|
10
|
+
expect(Logger.shouldLogLevel(LOGGER_LEVELS['log'], 'log')).toBe(true);
|
|
36
11
|
});
|
|
37
12
|
test('does not log debug with log', () => {
|
|
38
|
-
expect(
|
|
13
|
+
expect(Logger.shouldLogLevel(LOGGER_LEVELS['log'], 'debug')).toBe(false);
|
|
39
14
|
});
|
|
40
15
|
});
|
|
41
16
|
describe('logger with subscriber', () => {
|
|
42
17
|
test('subscriber receives topic', (done) => {
|
|
43
|
-
const logger = new
|
|
18
|
+
const logger = new Logger({ level: 'debug' });
|
|
44
19
|
const subscriber = {
|
|
45
20
|
out(level, args, ctx) {
|
|
46
21
|
expect(ctx.topic).toBeDefined();
|
|
47
|
-
expect(ctx.topic.result).toEqual(
|
|
22
|
+
expect(ctx.topic.result).toEqual(TEST_RESULT);
|
|
48
23
|
done();
|
|
49
24
|
},
|
|
50
25
|
};
|
|
51
26
|
logger.addSubscriber(subscriber);
|
|
52
|
-
logger.log('test', { topic: { stage: 'Executor', result:
|
|
27
|
+
logger.log('test', { topic: { stage: 'Executor', result: TEST_RESULT, seq: 1 } });
|
|
53
28
|
});
|
|
54
29
|
});
|
|
55
30
|
describe('logger with output', () => {
|
|
@@ -60,7 +35,7 @@ describe('logger with output', () => {
|
|
|
60
35
|
done();
|
|
61
36
|
},
|
|
62
37
|
};
|
|
63
|
-
const dlogger = new
|
|
38
|
+
const dlogger = new Logger({ output, tag: getDefaultTag(0) });
|
|
64
39
|
dlogger.log('test');
|
|
65
40
|
});
|
|
66
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.test.js","sourceRoot":"","sources":["../../src/lib/Logger.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.test.js","sourceRoot":"","sources":["../../src/lib/Logger.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAmC,MAAM,wBAAwB,CAAC;AAClG,OAAO,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC/B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,CAAC,2BAA2B,EAAE,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAe;YAC7B,GAAG,CAAC,KAAa,EAAE,IAAW,EAAE,GAAqB;gBACnD,MAAM,CAAC,GAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAE,GAAI,CAAC,KAAyB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBACpE,IAAI,EAAE,CAAC;YACT,CAAC;SACF,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,yBAAyB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,MAAM,MAAM,GAAe;YACzB,GAAG,CAAC,KAAa,EAAE,IAAW,EAAE,GAAqB;gBACnD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,EAAE,CAAC;YACT,CAAC;SACF,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAE9D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ILogger } from "./interfaces/logger";
|
|
1
|
+
import { ILogger } from "./interfaces/logger.js";
|
|
2
2
|
export default class TestLogger implements ILogger {
|
|
3
3
|
debug(...args: any): void;
|
|
4
4
|
log(...args: any): void;
|
|
@@ -7,4 +7,3 @@ export default class TestLogger implements ILogger {
|
|
|
7
7
|
error(...args: any): void;
|
|
8
8
|
addSubscriber(...args: any): void;
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=TestLogger.d.ts.map
|
package/build/lib/TestLogger.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
class TestLogger {
|
|
1
|
+
export default class TestLogger {
|
|
4
2
|
debug(...args) { }
|
|
5
3
|
log(...args) { }
|
|
6
4
|
info(...args) { }
|
|
@@ -8,5 +6,4 @@ class TestLogger {
|
|
|
8
6
|
error(...args) { }
|
|
9
7
|
addSubscriber(...args) { }
|
|
10
8
|
}
|
|
11
|
-
exports.default = TestLogger;
|
|
12
9
|
//# sourceMappingURL=TestLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestLogger.js","sourceRoot":"","sources":["../../src/lib/TestLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TestLogger.js","sourceRoot":"","sources":["../../src/lib/TestLogger.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,UAAU;IAC3B,KAAK,CAAC,GAAG,IAAS,IAAI,CAAC;IACvB,GAAG,CAAC,GAAG,IAAS,IAAI,CAAC;IACrB,IAAI,CAAC,GAAG,IAAS,IAAI,CAAC;IACtB,IAAI,CAAC,GAAG,IAAS,IAAI,CAAC;IACtB,KAAK,CAAC,GAAG,IAAS,IAAI,CAAC;IACvB,aAAa,CAAC,GAAG,IAAS,IAAI,CAAC;CAClC"}
|
package/build/lib/Timer.d.ts
CHANGED
package/build/lib/Timer.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
export class Timer {
|
|
2
|
+
static startTime = new Date();
|
|
3
|
+
static key = `${Timer.startTime}`;
|
|
4
|
+
static START_TIME = process.hrtime();
|
|
5
5
|
static setKey(newKey) {
|
|
6
6
|
Timer.key = newKey;
|
|
7
7
|
}
|
|
@@ -10,8 +10,4 @@ class Timer {
|
|
|
10
10
|
return s + ns / 1000000000;
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
exports.Timer = Timer;
|
|
14
|
-
Timer.startTime = new Date();
|
|
15
|
-
Timer.key = `${Timer.startTime}`;
|
|
16
|
-
Timer.START_TIME = process.hrtime();
|
|
17
13
|
//# sourceMappingURL=Timer.js.map
|
package/build/lib/Timer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../src/lib/Timer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Timer.js","sourceRoot":"","sources":["../../src/lib/Timer.ts"],"names":[],"mappings":"AACA,MAAM,OAAO,KAAK;IAChB,MAAM,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC9B,MAAM,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACrC,MAAM,CAAC,MAAM,CAAC,MAAc;QAC1B,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC;IACrB,CAAC;IAED,KAAK;QACH,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;IAC7B,CAAC"}
|
package/build/lib/contexts.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TTag, WorkspaceBuilder } from './defs';
|
|
1
|
+
import { TTag, WorkspaceBuilder } from './defs.js';
|
|
2
2
|
export declare class Context {
|
|
3
3
|
values: {
|
|
4
4
|
[name: string]: any;
|
|
@@ -40,4 +40,3 @@ export declare class WorkspaceContext extends Context {
|
|
|
40
40
|
addBuilder(what: WorkspaceBuilder): void;
|
|
41
41
|
getBuilder(): WorkspaceBuilder;
|
|
42
42
|
}
|
|
43
|
-
//# sourceMappingURL=contexts.d.ts.map
|
package/build/lib/contexts.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
class Context {
|
|
1
|
+
export class Context {
|
|
2
|
+
values;
|
|
3
|
+
context;
|
|
5
4
|
constructor(context, initial) {
|
|
6
5
|
this.context = context;
|
|
7
6
|
this.values = initial || {};
|
|
@@ -23,8 +22,7 @@ class Context {
|
|
|
23
22
|
delete this.values[name];
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
|
-
|
|
27
|
-
class DomainContext extends Context {
|
|
25
|
+
export class DomainContext extends Context {
|
|
28
26
|
constructor(context, initial) {
|
|
29
27
|
super(`domain ${context}`, initial);
|
|
30
28
|
}
|
|
@@ -39,25 +37,23 @@ class DomainContext extends Context {
|
|
|
39
37
|
return this.values._id;
|
|
40
38
|
}
|
|
41
39
|
}
|
|
42
|
-
|
|
43
|
-
class WorldContext extends Context {
|
|
40
|
+
export class WorldContext extends Context {
|
|
44
41
|
constructor(tag, initial) {
|
|
45
42
|
super(`world ${tag}`, initial);
|
|
46
|
-
this.getCurrent = (type) => this.values[WorldContext.currentKey(type)];
|
|
47
43
|
}
|
|
44
|
+
static currentKey = (domain) => `_current_${domain}`;
|
|
45
|
+
getCurrent = (type) => this.values[WorldContext.currentKey(type)];
|
|
48
46
|
setDomainValues(domain, value) {
|
|
49
47
|
if (typeof value !== 'string')
|
|
50
48
|
throw Error(`not a string ${value}`);
|
|
51
49
|
this.values[WorldContext.currentKey(domain)] = value;
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
|
-
|
|
55
|
-
WorldContext.currentKey = (domain) => `_current_${domain}`;
|
|
56
|
-
class WorkspaceContext extends Context {
|
|
52
|
+
export class WorkspaceContext extends Context {
|
|
57
53
|
constructor(context, initial) {
|
|
58
54
|
super(`workspace ${context}`, initial);
|
|
59
|
-
this.builder = undefined;
|
|
60
55
|
}
|
|
56
|
+
builder = undefined;
|
|
61
57
|
createPath(path) {
|
|
62
58
|
this.values[path] = new WorkspaceContext(`path ${path}`);
|
|
63
59
|
return this.values[path];
|
|
@@ -72,5 +68,4 @@ class WorkspaceContext extends Context {
|
|
|
72
68
|
return this.builder;
|
|
73
69
|
}
|
|
74
70
|
}
|
|
75
|
-
exports.WorkspaceContext = WorkspaceContext;
|
|
76
71
|
//# sourceMappingURL=contexts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../src/lib/contexts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../src/lib/contexts.ts"],"names":[],"mappings":"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"}
|