@redocly/openapi-core 0.0.0-snapshot.1767807792 → 0.0.0-snapshot.1767866050
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/lib/config/load.d.ts.map +1 -1
- package/lib/config/load.js +14 -66
- package/lib/config/load.js.map +1 -1
- package/package.json +1 -1
package/lib/config/load.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,YAAY,EAGZ,KAAK,cAAc,EACpB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,YAAY,EAGZ,KAAK,cAAc,EACpB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA2DrD,wBAAsB,UAAU,CAC9B,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,mBAAmB,CAAC,EAAE,YAAY,CAAC;CAC/B,GACL,OAAO,CAAC,MAAM,CAAC,CA+BjB;AAED,wBAAgB,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI3D;AAED,KAAK,mBAAmB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,CAAC,EAAE,MAAM,GAAG,kBAAkB,EACpC,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAE,mBAAwB,GAC5D,OAAO,CAAC,MAAM,CAAC,CA2BjB"}
|
package/lib/config/load.js
CHANGED
|
@@ -4,90 +4,38 @@ import { resolveConfig } from './config-resolvers.js';
|
|
|
4
4
|
import { Config } from './config.js';
|
|
5
5
|
import { BaseResolver, makeDocumentFromString, } from '../resolve.js';
|
|
6
6
|
import { CONFIG_FILE_NAME, IGNORE_FILE } from './constants.js';
|
|
7
|
-
import { isAbsoluteUrl } from '../ref-utils.js';
|
|
8
|
-
// Check if path is a URL (http://, https://, or file://)
|
|
9
7
|
function isUrl(ref) {
|
|
10
8
|
return ref.startsWith('http://') || ref.startsWith('https://') || ref.startsWith('file://');
|
|
11
9
|
}
|
|
12
|
-
// Get directory from path or URL
|
|
13
10
|
function getConfigDir(configPath) {
|
|
14
|
-
if (configPath
|
|
15
|
-
|
|
16
|
-
const url = new URL(configPath);
|
|
17
|
-
const pathPart = url.pathname;
|
|
18
|
-
// Check if it's a yaml file or directory
|
|
19
|
-
if (pathPart.endsWith('.yaml') || pathPart.endsWith('.yml')) {
|
|
20
|
-
url.pathname = pathPart.substring(0, pathPart.lastIndexOf('/'));
|
|
21
|
-
}
|
|
22
|
-
return url.href;
|
|
23
|
-
}
|
|
24
|
-
else if (isAbsoluteUrl(configPath)) {
|
|
25
|
-
// Handle http/https URLs
|
|
26
|
-
if (configPath.endsWith('.yaml') || configPath.endsWith('.yml')) {
|
|
27
|
-
return configPath.substring(0, configPath.lastIndexOf('/'));
|
|
28
|
-
}
|
|
29
|
-
return configPath;
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
// Handle file paths
|
|
33
|
-
if (configPath.endsWith('.yaml') || configPath.endsWith('.yml')) {
|
|
34
|
-
return path.dirname(configPath);
|
|
35
|
-
}
|
|
36
|
-
return configPath;
|
|
11
|
+
if (isUrl(configPath)) {
|
|
12
|
+
return configPath.substring(0, configPath.lastIndexOf('/'));
|
|
37
13
|
}
|
|
38
|
-
|
|
39
|
-
// Join path or URL with ignore file name
|
|
40
|
-
function joinIgnorePath(configDir, ignoreFile) {
|
|
41
|
-
if (isUrl(configDir)) {
|
|
42
|
-
const separator = configDir.endsWith('/') ? '' : '/';
|
|
43
|
-
return configDir + separator + ignoreFile;
|
|
44
|
-
}
|
|
45
|
-
return path.join(configDir, ignoreFile);
|
|
14
|
+
return path.dirname(configPath);
|
|
46
15
|
}
|
|
47
16
|
async function loadIgnoreFile(configPath, resolver) {
|
|
48
|
-
|
|
49
|
-
console.log('[loadIgnoreFile] typeof configPath:', typeof configPath);
|
|
50
|
-
if (!configPath) {
|
|
51
|
-
console.log('[loadIgnoreFile] configPath is falsy, returning undefined');
|
|
17
|
+
if (!configPath)
|
|
52
18
|
return undefined;
|
|
53
|
-
}
|
|
54
19
|
const configDir = getConfigDir(configPath);
|
|
55
|
-
const ignorePath =
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
console.log('[loadIgnoreFile] isUrl(ignorePath):', isUrl(ignorePath));
|
|
20
|
+
const ignorePath = isUrl(configDir)
|
|
21
|
+
? configDir + '/' + IGNORE_FILE
|
|
22
|
+
: path.join(configDir, IGNORE_FILE);
|
|
59
23
|
// For local file system (not URL), check if file exists before loading
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (hasFs && !isUrl(ignorePath) && !fs.existsSync(ignorePath)) {
|
|
63
|
-
console.log('[loadIgnoreFile] file does not exist locally, returning undefined');
|
|
24
|
+
if (fs?.existsSync && !isUrl(ignorePath) && !fs.existsSync(ignorePath)) {
|
|
25
|
+
console.log('####ignorePath does not exist', ignorePath);
|
|
64
26
|
return undefined;
|
|
65
27
|
}
|
|
66
|
-
console.log('[loadIgnoreFile] calling resolver.resolveDocument...');
|
|
67
28
|
const ignoreDocument = await resolver.resolveDocument(null, ignorePath, true);
|
|
68
|
-
console.log('[loadIgnoreFile] ignoreDocument instanceof Error:', ignoreDocument instanceof Error);
|
|
69
|
-
console.log('[loadIgnoreFile] ignoreDocument.parsed:', ignoreDocument instanceof Error ? 'N/A' : !!ignoreDocument.parsed);
|
|
70
29
|
if (ignoreDocument instanceof Error || !ignoreDocument.parsed) {
|
|
71
|
-
console.log('[loadIgnoreFile] ignoreDocument is Error or no parsed, returning undefined');
|
|
72
30
|
return undefined;
|
|
73
31
|
}
|
|
74
|
-
console.log('[loadIgnoreFile] successfully loaded ignore file');
|
|
75
32
|
const ignore = (ignoreDocument.parsed || {});
|
|
76
|
-
console.log('[loadIgnoreFile] ignore keys:', Object.keys(ignore));
|
|
77
33
|
for (const fileName of Object.keys(ignore)) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
// For file:// or http(s):// URLs, join properly
|
|
84
|
-
const separator = configDir.endsWith('/') ? '' : '/';
|
|
85
|
-
resolvedFileName = configDir + separator + fileName;
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
resolvedFileName = path.resolve(configDir, fileName);
|
|
89
|
-
}
|
|
90
|
-
console.log('[loadIgnoreFile] resolving fileName:', fileName, '->', resolvedFileName);
|
|
34
|
+
const resolvedFileName = isUrl(fileName)
|
|
35
|
+
? fileName
|
|
36
|
+
: isUrl(configDir)
|
|
37
|
+
? configDir + '/' + fileName
|
|
38
|
+
: path.resolve(configDir, fileName);
|
|
91
39
|
ignore[resolvedFileName] = ignore[fileName];
|
|
92
40
|
for (const ruleId of Object.keys(ignore[fileName])) {
|
|
93
41
|
ignore[fileName][ruleId] = new Set(ignore[fileName][ruleId]);
|
package/lib/config/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,YAAY,EACZ,sBAAsB,GAGvB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/config/load.ts"],"names":[],"mappings":"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"}
|