xypriss 9.10.2 → 9.10.3
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/cjs/src/server/core/XyModuleManager.js +1 -1
- package/dist/cjs/src/server/core/XyModuleManager.js.map +1 -1
- package/dist/cjs/src/server/utils/ConfigLoader.js +31 -25
- package/dist/cjs/src/server/utils/ConfigLoader.js.map +1 -1
- package/dist/cjs/src/utils/ConfigSyntaxParser.js +14 -8
- package/dist/cjs/src/utils/ConfigSyntaxParser.js.map +1 -1
- package/dist/esm/src/server/core/XyModuleManager.js +1 -1
- package/dist/esm/src/server/core/XyModuleManager.js.map +1 -1
- package/dist/esm/src/server/utils/ConfigLoader.js +31 -25
- package/dist/esm/src/server/utils/ConfigLoader.js.map +1 -1
- package/dist/esm/src/utils/ConfigSyntaxParser.js +14 -8
- package/dist/esm/src/utils/ConfigSyntaxParser.js.map +1 -1
- package/package.json +1 -1
|
@@ -99,7 +99,7 @@ class XyAppModuleManager {
|
|
|
99
99
|
this.app.uploadAny = () => {
|
|
100
100
|
return this.fileUploadManager.any();
|
|
101
101
|
};
|
|
102
|
-
this.logger.debug("server", "
|
|
102
|
+
this.logger.debug("server", "FileUploadManager injected into app");
|
|
103
103
|
}
|
|
104
104
|
catch (error) {
|
|
105
105
|
this.logger.warn("server", `Failed to initialize FileUploadManager: ${error.message}. Using dummy middleware.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyModuleManager.js","sources":["../../../../../src/server/core/XyModuleManager.ts"],"sourcesContent":[null],"names":["XyDiagnosticsManager","XyLifecycleManager","FileUploadManager"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"XyModuleManager.js","sources":["../../../../../src/server/core/XyModuleManager.ts"],"sourcesContent":[null],"names":["XyDiagnosticsManager","XyLifecycleManager","FileUploadManager"],"mappings":"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"}
|
|
@@ -65,15 +65,20 @@ class ConfigLoader {
|
|
|
65
65
|
return;
|
|
66
66
|
this.isConfigApplied = true;
|
|
67
67
|
const root = ProjectDiscovery.getCallerProjectRoot() || xhsc.__sys__.__root__;
|
|
68
|
+
Logger.logger.debug("server", `ConfigLoader: Initializing discovery from root: ${root}`);
|
|
68
69
|
const configFiles = [];
|
|
69
70
|
// Only look for config at the absolute project root (preferring .jsonc)
|
|
70
71
|
for (const name of ["xypriss.config.jsonc", "xypriss.config.json"]) {
|
|
71
72
|
const potentialConfig = path__namespace.join(root, name);
|
|
72
73
|
if (fs__namespace.existsSync(potentialConfig)) {
|
|
74
|
+
Logger.logger.debug("server", `ConfigLoader: Found configuration file: ${potentialConfig}`);
|
|
73
75
|
configFiles.push(potentialConfig);
|
|
74
76
|
break; // Stop after first match in root
|
|
75
77
|
}
|
|
76
78
|
}
|
|
79
|
+
if (configFiles.length === 0) {
|
|
80
|
+
Logger.logger.debug("server", `ConfigLoader: No configuration file found in ${root}`);
|
|
81
|
+
}
|
|
77
82
|
// Process only the root configuration
|
|
78
83
|
for (const configPath of configFiles) {
|
|
79
84
|
this.applyConfigFromFile(configPath, root);
|
|
@@ -86,33 +91,34 @@ class ConfigLoader {
|
|
|
86
91
|
*/
|
|
87
92
|
applyConfigFromFile(configPath, projectRoot) {
|
|
88
93
|
const configDir = path__namespace.dirname(configPath);
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
this.processInternalConfig(internal, projectRoot, configDir);
|
|
94
|
+
if (!fs__namespace.existsSync(configPath))
|
|
95
|
+
return;
|
|
96
|
+
const rawContent = fs__namespace.readFileSync(configPath, "utf-8");
|
|
97
|
+
const cleanContent = this.stripComments(rawContent);
|
|
98
|
+
const rawConfig = JSON.parse(cleanContent);
|
|
99
|
+
// Load package.json if not already loaded
|
|
100
|
+
this.loadPackageJson(projectRoot);
|
|
101
|
+
Logger.logger.debug("server", `ConfigLoader: Resolving references for ${path__namespace.basename(configPath)}`);
|
|
102
|
+
if (xhsc.__sys__?.__env__) {
|
|
103
|
+
const envSnapshot = xhsc.__sys__.__env__.all();
|
|
104
|
+
Logger.logger.debug("server", `ConfigLoader: Env keys available in store for ${projectRoot}: ${Object.keys(envSnapshot).join(", ")}`);
|
|
105
|
+
}
|
|
106
|
+
// Resolve environment and package variable references
|
|
107
|
+
const config = this.resolveRefs(rawConfig);
|
|
108
|
+
if (!config)
|
|
109
|
+
return;
|
|
110
|
+
Logger.logger.debug("server", `ConfigLoader: Applied configuration from: ${path__namespace.relative(projectRoot, configPath)}`);
|
|
111
|
+
// Apply __sys__ config if present
|
|
112
|
+
if (config?.__vars__) {
|
|
113
|
+
if (xhsc.__sys__) {
|
|
114
|
+
Logger.logger.debug("server", `ConfigLoader: Updating system variables with __vars__: ${JSON.stringify(config.__vars__)}`);
|
|
115
|
+
xhsc.__sys__.vars.update(config.__vars__);
|
|
112
116
|
}
|
|
113
117
|
}
|
|
114
|
-
|
|
115
|
-
|
|
118
|
+
// Process internal configuration
|
|
119
|
+
const internal = config?.vars?.internal || config?.internal || config?.$internal;
|
|
120
|
+
if (internal) {
|
|
121
|
+
this.processInternalConfig(internal, projectRoot, configDir);
|
|
116
122
|
}
|
|
117
123
|
}
|
|
118
124
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":["path","fs","getCallerProjectRoot","__sys__","logger","XyPrissFS","XY_XHSC_REGISTER_FS","ConfigSyntaxParser"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA;;;;;AAKG;MACU,YAAY,CAAA;AAAzB,IAAA,WAAA,GAAA;QACY,IAAA,CAAA,eAAe,GAAG,KAAK;AACvB,QAAA,IAAA,CAAA,aAAa,GAAG,IAAI,GAAG,EAAU;QACjC,IAAA,CAAA,WAAW,GAAQ,IAAI;
|
|
1
|
+
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":["path","fs","getCallerProjectRoot","__sys__","logger","XyPrissFS","XY_XHSC_REGISTER_FS","ConfigSyntaxParser"],"mappings":"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"}
|
|
@@ -37,23 +37,29 @@ class ConfigSyntaxParser {
|
|
|
37
37
|
*/
|
|
38
38
|
resolveString(value) {
|
|
39
39
|
let resolved = value;
|
|
40
|
-
// 1. Resolve $(env).KEY or &(env).KEY
|
|
41
|
-
resolved = resolved.replace(/([\$\&])\(env\)\.([\w\d_.-]+)
|
|
40
|
+
// 1. Resolve $(env).KEY or &(env).KEY (with optional || fallback)
|
|
41
|
+
resolved = resolved.replace(/([\$\&])\(env\)\.([\w\d_.-]+)(?:\s*\|\|\s*([^)]+))?/g, (match, _prefix, key, fallback) => {
|
|
42
42
|
const env = this.envProvider;
|
|
43
43
|
if (!env)
|
|
44
|
-
return
|
|
44
|
+
return fallback !== undefined ? fallback.trim() : match;
|
|
45
45
|
if (!env.has(key)) {
|
|
46
|
-
|
|
46
|
+
if (fallback !== undefined) {
|
|
47
|
+
return fallback.trim();
|
|
48
|
+
}
|
|
49
|
+
throw new Error(`EDYNC: Environment variable "${key}" not found`);
|
|
47
50
|
}
|
|
48
51
|
return env.get(key);
|
|
49
52
|
});
|
|
50
|
-
// 2. Resolve $(pkg).path or &(pkg).path
|
|
51
|
-
resolved = resolved.replace(/([\$\&])\(pkg\)\.([\w\d_.-]+)
|
|
53
|
+
// 2. Resolve $(pkg).path or &(pkg).path (with optional || fallback)
|
|
54
|
+
resolved = resolved.replace(/([\$\&])\(pkg\)\.([\w\d_.-]+)(?:\s*\|\|\s*([^)]+))?/g, (_match, _prefix, propPath, fallback) => {
|
|
52
55
|
if (!this.packageJson)
|
|
53
|
-
return _match;
|
|
56
|
+
return fallback !== undefined ? fallback.trim() : _match;
|
|
54
57
|
const val = this.getDeepValue(this.packageJson, propPath);
|
|
55
58
|
if (val === undefined) {
|
|
56
|
-
|
|
59
|
+
if (fallback !== undefined) {
|
|
60
|
+
return fallback.trim();
|
|
61
|
+
}
|
|
62
|
+
throw new Error(`EDYNC: Property "${propPath}" not found in package.json`);
|
|
57
63
|
}
|
|
58
64
|
return String(val);
|
|
59
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigSyntaxParser.js","sources":["../../../../src/utils/ConfigSyntaxParser.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;;;;;;AAMG;MACU,kBAAkB,CAAA;AAC3B,IAAA,WAAA,CACqB,WAAA,GAAmB,IAAI,EACvB,WAAA,GAA0F,IAAI,EAAA;QAD9F,IAAA,CAAA,WAAW,GAAX,WAAW;QACX,IAAA,CAAA,WAAW,GAAX,WAAW;IAC7B;AAEH;;AAEG;AACI,IAAA,OAAO,CAAC,GAAQ,EAAA;AACnB,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;AACzB,YAAA,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAClC;AAAO,aAAA,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;AAC3B,YAAA,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD;aAAO,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE;YAChD,MAAM,QAAQ,GAAQ,EAAE;AACxB,YAAA,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;gBACnB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,gBAAA,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClD;AACA,YAAA,OAAO,QAAQ;QACnB;AACA,QAAA,OAAO,GAAG;IACd;AAEA;;AAEG;AACK,IAAA,aAAa,CAAC,KAAa,EAAA;QAC/B,IAAI,QAAQ,GAAG,KAAK;;AAGpB,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACvB,
|
|
1
|
+
{"version":3,"file":"ConfigSyntaxParser.js","sources":["../../../../src/utils/ConfigSyntaxParser.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ class XyAppModuleManager {
|
|
|
97
97
|
this.app.uploadAny = () => {
|
|
98
98
|
return this.fileUploadManager.any();
|
|
99
99
|
};
|
|
100
|
-
this.logger.debug("server", "
|
|
100
|
+
this.logger.debug("server", "FileUploadManager injected into app");
|
|
101
101
|
}
|
|
102
102
|
catch (error) {
|
|
103
103
|
this.logger.warn("server", `Failed to initialize FileUploadManager: ${error.message}. Using dummy middleware.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XyModuleManager.js","sources":["../../../../../src/server/core/XyModuleManager.ts"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"XyModuleManager.js","sources":["../../../../../src/server/core/XyModuleManager.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -43,15 +43,20 @@ class ConfigLoader {
|
|
|
43
43
|
return;
|
|
44
44
|
this.isConfigApplied = true;
|
|
45
45
|
const root = getCallerProjectRoot() || __sys__.__root__;
|
|
46
|
+
logger.debug("server", `ConfigLoader: Initializing discovery from root: ${root}`);
|
|
46
47
|
const configFiles = [];
|
|
47
48
|
// Only look for config at the absolute project root (preferring .jsonc)
|
|
48
49
|
for (const name of ["xypriss.config.jsonc", "xypriss.config.json"]) {
|
|
49
50
|
const potentialConfig = path.join(root, name);
|
|
50
51
|
if (fs.existsSync(potentialConfig)) {
|
|
52
|
+
logger.debug("server", `ConfigLoader: Found configuration file: ${potentialConfig}`);
|
|
51
53
|
configFiles.push(potentialConfig);
|
|
52
54
|
break; // Stop after first match in root
|
|
53
55
|
}
|
|
54
56
|
}
|
|
57
|
+
if (configFiles.length === 0) {
|
|
58
|
+
logger.debug("server", `ConfigLoader: No configuration file found in ${root}`);
|
|
59
|
+
}
|
|
55
60
|
// Process only the root configuration
|
|
56
61
|
for (const configPath of configFiles) {
|
|
57
62
|
this.applyConfigFromFile(configPath, root);
|
|
@@ -64,33 +69,34 @@ class ConfigLoader {
|
|
|
64
69
|
*/
|
|
65
70
|
applyConfigFromFile(configPath, projectRoot) {
|
|
66
71
|
const configDir = path.dirname(configPath);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
this.processInternalConfig(internal, projectRoot, configDir);
|
|
72
|
+
if (!fs.existsSync(configPath))
|
|
73
|
+
return;
|
|
74
|
+
const rawContent = fs.readFileSync(configPath, "utf-8");
|
|
75
|
+
const cleanContent = this.stripComments(rawContent);
|
|
76
|
+
const rawConfig = JSON.parse(cleanContent);
|
|
77
|
+
// Load package.json if not already loaded
|
|
78
|
+
this.loadPackageJson(projectRoot);
|
|
79
|
+
logger.debug("server", `ConfigLoader: Resolving references for ${path.basename(configPath)}`);
|
|
80
|
+
if (__sys__?.__env__) {
|
|
81
|
+
const envSnapshot = __sys__.__env__.all();
|
|
82
|
+
logger.debug("server", `ConfigLoader: Env keys available in store for ${projectRoot}: ${Object.keys(envSnapshot).join(", ")}`);
|
|
83
|
+
}
|
|
84
|
+
// Resolve environment and package variable references
|
|
85
|
+
const config = this.resolveRefs(rawConfig);
|
|
86
|
+
if (!config)
|
|
87
|
+
return;
|
|
88
|
+
logger.debug("server", `ConfigLoader: Applied configuration from: ${path.relative(projectRoot, configPath)}`);
|
|
89
|
+
// Apply __sys__ config if present
|
|
90
|
+
if (config?.__vars__) {
|
|
91
|
+
if (__sys__) {
|
|
92
|
+
logger.debug("server", `ConfigLoader: Updating system variables with __vars__: ${JSON.stringify(config.__vars__)}`);
|
|
93
|
+
__sys__.vars.update(config.__vars__);
|
|
90
94
|
}
|
|
91
95
|
}
|
|
92
|
-
|
|
93
|
-
|
|
96
|
+
// Process internal configuration
|
|
97
|
+
const internal = config?.vars?.internal || config?.internal || config?.$internal;
|
|
98
|
+
if (internal) {
|
|
99
|
+
this.processInternalConfig(internal, projectRoot, configDir);
|
|
94
100
|
}
|
|
95
101
|
}
|
|
96
102
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;AASA;;;;;AAKG;MACU,YAAY,CAAA;AAAzB,IAAA,WAAA,GAAA;QACY,IAAA,CAAA,eAAe,GAAG,KAAK;AACvB,QAAA,IAAA,CAAA,aAAa,GAAG,IAAI,GAAG,EAAU;QACjC,IAAA,CAAA,WAAW,GAAQ,IAAI;
|
|
1
|
+
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -35,23 +35,29 @@ class ConfigSyntaxParser {
|
|
|
35
35
|
*/
|
|
36
36
|
resolveString(value) {
|
|
37
37
|
let resolved = value;
|
|
38
|
-
// 1. Resolve $(env).KEY or &(env).KEY
|
|
39
|
-
resolved = resolved.replace(/([\$\&])\(env\)\.([\w\d_.-]+)
|
|
38
|
+
// 1. Resolve $(env).KEY or &(env).KEY (with optional || fallback)
|
|
39
|
+
resolved = resolved.replace(/([\$\&])\(env\)\.([\w\d_.-]+)(?:\s*\|\|\s*([^)]+))?/g, (match, _prefix, key, fallback) => {
|
|
40
40
|
const env = this.envProvider;
|
|
41
41
|
if (!env)
|
|
42
|
-
return
|
|
42
|
+
return fallback !== undefined ? fallback.trim() : match;
|
|
43
43
|
if (!env.has(key)) {
|
|
44
|
-
|
|
44
|
+
if (fallback !== undefined) {
|
|
45
|
+
return fallback.trim();
|
|
46
|
+
}
|
|
47
|
+
throw new Error(`EDYNC: Environment variable "${key}" not found`);
|
|
45
48
|
}
|
|
46
49
|
return env.get(key);
|
|
47
50
|
});
|
|
48
|
-
// 2. Resolve $(pkg).path or &(pkg).path
|
|
49
|
-
resolved = resolved.replace(/([\$\&])\(pkg\)\.([\w\d_.-]+)
|
|
51
|
+
// 2. Resolve $(pkg).path or &(pkg).path (with optional || fallback)
|
|
52
|
+
resolved = resolved.replace(/([\$\&])\(pkg\)\.([\w\d_.-]+)(?:\s*\|\|\s*([^)]+))?/g, (_match, _prefix, propPath, fallback) => {
|
|
50
53
|
if (!this.packageJson)
|
|
51
|
-
return _match;
|
|
54
|
+
return fallback !== undefined ? fallback.trim() : _match;
|
|
52
55
|
const val = this.getDeepValue(this.packageJson, propPath);
|
|
53
56
|
if (val === undefined) {
|
|
54
|
-
|
|
57
|
+
if (fallback !== undefined) {
|
|
58
|
+
return fallback.trim();
|
|
59
|
+
}
|
|
60
|
+
throw new Error(`EDYNC: Property "${propPath}" not found in package.json`);
|
|
55
61
|
}
|
|
56
62
|
return String(val);
|
|
57
63
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigSyntaxParser.js","sources":["../../../../src/utils/ConfigSyntaxParser.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;AAMG;MACU,kBAAkB,CAAA;AAC3B,IAAA,WAAA,CACqB,WAAA,GAAmB,IAAI,EACvB,WAAA,GAA0F,IAAI,EAAA;QAD9F,IAAA,CAAA,WAAW,GAAX,WAAW;QACX,IAAA,CAAA,WAAW,GAAX,WAAW;IAC7B;AAEH;;AAEG;AACI,IAAA,OAAO,CAAC,GAAQ,EAAA;AACnB,QAAA,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;AACzB,YAAA,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAClC;AAAO,aAAA,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;AAC3B,YAAA,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD;aAAO,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE;YAChD,MAAM,QAAQ,GAAQ,EAAE;AACxB,YAAA,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;gBACnB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,gBAAA,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClD;AACA,YAAA,OAAO,QAAQ;QACnB;AACA,QAAA,OAAO,GAAG;IACd;AAEA;;AAEG;AACK,IAAA,aAAa,CAAC,KAAa,EAAA;QAC/B,IAAI,QAAQ,GAAG,KAAK;;AAGpB,QAAA,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACvB,
|
|
1
|
+
{"version":3,"file":"ConfigSyntaxParser.js","sources":["../../../../src/utils/ConfigSyntaxParser.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED