graphile-config 0.0.1-beta.16 → 0.0.1-beta.17
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 +14 -0
- package/dist/loadConfig.d.ts.map +1 -1
- package/dist/loadConfig.js +57 -13
- package/dist/loadConfig.js.map +1 -1
- package/package.json +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# graphile-config
|
|
2
2
|
|
|
3
|
+
## 0.0.1-beta.17
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2577](https://github.com/graphile/crystal/pull/2577)
|
|
8
|
+
[`0c6b1f1`](https://github.com/graphile/crystal/commit/0c6b1f1e188f6e2913832adfed9ca76dfdc25c47)
|
|
9
|
+
Thanks [@benjie](https://github.com/benjie)! - Update dependencies
|
|
10
|
+
|
|
11
|
+
- [#2588](https://github.com/graphile/crystal/pull/2588)
|
|
12
|
+
[`e0cdabe`](https://github.com/graphile/crystal/commit/e0cdabe25c8894da550546c93bc03b895585544c)
|
|
13
|
+
Thanks [@benjie](https://github.com/benjie)! - Add support for
|
|
14
|
+
`--experimental-strip-types` to `graphile-config`'s loading of config files.
|
|
15
|
+
No need for `ts-node`/`tsx` now.
|
|
16
|
+
|
|
3
17
|
## 0.0.1-beta.16
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
package/dist/loadConfig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,CAAC;AA8GzB,wBAAsB,UAAU,CAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CAwCvC"}
|
package/dist/loadConfig.js
CHANGED
|
@@ -60,19 +60,67 @@ function fixESMShenanigans(requiredModule) {
|
|
|
60
60
|
}
|
|
61
61
|
return requiredModule;
|
|
62
62
|
}
|
|
63
|
+
function isESMError(e) {
|
|
64
|
+
return (typeof e === "object" &&
|
|
65
|
+
e != null &&
|
|
66
|
+
"code" in e &&
|
|
67
|
+
(e.code === "ERR_REQUIRE_ESM" || e.code === "ERR_REQUIRE_ASYNC_MODULE"));
|
|
68
|
+
}
|
|
69
|
+
async function loadDefaultExport(resolvedPath, extension) {
|
|
70
|
+
// Attempt to import using native TypeScript support if appropriate
|
|
71
|
+
if (process.features.typescript && /\.[cm]?tsx?$/.test(extension)) {
|
|
72
|
+
try {
|
|
73
|
+
// Node has `require(esm)` support, but also for a `.cjsx` file it should
|
|
74
|
+
// still use `require()`
|
|
75
|
+
return fixESMShenanigans(require(resolvedPath));
|
|
76
|
+
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
if (isESMError(e)) {
|
|
79
|
+
// This is the most likely result, since TypeScript uses ESM syntax.
|
|
80
|
+
try {
|
|
81
|
+
return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
// Nevermind; try a loader
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// Nevermind; try a loader
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
// No luck? Let's try loading the loaders
|
|
91
|
+
try {
|
|
92
|
+
registerLoader(interpret_1.jsVariants[extension]);
|
|
93
|
+
}
|
|
94
|
+
catch (e) {
|
|
95
|
+
console.error(`No loader could be loaded for ${extension} files: ${e}`);
|
|
96
|
+
}
|
|
97
|
+
// And now lets attempt to import
|
|
98
|
+
try {
|
|
99
|
+
return fixESMShenanigans(require(resolvedPath));
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
if (isESMError(e)) {
|
|
103
|
+
// It's an ESModule, so `require()` won't work. Let's use `import()`!
|
|
104
|
+
return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
throw e;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
63
111
|
async function loadConfig(configPath) {
|
|
64
112
|
if (configPath != null) {
|
|
65
113
|
// Explicitly load the file the user has indicated
|
|
66
114
|
const resolvedPath = (0, node_path_1.resolve)(process.cwd(), configPath);
|
|
67
|
-
// First try one of the supported loaders
|
|
115
|
+
// First try one of the supported loaders.
|
|
68
116
|
for (const extension of extensions) {
|
|
69
117
|
if (resolvedPath.endsWith(extension)) {
|
|
70
|
-
registerLoader(interpret_1.jsVariants[extension]);
|
|
71
118
|
try {
|
|
72
|
-
return
|
|
119
|
+
return await loadDefaultExport(resolvedPath, extension);
|
|
73
120
|
}
|
|
74
121
|
catch {
|
|
75
|
-
|
|
122
|
+
// Multiple extensions might match - e.g. both `.swc.tsx` and `.tsx`;
|
|
123
|
+
// continue to the next one.
|
|
76
124
|
}
|
|
77
125
|
}
|
|
78
126
|
}
|
|
@@ -85,17 +133,13 @@ async function loadConfig(configPath) {
|
|
|
85
133
|
for (const extension of extensions) {
|
|
86
134
|
const resolvedPath = basePath + extension;
|
|
87
135
|
if (await exists(resolvedPath)) {
|
|
88
|
-
|
|
136
|
+
// This file exists; whatever happens, we will try this file only.
|
|
89
137
|
try {
|
|
90
|
-
return
|
|
138
|
+
return await loadDefaultExport(resolvedPath, extension);
|
|
91
139
|
}
|
|
92
|
-
catch
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
throw e;
|
|
98
|
-
}
|
|
140
|
+
catch {
|
|
141
|
+
// Fallback to direct import
|
|
142
|
+
return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
|
|
99
143
|
}
|
|
100
144
|
}
|
|
101
145
|
}
|
package/dist/loadConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "graphile-config",
|
|
3
|
-
"version": "0.0.1-beta.
|
|
3
|
+
"version": "0.0.1-beta.17",
|
|
4
4
|
"description": "Standard plugin interface and helpers to be used across the Graphile stack.",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
},
|
|
40
40
|
"homepage": "https://graphile.org/graphile-build/",
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@types/interpret": "^1.1.
|
|
43
|
-
"@types/node": "^
|
|
44
|
-
"@types/semver": "^7.
|
|
42
|
+
"@types/interpret": "^1.1.3",
|
|
43
|
+
"@types/node": "^22.15.32",
|
|
44
|
+
"@types/semver": "^7.7.0",
|
|
45
45
|
"chalk": "^4.1.2",
|
|
46
|
-
"debug": "^4.
|
|
46
|
+
"debug": "^4.4.1",
|
|
47
47
|
"interpret": "^3.1.1",
|
|
48
|
-
"semver": "^7.
|
|
48
|
+
"semver": "^7.7.2",
|
|
49
49
|
"tslib": "^2.8.1",
|
|
50
50
|
"yargs": "^17.7.2"
|
|
51
51
|
},
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
"dist"
|
|
57
57
|
],
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@types/debug": "^4.1.
|
|
60
|
-
"@types/mocha": "^10.0.
|
|
61
|
-
"chai": "^
|
|
62
|
-
"mocha": "^
|
|
63
|
-
"ts-node": "^10.9.
|
|
59
|
+
"@types/debug": "^4.1.12",
|
|
60
|
+
"@types/mocha": "^10.0.10",
|
|
61
|
+
"chai": "^5.2.0",
|
|
62
|
+
"mocha": "^11.6.0",
|
|
63
|
+
"ts-node": "^10.9.2",
|
|
64
64
|
"typescript": "^5.8.3"
|
|
65
65
|
}
|
|
66
66
|
}
|