@typed-sql/config 2.1.0 → 2.2.0-rc.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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @typed-sql/config
|
|
2
2
|
|
|
3
|
+
## 2.2.0-rc.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 8e6b443: Avoid rereading unchanged imported configuration files on every project reopen. Cache content hashes behind file identity, size and nanosecond modification/change timestamps; changed or deleted imports still invalidate the configuration.
|
|
8
|
+
- 5387b5e: Refresh changed local configuration dependencies and recognize their editor file-watch events, while reusing unchanged evaluated configurations.
|
|
9
|
+
- 5c491f2: Use the exact TypeScript 7.1 beta public APIs for editor inference, including initial in-memory snapshots for unsaved documents. Update the language server protocol dependencies and configuration loader dependencies. The compiler remains on its independently verified TypeScript 7.0.2 path.
|
|
10
|
+
- Updated dependencies [b752fde]
|
|
11
|
+
- Updated dependencies [2f5f6be]
|
|
12
|
+
- Updated dependencies [71a169f]
|
|
13
|
+
- Updated dependencies [d176673]
|
|
14
|
+
- @typed-sql/core@2.2.0-rc.0
|
|
15
|
+
|
|
3
16
|
## 2.1.0
|
|
4
17
|
|
|
5
18
|
### Minor Changes
|
|
@@ -4,6 +4,8 @@ export interface LoadedConfig {
|
|
|
4
4
|
readonly file: string;
|
|
5
5
|
readonly directory: string;
|
|
6
6
|
readonly config: TypedSqlConfig<SchemaSnapshot, unknown>;
|
|
7
|
+
/** Local modules imported while evaluating this configuration, for editor file watchers. */
|
|
8
|
+
readonly dependencies?: readonly string[];
|
|
7
9
|
}
|
|
8
10
|
export interface LoadConfigOptions {
|
|
9
11
|
readonly file?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAShG,eAAO,MAAM,kBAAkB,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAShG,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAoBrC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACzD,4FAA4F;IAC5F,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,wBAAsB,cAAc,CAAC,KAAK,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAW3E;AAcD,wBAAsB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,CAmEvF;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAElE"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { constants } from "node:fs";
|
|
3
|
-
import { access, readFile } from "node:fs/promises";
|
|
4
|
-
import { dirname,
|
|
5
|
-
import { pathToFileURL } from "node:url";
|
|
3
|
+
import { access, readFile, stat } from "node:fs/promises";
|
|
4
|
+
import { dirname, resolve, sep } from "node:path";
|
|
5
|
+
import { fileURLToPath, pathToFileURL } from "node:url";
|
|
6
6
|
import { assertDialectPlugin } from "@typed-sql/core";
|
|
7
|
-
import {
|
|
7
|
+
import { tsImport } from "tsx/esm/api";
|
|
8
8
|
const configNames = [
|
|
9
9
|
"typed-sql.config.ts",
|
|
10
10
|
"typed-sql.config.mts",
|
|
@@ -12,8 +12,19 @@ const configNames = [
|
|
|
12
12
|
"typed-sql.config.js",
|
|
13
13
|
];
|
|
14
14
|
export const CONFIG_CACHE_LIMIT = 32;
|
|
15
|
-
const configLoader = register({ namespace: "typed-sql-config" });
|
|
16
15
|
const configCache = new Map();
|
|
16
|
+
const dependencyHashes = new WeakMap();
|
|
17
|
+
const hashFile = async (file) => createHash("sha256")
|
|
18
|
+
.update(await readFile(file))
|
|
19
|
+
.digest("hex");
|
|
20
|
+
async function fingerprint(file, previous) {
|
|
21
|
+
const info = await stat(file, { bigint: true });
|
|
22
|
+
// ctime detects same-size edits even when tools restore mtime; inode detects replacement.
|
|
23
|
+
const identity = `${info.dev}:${info.ino}:${info.size}:${info.mtimeNs}:${info.ctimeNs}`;
|
|
24
|
+
if (previous?.identity === identity)
|
|
25
|
+
return previous;
|
|
26
|
+
return { identity, hash: await hashFile(file) };
|
|
27
|
+
}
|
|
17
28
|
async function exists(path) {
|
|
18
29
|
try {
|
|
19
30
|
await access(path, constants.F_OK);
|
|
@@ -27,7 +38,7 @@ export async function discoverConfig(start = process.cwd()) {
|
|
|
27
38
|
let directory = resolve(start);
|
|
28
39
|
while (true) {
|
|
29
40
|
for (const name of configNames) {
|
|
30
|
-
const candidate =
|
|
41
|
+
const candidate = resolve(directory, name);
|
|
31
42
|
if (await exists(candidate))
|
|
32
43
|
return candidate;
|
|
33
44
|
}
|
|
@@ -55,26 +66,58 @@ export async function loadConfig(options = {}) {
|
|
|
55
66
|
const file = options.file === undefined
|
|
56
67
|
? await discoverConfig(options.cwd)
|
|
57
68
|
: resolve(options.cwd ?? process.cwd(), options.file);
|
|
58
|
-
const
|
|
59
|
-
const hash = createHash("sha256").update(source).digest("hex");
|
|
69
|
+
const hash = await hashFile(file);
|
|
60
70
|
const key = `${file}\0${hash}`;
|
|
61
71
|
const cached = configCache.get(key);
|
|
62
72
|
if (cached !== undefined) {
|
|
73
|
+
const loaded = await cached;
|
|
74
|
+
const fingerprints = dependencyHashes.get(loaded);
|
|
75
|
+
const unchanged = await Promise.all([...fingerprints].map(async ([path, previous]) => {
|
|
76
|
+
try {
|
|
77
|
+
const current = await fingerprint(path, previous);
|
|
78
|
+
if (current.hash !== previous.hash)
|
|
79
|
+
return false;
|
|
80
|
+
fingerprints.set(path, current);
|
|
81
|
+
return true;
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
}));
|
|
87
|
+
if (configCache.get(key) !== cached)
|
|
88
|
+
return loadConfig(options);
|
|
63
89
|
configCache.delete(key);
|
|
64
|
-
|
|
65
|
-
|
|
90
|
+
if (unchanged.every(Boolean)) {
|
|
91
|
+
configCache.set(key, cached);
|
|
92
|
+
return loaded;
|
|
93
|
+
}
|
|
66
94
|
}
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
.
|
|
95
|
+
const dependencies = new Set([file]);
|
|
96
|
+
// A fresh tsx namespace reloads the entire imported module graph, not only the
|
|
97
|
+
// entry module. Reuse is handled above once every recorded dependency matches.
|
|
98
|
+
const loading = tsImport(pathToFileURL(file).href, {
|
|
99
|
+
parentURL: import.meta.url,
|
|
100
|
+
onImport(url) {
|
|
101
|
+
if (!url.startsWith("file:"))
|
|
102
|
+
return;
|
|
103
|
+
const path = fileURLToPath(url);
|
|
104
|
+
if (!path.split(sep).includes("node_modules"))
|
|
105
|
+
dependencies.add(path);
|
|
106
|
+
},
|
|
107
|
+
})
|
|
108
|
+
.then(async (module) => {
|
|
72
109
|
if (!isConfig(module.default))
|
|
73
110
|
throw new TypeError(`${file} must default-export defineConfig({...})`);
|
|
74
|
-
|
|
111
|
+
const paths = Object.freeze([...dependencies].sort());
|
|
112
|
+
const loaded = { file, directory: dirname(file), config: module.default, dependencies: paths };
|
|
113
|
+
dependencyHashes.set(loaded,
|
|
114
|
+
// The entry file was already content-hashed above; avoid a duplicate read on cache hits.
|
|
115
|
+
new Map(await Promise.all(paths.filter((path) => path !== file).map(async (path) => [path, await fingerprint(path)]))));
|
|
116
|
+
return loaded;
|
|
75
117
|
})
|
|
76
118
|
.catch((error) => {
|
|
77
|
-
configCache.
|
|
119
|
+
if (configCache.get(key) === loading)
|
|
120
|
+
configCache.delete(key);
|
|
78
121
|
throw error;
|
|
79
122
|
});
|
|
80
123
|
configCache.set(key, loading);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typed-sql/config",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0-rc.0",
|
|
4
4
|
"description": "Shared typed-sql config discovery and TypeScript config loading.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Lojhan",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
".": "./dist/packages/config/src/index.js"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"tsx": "4.23.
|
|
40
|
-
"@typed-sql/core": "2.
|
|
39
|
+
"tsx": "4.23.15",
|
|
40
|
+
"@typed-sql/core": "2.2.0-rc.0"
|
|
41
41
|
},
|
|
42
42
|
"scripts": {
|
|
43
43
|
"test": "poku test --reporter=compact --enforce",
|