@trebired/logger 2.5.21 → 2.5.23
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/.trebired/logger/config.ts +1 -1
- package/CHANGELOG.md +5 -0
- package/dist/config/load.d.ts.map +1 -1
- package/dist/config/load.js +30 -10
- package/dist/config/load.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@ All notable changes to `@trebired/logger` will be documented here.
|
|
|
4
4
|
|
|
5
5
|
This project follows semantic versioning once published.
|
|
6
6
|
|
|
7
|
+
## 2.5.22
|
|
8
|
+
|
|
9
|
+
- Fixed `.trebired/logger/config.ts` loading from installed packages under `node_modules` so Node runtimes no longer hit native TypeScript type-stripping limits.
|
|
10
|
+
- Added a Node package-config smoke test for installed package logger configs.
|
|
11
|
+
|
|
7
12
|
## 2.5.20
|
|
8
13
|
|
|
9
14
|
- Added `.trebired/logger/config.ts` loading and normalization helpers through `@trebired/logger/config`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAElB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAIpB,QAAA,MAAM,0BAA0B,+BAA6C,CAAC;AAK9E,iBAAe,UAAU,CACvB,WAAW,SAAgB,EAC3B,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,kBAAkB,CAAC,CAiB7B;AAED,iBAAS,cAAc,CACrB,WAAW,SAAgB,EAC3B,OAAO,GAAE,uBAA4B,GACpC,kBAAkB,CAgBpB;AAED,iBAAS,oBAAoB,CAAC,WAAW,SAAgB,GAAG,sBAAsB,CAUjF;AAED,iBAAS,wBAAwB,IAAI,IAAI,CAExC;AAED,iBAAe,UAAU,CAAC,QAAQ,SAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAC,IAAI,CAAC,CAY9F;AAED,iBAAS,cAAc,CAAC,QAAQ,SAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrF;AAmED,OAAO,EACL,0BAA0B,EAC1B,UAAU,EACV,cAAc,EACd,oBAAoB,EACpB,UAAU,EACV,cAAc,EACd,wBAAwB,GACzB,CAAC"}
|
package/dist/config/load.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import fsPromises from "node:fs/promises";
|
|
3
|
-
import { createRequire } from "node:module";
|
|
4
3
|
import path from "node:path";
|
|
5
4
|
import { pathToFileURL } from "node:url";
|
|
6
|
-
import { normalizeConfig } from "./normalize.js";
|
|
5
|
+
import { defineConfig, normalizeConfig } from "./normalize.js";
|
|
7
6
|
const WORKSPACE_CONFIG_DIR = ".trebired";
|
|
8
7
|
const LOGGER_PROJECT_CONFIG_PATH = `${WORKSPACE_CONFIG_DIR}/logger/config.ts`;
|
|
9
8
|
const EMPTY_CONFIG = Object.freeze(normalizeConfig({}));
|
|
@@ -21,8 +20,8 @@ async function loadConfig(projectRoot = process.cwd(), options = {}) {
|
|
|
21
20
|
if (!await pathExists(configPath)) {
|
|
22
21
|
throw new Error(`logger config was not found: ${configPath}`);
|
|
23
22
|
}
|
|
24
|
-
const
|
|
25
|
-
return loadedConfig(configPath,
|
|
23
|
+
const source = await fsPromises.readFile(configPath, "utf8");
|
|
24
|
+
return loadedConfig(configPath, readSourceConfig(source, configPath));
|
|
26
25
|
}
|
|
27
26
|
function loadConfigSync(projectRoot = process.cwd(), options = {}) {
|
|
28
27
|
const root = path.resolve(projectRoot);
|
|
@@ -37,8 +36,7 @@ function loadConfigSync(projectRoot = process.cwd(), options = {}) {
|
|
|
37
36
|
if (!fs.existsSync(configPath)) {
|
|
38
37
|
throw new Error(`logger config was not found: ${configPath}`);
|
|
39
38
|
}
|
|
40
|
-
|
|
41
|
-
return loadedConfig(configPath, readDefaultConfig(requireFromConfig(configPath), configPath));
|
|
39
|
+
return loadedConfig(configPath, readSourceConfig(fs.readFileSync(configPath, "utf8"), configPath));
|
|
42
40
|
}
|
|
43
41
|
function loadCachedConfigSync(projectRoot = process.cwd()) {
|
|
44
42
|
const root = path.resolve(projectRoot);
|
|
@@ -103,14 +101,36 @@ function loadedConfig(configPath, config) {
|
|
|
103
101
|
dependencies: [configPath],
|
|
104
102
|
};
|
|
105
103
|
}
|
|
106
|
-
function
|
|
107
|
-
const candidate =
|
|
108
|
-
? imported.default
|
|
109
|
-
: undefined;
|
|
104
|
+
function readSourceConfig(source, configPath) {
|
|
105
|
+
const candidate = runConfigSource(source, configPath);
|
|
110
106
|
if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
|
|
111
107
|
throw new Error(`logger config must default-export an object: ${configPath}`);
|
|
112
108
|
}
|
|
113
109
|
return candidate;
|
|
114
110
|
}
|
|
111
|
+
function runConfigSource(source, configPath) {
|
|
112
|
+
const runtimeSource = toRuntimeConfigSource(source, configPath);
|
|
113
|
+
try {
|
|
114
|
+
return Function("defineConfig", `${runtimeSource}\n//# sourceURL=${pathToFileURL(configPath).href}`)(defineConfig);
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
118
|
+
throw new Error(`logger config failed to load: ${configPath}: ${reason}`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
function toRuntimeConfigSource(source, configPath) {
|
|
122
|
+
const withoutImports = source
|
|
123
|
+
.replace(/^\s*import\s+type\s+[\s\S]*?\s+from\s+["'][^"']+["'];?\s*$/gmu, "")
|
|
124
|
+
.replace(/^\s*import\s+[\s\S]*?\s+from\s+["'][^"']+["'];?\s*$/gmu, "")
|
|
125
|
+
.replace(/^\s*import\s+["'][^"']+["'];?\s*$/gmu, "");
|
|
126
|
+
const runtimeSource = withoutImports.replace(/\bexport\s+default\b/u, "return");
|
|
127
|
+
if (runtimeSource === withoutImports) {
|
|
128
|
+
throw new Error(`logger config must default-export an object: ${configPath}`);
|
|
129
|
+
}
|
|
130
|
+
if (/\bexport\b/u.test(runtimeSource)) {
|
|
131
|
+
throw new Error(`logger config only supports a default export: ${configPath}`);
|
|
132
|
+
}
|
|
133
|
+
return runtimeSource;
|
|
134
|
+
}
|
|
115
135
|
export { LOGGER_PROJECT_CONFIG_PATH, findConfig, findConfigSync, loadCachedConfigSync, loadConfig, loadConfigSync, resetConfigCacheForTests, };
|
|
116
136
|
//# sourceMappingURL=load.js.map
|
package/dist/config/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trebired/logger",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.23",
|
|
4
4
|
"description": "Local-first JSONL logger with durable writes, partitions, export archives, native storage acceleration, redaction, query helpers, and browser runtimes.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"private": false,
|