@decaf-ts/logging 0.3.7 → 0.3.9
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/dist/logging.cjs +651 -104
- package/dist/logging.esm.cjs +630 -101
- package/lib/constants.cjs +24 -6
- package/lib/constants.d.ts +7 -0
- package/lib/decorators.cjs +47 -24
- package/lib/decorators.d.ts +24 -6
- package/lib/environment.cjs +204 -0
- package/lib/environment.d.ts +86 -0
- package/lib/esm/constants.d.ts +7 -0
- package/lib/esm/constants.js +23 -5
- package/lib/esm/decorators.d.ts +24 -6
- package/lib/esm/decorators.js +46 -24
- package/lib/esm/environment.d.ts +86 -0
- package/lib/esm/environment.js +200 -0
- package/lib/esm/filters/LogFilter.d.ts +6 -0
- package/lib/esm/filters/LogFilter.js +7 -0
- package/lib/esm/filters/PatternFilter.d.ts +10 -0
- package/lib/esm/filters/PatternFilter.js +43 -0
- package/lib/esm/filters/index.d.ts +2 -0
- package/lib/esm/filters/index.js +3 -0
- package/lib/esm/index.d.ts +5 -1
- package/lib/esm/index.js +6 -2
- package/lib/esm/logging.d.ts +11 -11
- package/lib/esm/logging.js +62 -32
- package/lib/esm/text.d.ts +156 -0
- package/lib/esm/text.js +214 -0
- package/lib/esm/types.d.ts +32 -4
- package/lib/esm/types.js +1 -1
- package/lib/esm/web.d.ts +8 -0
- package/lib/esm/web.js +12 -0
- package/lib/esm/winston/winston.d.ts +2 -2
- package/lib/esm/winston/winston.js +4 -4
- package/lib/filters/LogFilter.cjs +11 -0
- package/lib/filters/LogFilter.d.ts +6 -0
- package/lib/filters/PatternFilter.cjs +47 -0
- package/lib/filters/PatternFilter.d.ts +10 -0
- package/lib/filters/index.cjs +19 -0
- package/lib/filters/index.d.ts +2 -0
- package/lib/index.cjs +6 -2
- package/lib/index.d.ts +5 -1
- package/lib/logging.cjs +61 -31
- package/lib/logging.d.ts +11 -11
- package/lib/text.cjs +227 -0
- package/lib/text.d.ts +156 -0
- package/lib/types.cjs +1 -1
- package/lib/types.d.ts +32 -4
- package/lib/web.cjs +15 -0
- package/lib/web.d.ts +8 -0
- package/lib/winston/winston.cjs +4 -4
- package/lib/winston/winston.d.ts +2 -2
- package/package.json +12 -3
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
import { ObjectAccumulator } from "typed-object-accumulator";
|
|
2
|
+
import { toENVFormat } from "./text.js";
|
|
3
|
+
import { isBrowser } from "./web.js";
|
|
4
|
+
import { BrowserEnvKey, DefaultLoggingConfig, ENV_PATH_DELIMITER, } from "./constants.js";
|
|
5
|
+
/**
|
|
6
|
+
* @class Environment
|
|
7
|
+
* @extends {ObjectAccumulator<T>}
|
|
8
|
+
* @template T
|
|
9
|
+
* @description A class representing an environment with accumulation capabilities.
|
|
10
|
+
* @summary Manages environment-related data and provides methods for accumulation and key retrieval.
|
|
11
|
+
* @param {T} [initialData] - The initial data to populate the environment with.
|
|
12
|
+
*/
|
|
13
|
+
export class Environment extends ObjectAccumulator {
|
|
14
|
+
/**
|
|
15
|
+
* @static
|
|
16
|
+
* @protected
|
|
17
|
+
* @description A factory function for creating Environment instances.
|
|
18
|
+
* @summary Defines how new instances of the Environment class should be created.
|
|
19
|
+
* @return {Environment<any>} A new instance of the Environment class.
|
|
20
|
+
*/
|
|
21
|
+
static { this.factory = () => new Environment(); }
|
|
22
|
+
constructor() {
|
|
23
|
+
super();
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* @description Retrieves a value from the environment
|
|
27
|
+
* @summary Gets a value from the environment variables, handling browser and Node.js environments differently
|
|
28
|
+
* @param {string} k - The key to retrieve from the environment
|
|
29
|
+
* @return {unknown} The value from the environment, or undefined if not found
|
|
30
|
+
*/
|
|
31
|
+
fromEnv(k) {
|
|
32
|
+
let env;
|
|
33
|
+
if (isBrowser()) {
|
|
34
|
+
env = globalThis[BrowserEnvKey];
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
env = globalThis.process.env;
|
|
38
|
+
k = toENVFormat(k);
|
|
39
|
+
}
|
|
40
|
+
return env[k];
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* @description Expands an object into the environment
|
|
44
|
+
* @summary Defines properties on the environment object that can be accessed as getters and setters
|
|
45
|
+
* @template V - Type of the object being expanded
|
|
46
|
+
* @param {V} value - The object to expand into the environment
|
|
47
|
+
* @return {void}
|
|
48
|
+
*/
|
|
49
|
+
expand(value) {
|
|
50
|
+
Object.entries(value).forEach(([k, v]) => {
|
|
51
|
+
Object.defineProperty(this, k, {
|
|
52
|
+
get: () => {
|
|
53
|
+
const fromEnv = this.fromEnv(k);
|
|
54
|
+
if (typeof fromEnv !== "undefined")
|
|
55
|
+
return fromEnv;
|
|
56
|
+
if (v && typeof v === "object") {
|
|
57
|
+
return Environment.buildEnvProxy(v, [k]);
|
|
58
|
+
}
|
|
59
|
+
// If the model provides an empty string, expose a proxy that composes ENV keys
|
|
60
|
+
if (v === "") {
|
|
61
|
+
return Environment.buildEnvProxy(undefined, [k]);
|
|
62
|
+
}
|
|
63
|
+
return v;
|
|
64
|
+
},
|
|
65
|
+
set: (val) => {
|
|
66
|
+
v = val;
|
|
67
|
+
},
|
|
68
|
+
configurable: true,
|
|
69
|
+
enumerable: true,
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* @protected
|
|
75
|
+
* @static
|
|
76
|
+
* @description Retrieves or creates the singleton instance of the Environment class.
|
|
77
|
+
* @summary Ensures only one instance of the Environment class exists.
|
|
78
|
+
* @template E
|
|
79
|
+
* @param {...unknown[]} args - Arguments to pass to the factory function if a new instance is created.
|
|
80
|
+
* @return {E} The singleton instance of the Environment class.
|
|
81
|
+
*/
|
|
82
|
+
static instance(...args) {
|
|
83
|
+
if (!Environment._instance) {
|
|
84
|
+
const base = Environment.factory(...args);
|
|
85
|
+
const proxied = new Proxy(base, {
|
|
86
|
+
get(target, prop, receiver) {
|
|
87
|
+
const value = Reflect.get(target, prop, receiver);
|
|
88
|
+
if (typeof value !== "undefined")
|
|
89
|
+
return value;
|
|
90
|
+
if (typeof prop === "string") {
|
|
91
|
+
// Avoid interfering with logging config lookups for optional fields like 'app'
|
|
92
|
+
if (prop === "app")
|
|
93
|
+
return undefined;
|
|
94
|
+
return Environment.buildEnvProxy(undefined, [prop]);
|
|
95
|
+
}
|
|
96
|
+
return value;
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
Environment._instance = proxied;
|
|
100
|
+
}
|
|
101
|
+
return Environment._instance;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* @static
|
|
105
|
+
* @description Accumulates the given value into the environment.
|
|
106
|
+
* @summary Adds new properties to the environment from the provided object.
|
|
107
|
+
* @template V
|
|
108
|
+
* @param {V} value - The object to accumulate into the environment.
|
|
109
|
+
* @return {V} The updated environment instance.
|
|
110
|
+
*/
|
|
111
|
+
static accumulate(value) {
|
|
112
|
+
const instance = Environment.instance();
|
|
113
|
+
Object.keys(instance).forEach((key) => {
|
|
114
|
+
const desc = Object.getOwnPropertyDescriptor(instance, key);
|
|
115
|
+
if (desc && desc.configurable && desc.enumerable) {
|
|
116
|
+
Object.defineProperty(instance, key, {
|
|
117
|
+
...desc,
|
|
118
|
+
enumerable: false,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
return instance.accumulate(value);
|
|
123
|
+
}
|
|
124
|
+
static get(key) {
|
|
125
|
+
return Environment._instance.get(key);
|
|
126
|
+
}
|
|
127
|
+
static buildEnvProxy(current, path) {
|
|
128
|
+
const buildKey = (p) => p.map((seg) => toENVFormat(seg)).join(ENV_PATH_DELIMITER);
|
|
129
|
+
// Helper to read from the active environment given a composed key
|
|
130
|
+
const readEnv = (key) => {
|
|
131
|
+
if (isBrowser()) {
|
|
132
|
+
const env = globalThis[BrowserEnvKey];
|
|
133
|
+
return env ? env[key] : undefined;
|
|
134
|
+
}
|
|
135
|
+
return globalThis?.process?.env?.[key];
|
|
136
|
+
};
|
|
137
|
+
const handler = {
|
|
138
|
+
get(_target, prop) {
|
|
139
|
+
if (prop === Symbol.toPrimitive) {
|
|
140
|
+
return () => buildKey(path);
|
|
141
|
+
}
|
|
142
|
+
if (prop === "toString") {
|
|
143
|
+
return () => buildKey(path);
|
|
144
|
+
}
|
|
145
|
+
if (prop === "valueOf") {
|
|
146
|
+
return () => buildKey(path);
|
|
147
|
+
}
|
|
148
|
+
if (typeof prop === "symbol")
|
|
149
|
+
return undefined;
|
|
150
|
+
const nextModel = current && Object.prototype.hasOwnProperty.call(current, prop)
|
|
151
|
+
? current[prop]
|
|
152
|
+
: undefined;
|
|
153
|
+
const nextPath = [...path, prop];
|
|
154
|
+
const composedKey = buildKey(nextPath);
|
|
155
|
+
// If an ENV value exists for this path, return it directly
|
|
156
|
+
const envValue = readEnv(composedKey);
|
|
157
|
+
if (typeof envValue !== "undefined")
|
|
158
|
+
return envValue;
|
|
159
|
+
// Otherwise, if the model has an object at this path, keep drilling with a proxy
|
|
160
|
+
const isNextObject = nextModel && typeof nextModel === "object";
|
|
161
|
+
if (isNextObject)
|
|
162
|
+
return Environment.buildEnvProxy(nextModel, nextPath);
|
|
163
|
+
// Always return a proxy for further path composition when no ENV value;
|
|
164
|
+
// do not surface primitive model defaults here (this API is for key composition).
|
|
165
|
+
return Environment.buildEnvProxy(undefined, nextPath);
|
|
166
|
+
},
|
|
167
|
+
ownKeys() {
|
|
168
|
+
return current ? Reflect.ownKeys(current) : [];
|
|
169
|
+
},
|
|
170
|
+
getOwnPropertyDescriptor(_t, p) {
|
|
171
|
+
if (!current)
|
|
172
|
+
return undefined;
|
|
173
|
+
if (Object.prototype.hasOwnProperty.call(current, p)) {
|
|
174
|
+
return { enumerable: true, configurable: true };
|
|
175
|
+
}
|
|
176
|
+
return undefined;
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
const target = {};
|
|
180
|
+
return new Proxy(target, handler);
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* @static
|
|
184
|
+
* @description Retrieves the keys of the environment, optionally converting them to ENV format.
|
|
185
|
+
* @summary Gets all keys in the environment, with an option to format them for environment variables.
|
|
186
|
+
* @param {boolean} [toEnv=true] - Whether to convert the keys to ENV format.
|
|
187
|
+
* @return {string[]} An array of keys from the environment.
|
|
188
|
+
*/
|
|
189
|
+
static keys(toEnv = true) {
|
|
190
|
+
return Environment.instance()
|
|
191
|
+
.keys()
|
|
192
|
+
.map((k) => (toEnv ? toENVFormat(k) : k));
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
export const LoggedEnvironment = Environment.accumulate(Object.assign({}, DefaultLoggingConfig, {
|
|
196
|
+
env: (isBrowser() && globalThis[BrowserEnvKey]
|
|
197
|
+
? globalThis[BrowserEnvKey]["NODE_ENV"]
|
|
198
|
+
: globalThis.process.env["NODE_ENV"]) || "development",
|
|
199
|
+
}));
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/environment.ts"],"names":[],"mappings":"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","sourcesContent":["import { ObjectAccumulator } from \"typed-object-accumulator\";\nimport { toENVFormat } from \"./text\";\nimport { isBrowser } from \"./web\";\nimport {\n  BrowserEnvKey,\n  DefaultLoggingConfig,\n  ENV_PATH_DELIMITER,\n} from \"./constants\";\n\n/**\n * @description Factory type for creating Environment instances.\n * @summary Defines a function type that creates and returns Environment instances.\n *\n * @template T - The type of object the Environment will accumulate.\n * @template E - The specific Environment type to be created, extending Environment<T>.\n * @typedef {function(...unknown[]): E} EnvironmentFactory\n * @memberOf module:Logging\n */\nexport type EnvironmentFactory<T extends object, E extends Environment<T>> = (\n  ...args: unknown[]\n) => E;\n\n/**\n * @class Environment\n * @extends {ObjectAccumulator<T>}\n * @template T\n * @description A class representing an environment with accumulation capabilities.\n * @summary Manages environment-related data and provides methods for accumulation and key retrieval.\n * @param {T} [initialData] - The initial data to populate the environment with.\n */\nexport class Environment<T extends object> extends ObjectAccumulator<T> {\n  /**\n   * @static\n   * @protected\n   * @description A factory function for creating Environment instances.\n   * @summary Defines how new instances of the Environment class should be created.\n   * @return {Environment<any>} A new instance of the Environment class.\n   */\n  protected static factory: EnvironmentFactory<any, any> =\n    (): Environment<any> => new Environment();\n\n  /**\n   * @static\n   * @private\n   * @description The singleton instance of the Environment class.\n   * @type {Environment<any>}\n   */\n  private static _instance: Environment<any>;\n\n  protected constructor() {\n    super();\n  }\n\n  /**\n   * @description Retrieves a value from the environment\n   * @summary Gets a value from the environment variables, handling browser and Node.js environments differently\n   * @param {string} k - The key to retrieve from the environment\n   * @return {unknown} The value from the environment, or undefined if not found\n   */\n  protected fromEnv(k: string) {\n    let env: Record<string, unknown>;\n    if (isBrowser()) {\n      env = (\n        globalThis as typeof globalThis & {\n          [BrowserEnvKey]: Record<string, any>;\n        }\n      )[BrowserEnvKey];\n    } else {\n      env = globalThis.process.env;\n      k = toENVFormat(k);\n    }\n    return env[k];\n  }\n\n  /**\n   * @description Expands an object into the environment\n   * @summary Defines properties on the environment object that can be accessed as getters and setters\n   * @template V - Type of the object being expanded\n   * @param {V} value - The object to expand into the environment\n   * @return {void}\n   */\n  protected override expand<V extends object>(value: V): void {\n    Object.entries(value).forEach(([k, v]) => {\n      Object.defineProperty(this, k, {\n        get: () => {\n          const fromEnv = this.fromEnv(k);\n          if (typeof fromEnv !== \"undefined\") return fromEnv;\n          if (v && typeof v === \"object\") {\n            return Environment.buildEnvProxy(v as any, [k]);\n          }\n          // If the model provides an empty string, expose a proxy that composes ENV keys\n          if (v === \"\") {\n            return Environment.buildEnvProxy(undefined, [k]);\n          }\n          return v;\n        },\n        set: (val: V[keyof V]) => {\n          v = val;\n        },\n        configurable: true,\n        enumerable: true,\n      });\n    });\n  }\n\n  /**\n   * @protected\n   * @static\n   * @description Retrieves or creates the singleton instance of the Environment class.\n   * @summary Ensures only one instance of the Environment class exists.\n   * @template E\n   * @param {...unknown[]} args - Arguments to pass to the factory function if a new instance is created.\n   * @return {E} The singleton instance of the Environment class.\n   */\n  protected static instance<E extends Environment<any>>(...args: unknown[]): E {\n    if (!Environment._instance) {\n      const base = Environment.factory(...args) as E;\n      const proxied = new Proxy(base as any, {\n        get(target, prop, receiver) {\n          const value = Reflect.get(target, prop, receiver);\n          if (typeof value !== \"undefined\") return value;\n          if (typeof prop === \"string\") {\n            // Avoid interfering with logging config lookups for optional fields like 'app'\n            if (prop === \"app\") return undefined;\n            return Environment.buildEnvProxy(undefined, [prop]);\n          }\n          return value;\n        },\n      });\n      Environment._instance = proxied as any;\n    }\n    return Environment._instance as E;\n  }\n\n  /**\n   * @static\n   * @description Accumulates the given value into the environment.\n   * @summary Adds new properties to the environment from the provided object.\n   * @template V\n   * @param {V} value - The object to accumulate into the environment.\n   * @return {V} The updated environment instance.\n   */\n  static accumulate<V extends object>(\n    value: V\n  ): typeof Environment._instance &\n    V &\n    ObjectAccumulator<typeof Environment._instance & V> {\n    const instance = Environment.instance();\n    Object.keys(instance as any).forEach((key) => {\n      const desc = Object.getOwnPropertyDescriptor(instance as any, key);\n      if (desc && desc.configurable && desc.enumerable) {\n        Object.defineProperty(instance as any, key, {\n          ...desc,\n          enumerable: false,\n        });\n      }\n    });\n    return instance.accumulate(value);\n  }\n\n  static get(key: string) {\n    return Environment._instance.get(key);\n  }\n\n  private static buildEnvProxy(current: any, path: string[]): any {\n    const buildKey = (p: string[]) =>\n      p.map((seg) => toENVFormat(seg)).join(ENV_PATH_DELIMITER);\n\n    // Helper to read from the active environment given a composed key\n    const readEnv = (key: string): unknown => {\n      if (isBrowser()) {\n        const env = (\n          globalThis as typeof globalThis & {\n            [BrowserEnvKey]?: Record<string, unknown>;\n          }\n        )[BrowserEnvKey];\n        return env ? env[key] : undefined;\n      }\n      return (globalThis as any)?.process?.env?.[key];\n    };\n\n    const handler: ProxyHandler<any> = {\n      get(_target, prop: string | symbol) {\n        if (prop === Symbol.toPrimitive) {\n          return () => buildKey(path);\n        }\n        if (prop === \"toString\") {\n          return () => buildKey(path);\n        }\n        if (prop === \"valueOf\") {\n          return () => buildKey(path);\n        }\n        if (typeof prop === \"symbol\") return undefined;\n\n        const nextModel =\n          current && Object.prototype.hasOwnProperty.call(current, prop)\n            ? (current as any)[prop]\n            : undefined;\n        const nextPath = [...path, prop];\n        const composedKey = buildKey(nextPath);\n\n        // If an ENV value exists for this path, return it directly\n        const envValue = readEnv(composedKey);\n        if (typeof envValue !== \"undefined\") return envValue;\n\n        // Otherwise, if the model has an object at this path, keep drilling with a proxy\n        const isNextObject = nextModel && typeof nextModel === \"object\";\n        if (isNextObject) return Environment.buildEnvProxy(nextModel, nextPath);\n\n        // Always return a proxy for further path composition when no ENV value;\n        // do not surface primitive model defaults here (this API is for key composition).\n        return Environment.buildEnvProxy(undefined, nextPath);\n      },\n      ownKeys() {\n        return current ? Reflect.ownKeys(current) : [];\n      },\n      getOwnPropertyDescriptor(_t, p) {\n        if (!current) return undefined as any;\n        if (Object.prototype.hasOwnProperty.call(current, p)) {\n          return { enumerable: true, configurable: true } as PropertyDescriptor;\n        }\n        return undefined as any;\n      },\n    };\n\n    const target = {} as any;\n    return new Proxy(target, handler);\n  }\n\n  /**\n   * @static\n   * @description Retrieves the keys of the environment, optionally converting them to ENV format.\n   * @summary Gets all keys in the environment, with an option to format them for environment variables.\n   * @param {boolean} [toEnv=true] - Whether to convert the keys to ENV format.\n   * @return {string[]} An array of keys from the environment.\n   */\n  static keys(toEnv: boolean = true): string[] {\n    return Environment.instance()\n      .keys()\n      .map((k) => (toEnv ? toENVFormat(k) : k));\n  }\n}\n\nexport const LoggedEnvironment = Environment.accumulate(\n  Object.assign({}, DefaultLoggingConfig, {\n    env:\n      (isBrowser() && (globalThis as any)[BrowserEnvKey]\n        ? (globalThis as any)[BrowserEnvKey][\"NODE_ENV\"]\n        : (globalThis as any).process.env[\"NODE_ENV\"]) || \"development\",\n  })\n);\n"]}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Logger, LoggingConfig, LoggingFilter } from "../types";
|
|
2
|
+
import { LoggedClass } from "../LoggedClass";
|
|
3
|
+
export declare abstract class LogFilter extends LoggedClass implements LoggingFilter {
|
|
4
|
+
get log(): Logger;
|
|
5
|
+
abstract filter(config: LoggingConfig, message: string, context: string[]): string;
|
|
6
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { LoggedClass } from "./../LoggedClass.js";
|
|
2
|
+
export class LogFilter extends LoggedClass {
|
|
3
|
+
get log() {
|
|
4
|
+
return super.log.for(this, { filters: [] });
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nRmlsdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2ZpbHRlcnMvTG9nRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsNEJBQXVCO0FBRTdDLE1BQU0sT0FBZ0IsU0FBVSxTQUFRLFdBQVc7SUFDakQsSUFBYSxHQUFHO1FBQ2QsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFXLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNyRCxDQUFDO0NBT0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBMb2dnZXIsIExvZ2dpbmdDb25maWcsIExvZ2dpbmdGaWx0ZXIgfSBmcm9tIFwiLi4vdHlwZXNcIjtcbmltcG9ydCB7IExvZ2dlZENsYXNzIH0gZnJvbSBcIi4uL0xvZ2dlZENsYXNzXCI7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBMb2dGaWx0ZXIgZXh0ZW5kcyBMb2dnZWRDbGFzcyBpbXBsZW1lbnRzIExvZ2dpbmdGaWx0ZXIge1xuICBvdmVycmlkZSBnZXQgbG9nKCk6IExvZ2dlciB7XG4gICAgcmV0dXJuIHN1cGVyLmxvZy5mb3IodGhpcyBhcyBhbnksIHsgZmlsdGVyczogW10gfSk7XG4gIH1cblxuICBhYnN0cmFjdCBmaWx0ZXIoXG4gICAgY29uZmlnOiBMb2dnaW5nQ29uZmlnLFxuICAgIG1lc3NhZ2U6IHN0cmluZyxcbiAgICBjb250ZXh0OiBzdHJpbmdbXVxuICApOiBzdHJpbmc7XG59XG4iXX0=
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { LogFilter } from "./LogFilter";
|
|
2
|
+
import { LoggingConfig } from "../types";
|
|
3
|
+
export type ReplacementFunction = (substring: string, ...args: any[]) => string;
|
|
4
|
+
export declare class PatternFilter extends LogFilter {
|
|
5
|
+
protected readonly regexp: RegExp;
|
|
6
|
+
protected readonly replacement: string | ReplacementFunction;
|
|
7
|
+
constructor(regexp: RegExp, replacement: string | ReplacementFunction);
|
|
8
|
+
protected match(message: string): RegExpExecArray | null;
|
|
9
|
+
filter(config: LoggingConfig, message: string, context: string[]): string;
|
|
10
|
+
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { LogFilter } from "./LogFilter.js";
|
|
11
|
+
import { final } from "./../decorators.js";
|
|
12
|
+
export class PatternFilter extends LogFilter {
|
|
13
|
+
constructor(regexp, replacement) {
|
|
14
|
+
super();
|
|
15
|
+
this.regexp = regexp;
|
|
16
|
+
this.replacement = replacement;
|
|
17
|
+
}
|
|
18
|
+
match(message) {
|
|
19
|
+
const match = this.regexp.exec(message);
|
|
20
|
+
this.regexp.lastIndex = 0;
|
|
21
|
+
return match;
|
|
22
|
+
}
|
|
23
|
+
filter(config, message, context) {
|
|
24
|
+
const log = this.log.for(this.filter);
|
|
25
|
+
const match = this.match(message);
|
|
26
|
+
if (!match)
|
|
27
|
+
return message;
|
|
28
|
+
try {
|
|
29
|
+
return message.replace(this.regexp, this.replacement);
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
log.error(`PatternFilter replacement error: ${e}`);
|
|
33
|
+
}
|
|
34
|
+
return "";
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
__decorate([
|
|
38
|
+
final(),
|
|
39
|
+
__metadata("design:type", Function),
|
|
40
|
+
__metadata("design:paramtypes", [String]),
|
|
41
|
+
__metadata("design:returntype", void 0)
|
|
42
|
+
], PatternFilter.prototype, "match", null);
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF0dGVybkZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9maWx0ZXJzL1BhdHRlcm5GaWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSx1QkFBb0I7QUFFeEMsT0FBTyxFQUFFLEtBQUssRUFBRSwyQkFBc0I7QUFJdEMsTUFBTSxPQUFPLGFBQWMsU0FBUSxTQUFTO0lBQzFDLFlBQ3FCLE1BQWMsRUFDZCxXQUF5QztRQUU1RCxLQUFLLEVBQUUsQ0FBQztRQUhXLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCxnQkFBVyxHQUFYLFdBQVcsQ0FBOEI7SUFHOUQsQ0FBQztJQUdTLEtBQUssQ0FBQyxPQUFlO1FBQzdCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQztRQUMxQixPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxNQUFNLENBQUMsTUFBcUIsRUFBRSxPQUFlLEVBQUUsT0FBaUI7UUFDOUQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3RDLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLEtBQUs7WUFBRSxPQUFPLE9BQU8sQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsV0FBa0IsQ0FBQyxDQUFDO1FBQy9ELENBQUM7UUFBQyxPQUFPLENBQVUsRUFBRSxDQUFDO1lBQ3BCLEdBQUcsQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDckQsQ0FBQztRQUNELE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztDQUNGO0FBakJXO0lBRFQsS0FBSyxFQUFFOzs7OzBDQUtQIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTG9nRmlsdGVyIH0gZnJvbSBcIi4vTG9nRmlsdGVyXCI7XG5pbXBvcnQgeyBMb2dnaW5nQ29uZmlnIH0gZnJvbSBcIi4uL3R5cGVzXCI7XG5pbXBvcnQgeyBmaW5hbCB9IGZyb20gXCIuLi9kZWNvcmF0b3JzXCI7XG5cbmV4cG9ydCB0eXBlIFJlcGxhY2VtZW50RnVuY3Rpb24gPSAoc3Vic3RyaW5nOiBzdHJpbmcsIC4uLmFyZ3M6IGFueVtdKSA9PiBzdHJpbmc7XG5cbmV4cG9ydCBjbGFzcyBQYXR0ZXJuRmlsdGVyIGV4dGVuZHMgTG9nRmlsdGVyIHtcbiAgY29uc3RydWN0b3IoXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IHJlZ2V4cDogUmVnRXhwLFxuICAgIHByb3RlY3RlZCByZWFkb25seSByZXBsYWNlbWVudDogc3RyaW5nIHwgUmVwbGFjZW1lbnRGdW5jdGlvblxuICApIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgQGZpbmFsKClcbiAgcHJvdGVjdGVkIG1hdGNoKG1lc3NhZ2U6IHN0cmluZykge1xuICAgIGNvbnN0IG1hdGNoID0gdGhpcy5yZWdleHAuZXhlYyhtZXNzYWdlKTtcbiAgICB0aGlzLnJlZ2V4cC5sYXN0SW5kZXggPSAwO1xuICAgIHJldHVybiBtYXRjaDtcbiAgfVxuXG4gIGZpbHRlcihjb25maWc6IExvZ2dpbmdDb25maWcsIG1lc3NhZ2U6IHN0cmluZywgY29udGV4dDogc3RyaW5nW10pOiBzdHJpbmcge1xuICAgIGNvbnN0IGxvZyA9IHRoaXMubG9nLmZvcih0aGlzLmZpbHRlcik7XG4gICAgY29uc3QgbWF0Y2ggPSB0aGlzLm1hdGNoKG1lc3NhZ2UpO1xuICAgIGlmICghbWF0Y2gpIHJldHVybiBtZXNzYWdlO1xuICAgIHRyeSB7XG4gICAgICByZXR1cm4gbWVzc2FnZS5yZXBsYWNlKHRoaXMucmVnZXhwLCB0aGlzLnJlcGxhY2VtZW50IGFzIGFueSk7XG4gICAgfSBjYXRjaCAoZTogdW5rbm93bikge1xuICAgICAgbG9nLmVycm9yKGBQYXR0ZXJuRmlsdGVyIHJlcGxhY2VtZW50IGVycm9yOiAke2V9YCk7XG4gICAgfVxuICAgIHJldHVybiBcIlwiO1xuICB9XG59XG4iXX0=
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export * from "./LogFilter.js";
|
|
2
|
+
export * from "./PatternFilter.js";
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZmlsdGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwrQkFBNEI7QUFDNUIsbUNBQWdDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vTG9nRmlsdGVyXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9QYXR0ZXJuRmlsdGVyXCI7XG4iXX0=
|
package/lib/esm/index.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
export * from "./filters";
|
|
1
2
|
export * from "./constants";
|
|
2
3
|
export * from "./decorators";
|
|
4
|
+
export * from "./environment";
|
|
3
5
|
export * from "./LoggedClass";
|
|
4
6
|
export * from "./logging";
|
|
7
|
+
export * from "./text";
|
|
5
8
|
export * from "./types";
|
|
9
|
+
export * from "./web";
|
|
6
10
|
/**
|
|
7
11
|
* @description A logging module for TypeScript applications
|
|
8
12
|
* @summary Provides a comprehensive, flexible logging solution. This module exposes:
|
|
@@ -19,4 +23,4 @@ export * from "./types";
|
|
|
19
23
|
* @const VERSION
|
|
20
24
|
* @memberOf module:Logging
|
|
21
25
|
*/
|
|
22
|
-
export declare const VERSION = "0.3.
|
|
26
|
+
export declare const VERSION = "0.3.9";
|
package/lib/esm/index.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
export * from "./filters/index.js";
|
|
1
2
|
export * from "./constants.js";
|
|
2
3
|
export * from "./decorators.js";
|
|
4
|
+
export * from "./environment.js";
|
|
3
5
|
export * from "./LoggedClass.js";
|
|
4
6
|
export * from "./logging.js";
|
|
7
|
+
export * from "./text.js";
|
|
5
8
|
export * from "./types.js";
|
|
9
|
+
export * from "./web.js";
|
|
6
10
|
/**
|
|
7
11
|
* @description A logging module for TypeScript applications
|
|
8
12
|
* @summary Provides a comprehensive, flexible logging solution. This module exposes:
|
|
@@ -19,5 +23,5 @@ export * from "./types.js";
|
|
|
19
23
|
* @const VERSION
|
|
20
24
|
* @memberOf module:Logging
|
|
21
25
|
*/
|
|
22
|
-
export const VERSION = "0.3.
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
export const VERSION = "0.3.9";
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUNBQTBCO0FBQzFCLCtCQUE0QjtBQUM1QixnQ0FBNkI7QUFDN0IsaUNBQThCO0FBQzlCLGlDQUE4QjtBQUM5Qiw2QkFBMEI7QUFDMUIsMEJBQXVCO0FBQ3ZCLDJCQUF3QjtBQUN4Qix5QkFBc0I7QUFFdEI7Ozs7Ozs7OztHQVNHO0FBRUg7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vZmlsdGVyc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vY29uc3RhbnRzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9kZWNvcmF0b3JzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9lbnZpcm9ubWVudFwiO1xuZXhwb3J0ICogZnJvbSBcIi4vTG9nZ2VkQ2xhc3NcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2xvZ2dpbmdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3RleHRcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3R5cGVzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi93ZWJcIjtcblxuLyoqXG4gKiBAZGVzY3JpcHRpb24gQSBsb2dnaW5nIG1vZHVsZSBmb3IgVHlwZVNjcmlwdCBhcHBsaWNhdGlvbnNcbiAqIEBzdW1tYXJ5IFByb3ZpZGVzIGEgY29tcHJlaGVuc2l2ZSwgZmxleGlibGUgbG9nZ2luZyBzb2x1dGlvbi4gVGhpcyBtb2R1bGUgZXhwb3NlczpcbiAqIC0gQ29yZSBjbGFzc2VzIGxpa2Uge0BsaW5rIExvZ2dpbmd9IGFuZCB7QGxpbmsgTWluaUxvZ2dlcn1cbiAqIC0gRGVjb3JhdG9ycyBzdWNoIGFzIHtAbGluayBsb2d9IGZvciBpbnN0cnVtZW50aW5nIG1ldGhvZHNcbiAqIC0gQ29uZmlndXJhdGlvbiBhbmQgY29uc3RhbnRzIGxpa2Uge0BsaW5rIExvZ0xldmVsfSBhbmQge0BsaW5rIERlZmF1bHRMb2dnaW5nQ29uZmlnfVxuICogLSBUeXBlIGRlZmluaXRpb25zIGluY2x1ZGluZyB7QGxpbmsgTG9nZ2VyfSBhbmQge0BsaW5rIExvZ2dpbmdDb25maWd9XG4gKiBUaGVzZSBleHBvcnRzIGVuYWJsZSBjb25zaXN0ZW50LCBjb250ZXh0LWF3YXJlLCBhbmQgb3B0aW9uYWxseSB0aGVtZWQgbG9nZ2luZyBhY3Jvc3MgcHJvamVjdHMuXG4gKiBAbW9kdWxlIExvZ2dpbmdcbiAqL1xuXG4vKipcbiAqIEBkZXNjcmlwdGlvbiBDdXJyZW50IHBhY2thZ2UgdmVyc2lvbiBzdHJpbmdcbiAqIEBzdW1tYXJ5IFN0b3JlcyB0aGUgY3VycmVudCBwYWNrYWdlIHZlcnNpb24sIHVzZWQgZm9yIHZlcnNpb24gdHJhY2tpbmcgYW5kIGNvbXBhdGliaWxpdHkgY2hlY2tzXG4gKiBAY29uc3QgVkVSU0lPTlxuICogQG1lbWJlck9mIG1vZHVsZTpMb2dnaW5nXG4gKi9cbmV4cG9ydCBjb25zdCBWRVJTSU9OID0gXCIjI1ZFUlNJT04jI1wiO1xuIl19
|
package/lib/esm/logging.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { LoggerFactory, LoggingConfig, LoggingContext, StringLike, Theme, Logger } from "./types";
|
|
2
2
|
import { LogLevel } from "./constants";
|
|
3
|
+
import { LoggedEnvironment } from "./environment";
|
|
3
4
|
/**
|
|
4
5
|
* @description A minimal logger implementation.
|
|
5
6
|
* @summary MiniLogger is a lightweight logging class that implements the Logger interface.
|
|
@@ -31,25 +32,26 @@ export declare class MiniLogger implements Logger {
|
|
|
31
32
|
protected config(key: keyof LoggingConfig): LoggingConfig[keyof LoggingConfig];
|
|
32
33
|
for(method: string | ((...args: any[]) => any)): Logger;
|
|
33
34
|
for(config: Partial<LoggingConfig>): Logger;
|
|
35
|
+
for(method: string | ((...args: any[]) => any) | Partial<LoggingConfig>, config: Partial<LoggingConfig>, ...args: any[]): Logger;
|
|
34
36
|
/**
|
|
35
37
|
* @description Creates a formatted log string
|
|
36
38
|
* @summary Generates a log string with timestamp, colored log level, context, and message
|
|
37
39
|
* @param {LogLevel} level - The log level for this message
|
|
38
40
|
* @param {StringLike | Error} message - The message to log or an Error object
|
|
39
|
-
* @param {string} [
|
|
41
|
+
* @param {string} [error] - Optional error to extract stack trace to include in the log
|
|
40
42
|
* @return {string} A formatted log string with all components
|
|
41
43
|
*/
|
|
42
|
-
protected createLog(level: LogLevel, message: StringLike | Error,
|
|
44
|
+
protected createLog(level: LogLevel, message: StringLike | Error, error?: Error): string;
|
|
43
45
|
/**
|
|
44
46
|
* @description Logs a message with the specified log level
|
|
45
47
|
* @summary Checks if the message should be logged based on the current log level,
|
|
46
48
|
* then uses the appropriate console method to output the formatted log
|
|
47
49
|
* @param {LogLevel} level - The log level of the message
|
|
48
50
|
* @param {StringLike | Error} msg - The message to be logged or an Error object
|
|
49
|
-
* @param {string} [
|
|
51
|
+
* @param {string} [error] - Optional stack trace to include in the log
|
|
50
52
|
* @return {void}
|
|
51
53
|
*/
|
|
52
|
-
protected log(level: LogLevel, msg: StringLike | Error,
|
|
54
|
+
protected log(level: LogLevel, msg: StringLike | Error, error?: Error): void;
|
|
53
55
|
/**
|
|
54
56
|
* @description Logs a message at the silly level
|
|
55
57
|
* @summary Logs a message at the silly level if the current verbosity setting allows it
|
|
@@ -84,9 +86,10 @@ export declare class MiniLogger implements Logger {
|
|
|
84
86
|
* @description Logs a message at the error level
|
|
85
87
|
* @summary Logs a message at the error level for errors and exceptions
|
|
86
88
|
* @param {StringLike | Error} msg - The message to be logged or an Error object
|
|
89
|
+
* @param e
|
|
87
90
|
* @return {void}
|
|
88
91
|
*/
|
|
89
|
-
error(msg: StringLike | Error): void;
|
|
92
|
+
error(msg: StringLike | Error, e?: Error): void;
|
|
90
93
|
/**
|
|
91
94
|
* @description Updates the logger configuration
|
|
92
95
|
* @summary Merges the provided configuration with the existing configuration
|
|
@@ -171,10 +174,6 @@ export declare class Logging {
|
|
|
171
174
|
* @summary A function that creates new Logger instances. By default, it creates a MiniLogger.
|
|
172
175
|
*/
|
|
173
176
|
private static _factory;
|
|
174
|
-
/**
|
|
175
|
-
* @description Configuration for the logging system
|
|
176
|
-
* @summary Stores the global logging configuration including verbosity, log level, styling, and formatting settings
|
|
177
|
-
*/
|
|
178
177
|
private static _config;
|
|
179
178
|
private constructor();
|
|
180
179
|
/**
|
|
@@ -196,7 +195,7 @@ export declare class Logging {
|
|
|
196
195
|
* @summary Returns a copy of the current global logging configuration
|
|
197
196
|
* @return {LoggingConfig} A copy of the current configuration
|
|
198
197
|
*/
|
|
199
|
-
static getConfig():
|
|
198
|
+
static getConfig(): typeof LoggedEnvironment;
|
|
200
199
|
/**
|
|
201
200
|
* @description Retrieves or creates the global logger instance.
|
|
202
201
|
* @summary Returns the existing global logger or creates a new one if it doesn't exist.
|
|
@@ -238,8 +237,9 @@ export declare class Logging {
|
|
|
238
237
|
* @summary Delegates the error logging to the global logger instance.
|
|
239
238
|
*
|
|
240
239
|
* @param msg - The message to be logged.
|
|
240
|
+
* @param e
|
|
241
241
|
*/
|
|
242
|
-
static error(msg: StringLike): void;
|
|
242
|
+
static error(msg: StringLike, e?: Error): void;
|
|
243
243
|
/**
|
|
244
244
|
* @description Creates a logger for a specific object or context
|
|
245
245
|
* @summary Creates a new logger instance for the given object or context using the factory function
|