xypriss 9.10.18 → 9.10.19
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/handlers/NotFoundHandler.js +1 -1
- package/dist/cjs/src/server/handlers/NotFoundHandler.js.map +1 -1
- package/dist/cjs/src/server/utils/ConfigLoader.js +2 -6
- package/dist/cjs/src/server/utils/ConfigLoader.js.map +1 -1
- package/dist/cjs/src/utils/JsonUtils.js +33 -0
- package/dist/cjs/src/utils/JsonUtils.js.map +1 -0
- package/dist/cjs/src/xhsc.js.map +1 -1
- package/dist/esm/src/server/handlers/NotFoundHandler.js +1 -1
- package/dist/esm/src/server/handlers/NotFoundHandler.js.map +1 -1
- package/dist/esm/src/server/utils/ConfigLoader.js +2 -6
- package/dist/esm/src/server/utils/ConfigLoader.js.map +1 -1
- package/dist/esm/src/utils/JsonUtils.js +31 -0
- package/dist/esm/src/utils/JsonUtils.js.map +1 -0
- package/dist/esm/src/xhsc.js.map +1 -1
- package/package.json +3 -5
|
@@ -51,7 +51,7 @@ class NotFoundHandler {
|
|
|
51
51
|
title: d.title || "404 Not Found",
|
|
52
52
|
};
|
|
53
53
|
const html = notFoundTemplate.notFoundTemplate(dt);
|
|
54
|
-
res.html(html);
|
|
54
|
+
res.status(404).html(html);
|
|
55
55
|
};
|
|
56
56
|
const config = ConfigurationManager.CM.get("notFound") || {};
|
|
57
57
|
this.config = config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["validate404Cfg","__sys__","notFoundTemplate","Configs"],"mappings":";;;;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACAA,6BAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACFC,YAAe,EAAE,QAAQ;oBAC1BA,YAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,gBAAgB;gBACpB,YAAY,EAAE,CAAC,CAAC,YAAY;AAC5B,gBAAA,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;AAC5B,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,OAAO,EAAE,CAAC,CAAC,OAAc;AACzB,gBAAA,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;gBAClC,cAAc,EAAE,CAAC,CAAC,cAAc;AAChC,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,aAAa,EAAE,GAAG,CAAC,GAAG;AACtB,gBAAA,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ;AACxB,gBAAA,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,eAAe;aACpC;AAED,YAAA,MAAM,IAAI,GAAGC,iCAAgB,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["validate404Cfg","__sys__","notFoundTemplate","Configs"],"mappings":";;;;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACAA,6BAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACFC,YAAe,EAAE,QAAQ;oBAC1BA,YAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,gBAAgB;gBACpB,YAAY,EAAE,CAAC,CAAC,YAAY;AAC5B,gBAAA,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;AAC5B,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,OAAO,EAAE,CAAC,CAAC,OAAc;AACzB,gBAAA,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;gBAClC,cAAc,EAAE,CAAC,CAAC,cAAc;AAChC,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,aAAa,EAAE,GAAG,CAAC,GAAG;AACtB,gBAAA,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ;AACxB,gBAAA,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,eAAe;aACpC;AAED,YAAA,MAAM,IAAI,GAAGC,iCAAgB,CAAC,EAAE,CAAC;YAEjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AAC9B,QAAA,CAAC;QAhDG,MAAM,MAAM,GAAGC,uBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE;AAE5C,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AA+CA;;AAEG;AACI,IAAA,YAAY,CAAC,SAAkC,EAAA;;AAElD,QAAAA,uBAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC;IACzC;AACH;AAED;;AAEG;AACG,SAAU,qBAAqB,CACjC,OAAsB,EAAA;IAEtB,MAAM,GAAG,GAAGA,uBAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IACnC,MAAM,EAAE,GAAGA,uBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAEzC,IAAA,MAAM,iBAAiB,GAAG,GAAG,EAAE,OAAO,KAAK,KAAK;IAEhD,IAAI,CAAC,iBAAiB,EAAE;AACpB,QAAA,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE;AACd,YAAA,MAAM,IAAI,KAAK,CACX,kHAAkH,CACrH;QACL;AACA,QAAA,OAAO,IAAI;IACf;IACA,OAAO,IAAI,eAAe,EAAE;AAChC;;;;;"}
|
|
@@ -8,6 +8,7 @@ var env = require('../../xhsc/api/env/env.js');
|
|
|
8
8
|
var ProjectDiscovery = require('../../utils/ProjectDiscovery.js');
|
|
9
9
|
var ConfigSyntaxParser = require('../../utils/ConfigSyntaxParser.js');
|
|
10
10
|
var MetaConfigRunner = require('./MetaConfigRunner.js');
|
|
11
|
+
var JsonUtils = require('../../utils/JsonUtils.js');
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* XyPriss Configuration Loader
|
|
@@ -59,8 +60,7 @@ class ConfigLoader {
|
|
|
59
60
|
if (!this.sys.fs.exist(configPath))
|
|
60
61
|
return;
|
|
61
62
|
const rawContent = this.sys.fs.readSync(configPath);
|
|
62
|
-
const
|
|
63
|
-
const rawConfig = JSON.parse(cleanContent);
|
|
63
|
+
const rawConfig = JsonUtils.JsonUtils.parse(rawContent);
|
|
64
64
|
// Load package.json if not already loaded
|
|
65
65
|
this.loadPackageJson(projectRoot);
|
|
66
66
|
Logger.logger.debug("server", `ConfigLoader: Resolving references for ${this.sys.path.basename(configPath)}`);
|
|
@@ -163,10 +163,6 @@ class ConfigLoader {
|
|
|
163
163
|
return null;
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
|
-
stripComments(content) {
|
|
167
|
-
const noComments = content.replace(/("(?:[^"\\]|\\.)*")|\/\/.*|\/\*[\s\S]*?\*\//g, (match, group1) => (group1 ? group1 : ""));
|
|
168
|
-
return noComments.replace(/("(?:[^"\\]|\\.)*")|,\s*([}\]])/g, (match, group1, group2) => (group1 ? group1 : group2));
|
|
169
|
-
}
|
|
170
166
|
loadPackageJson(root) {
|
|
171
167
|
if (this.packageJson)
|
|
172
168
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":["MetaConfigRunner","getSysApi","getCallerProjectRoot","__sys__","logger","XyPrissFS","XY_XHSC_REGISTER_FS","ConfigSyntaxParser"],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":["MetaConfigRunner","getSysApi","getCallerProjectRoot","__sys__","logger","JsonUtils","XyPrissFS","XY_XHSC_REGISTER_FS","ConfigSyntaxParser"],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* JSON Utility Library
|
|
5
|
+
*
|
|
6
|
+
* Implements robust comment stripping and safe parsing for JSONC/JSON configuration files.
|
|
7
|
+
*/
|
|
8
|
+
class JsonUtils {
|
|
9
|
+
/**
|
|
10
|
+
* Strip single-line (//) and multi-line (/*) comments from a string content,
|
|
11
|
+
* while retaining strings and resolving trailing commas for JSON-compatibility.
|
|
12
|
+
*
|
|
13
|
+
* @param content - Raw JSONC content.
|
|
14
|
+
* @returns Sanitized standard JSON string.
|
|
15
|
+
*/
|
|
16
|
+
static stripComments(content) {
|
|
17
|
+
const noComments = content.replace(/("(?:[^"\\]|\\.)*")|\/\/.*|\/\*[\s\S]*?\*\//g, (match, group1) => (group1 ? group1 : ""));
|
|
18
|
+
return noComments.replace(/("(?:[^"\\]|\\.)*")|,\s*([}\]])/g, (match, group1, group2) => (group1 ? group1 : group2));
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Safely parse comments-enabled JSONC strings into JavaScript objects.
|
|
22
|
+
*
|
|
23
|
+
* @param content - Raw JSONC string.
|
|
24
|
+
* @returns Parsed object.
|
|
25
|
+
*/
|
|
26
|
+
static parse(content) {
|
|
27
|
+
const clean = this.stripComments(content);
|
|
28
|
+
return JSON.parse(clean);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
exports.JsonUtils = JsonUtils;
|
|
33
|
+
//# sourceMappingURL=JsonUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JsonUtils.js","sources":["../../../../src/utils/JsonUtils.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAA;;;;AAIG;MACU,SAAS,CAAA;AAClB;;;;;;AAMG;IACI,OAAO,aAAa,CAAC,OAAe,EAAA;QACvC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAC9B,8CAA8C,EAC9C,CAAC,KAAK,EAAE,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,CAC5C;QACD,OAAO,UAAU,CAAC,OAAO,CACrB,kCAAkC,EAClC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,CACxD;IACL;AAEA;;;;;AAKG;IACI,OAAO,KAAK,CAAU,OAAe,EAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;AACzC,QAAA,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC5B;AACH;;;;"}
|
package/dist/cjs/src/xhsc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xhsc.js","sources":["../../../src/xhsc.ts"],"sourcesContent":[null],"names":["XyPrissFS","XY_XHSC_REGISTER_FS","getCallerProjectRoot","isProjectRoot","logger","generateXUserTmpDir","loadXyConfig","DotEnvLoader","XY_ENV_STORE_KEY","createSecurityShield"],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"xhsc.js","sources":["../../../src/xhsc.ts"],"sourcesContent":[null],"names":["XyPrissFS","XY_XHSC_REGISTER_FS","getCallerProjectRoot","isProjectRoot","logger","generateXUserTmpDir","loadXyConfig","DotEnvLoader","XY_ENV_STORE_KEY","createSecurityShield"],"mappings":";;;;;;;;;;;;AAoBA;;;;;;;;;;;AAWG;AACG,MAAO,WAAY,SAAQA,gBAAS,CAAA;AAO/B,IAAA,CAACC,uBAAmB,CAAC,CAAC,QAAgB,EAAE,QAAmB,EAAA;QAC9D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC3C;AAEA,IAAA,IAAoB,QAAQ,GAAA;AACxB,QAAA,OAAOC,qCAAoB,EAAE,IAAI,IAAI,CAAC,aAAa;IACvD;AACA,IAAA,WAAA,CAAY,OAA4B,EAAE,EAAA;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE;AAE3C,QAAA,IAAI,CAACC,8BAAa,CAAC,IAAI,CAAC,EAAE;AACtB,YAAA,MAAM,IAAI,KAAK,CACX,CAAA,6BAAA,EAAgC,IAAI,CAAA;AACyD,4GAAA,CAAA,CAChG;QACL;;AAGA,QAAA,MAAM,SAAS,GACX,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM;AAC9D,QAAA,MAAM,IAAI,GACN,OAAO,SAAS,KAAK;AACjB,cAAE;AACF,cAAE,SAAS,EAAE,IAAI,IAAI,aAAa;AAE1C,QAAA,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AA/BhD,QAAA,IAAA,CAAA,UAAU,GAA2B,IAAI,GAAG,EAAE;AAgC3D,QAAA,IAAI,CAAC,YAAY,GAAG,IAAI;;AAGxB,QAAA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;AACb,YAAA,WAAW,EAAE,OAAO;AACpB,YAAA,UAAU,EAAE,SAAS;AACrB,YAAA,eAAe,EAAE,uBAAuB;AACxC,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,QAAQ,EAAE,aAAa;AACvB,YAAA,SAAS,EAAE,KAAK;AAChB,YAAA,QAAQ,EAAE,IAAI;AACd,YAAA,QAAQ,EAAE,IAAI;AACd,YAAA,GAAG,IAAI;AACV,SAAA,CAAC;;AAGF,QAAA,MAAM,aAAa,GAAG;AAClB,YAAA,GAAG,EAAE,CAAC,QAAgB,KAA2B;gBAC7C,MAAM,UAAU,GAAGD,qCAAoB,EAAE,IAAI,IAAI,CAAC,QAAQ;AAC1D,gBAAA,MAAM,QAAQ,GAAG,CAAA,EAAG,QAAQ,CAAA,CAAA,EAAI,UAAU,EAAE;gBAE5C,IAAI,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAC5C,IAAI,CAAC,QAAQ,EAAE;;AAEX,oBAAA,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE;oBACjC,MAAM,QAAQ,GAAG,MAAM,EAAE,SAAS,IAAI,MAAM,EAAE,QAAQ;AACtD,oBAAA,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACzC,oBAAA,MAAM,OAAO,GAAG,YAAY,EAAE,OAAO,EAAE,IAAI;oBAE3C,IAAI,YAAY,GAAkB,IAAI;oBACtC,IAAI,OAAO,EAAE;wBACT,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC;oBACzD;oBAEA,IAAI,YAAY,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;wBAC7C,QAAQ,GAAG,IAAIF,gBAAS,CAAC;AACrB,4BAAA,QAAQ,EAAE,YAAY;AACtB,4BAAA,QAAQ,EAAE,IAAI;AACjB,yBAAA,CAAC;;AAGF,wBAAA,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE;AACxC,4BAAA,KAAK,EAAE,YAAY;AACnB,4BAAA,QAAQ,EAAE,KAAK;AACf,4BAAA,UAAU,EAAE,IAAI;AAChB,4BAAA,YAAY,EAAE,KAAK;AACtB,yBAAA,CAAC;AAEF,wBAAAI,aAAM,CAAC,KAAK,CACR,UAAU,EACV,CAAA,OAAA,EAAU,QAAQ,CAAA,6BAAA,EAAgC,YAAY,CAAA,WAAA,EAAc,UAAU,CAAA,CAAA,CAAG,CAC5F;wBACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC;AACvC,wBAAA,OAAO,QAAQ;oBACnB;yBAAO;;wBAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACtBC,kCAAmB,EAAE,EACrB,MAAM,EACN,SAAS,EACT,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAC1C;AAED,wBAAA,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;wBAE1CD,aAAM,CAAC,IAAI,CACP,UAAU,EACV,CAAA,OAAA,EAAU,QAAQ,CAAA,kGAAA,EAAqG,QAAQ,CAAA,EAAA,CAAI,CACtI;AACD,wBAAA,OAAO,SAAS;oBACpB;gBACJ;AACA,gBAAA,OAAO,QAAQ;YACnB,CAAC;SACJ;;AAGD,QAAA,IAAI,CAAC,OAAO,GAAG,aAAa;;AAG5B,QAAA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE;YACnC,KAAK,EAAE,IAAI,CAAC,OAAO;AACnB,YAAA,UAAU,EAAE,IAAI;AAChB,YAAA,QAAQ,EAAE,KAAK;AACf,YAAA,YAAY,EAAE,KAAK;AACtB,SAAA,CAAC;IACN;AAEA;;;;;;;AAOG;IACI,MAAM,KAAK,CAAC,EAAU,EAAA;AACzB,QAAA,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC5D;AAEA;;;;;;AAMG;IACI,IAAI,CAAC,OAAe,CAAC,EAAA;AACxB,QAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IACtB;IAEO,MAAM,GAAA;AACT,QAAA,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;IAC1B;IAEQ,WAAW,GAAA;AACf,QAAA,OAAOE,6BAAY,CAAC,IAAI,CAAC,YAAY,CAAC;IAC1C;IAEQ,YAAY,CAAC,GAAW,EAAE,WAAmB,EAAA;AACjD,QAAA,IAAI;AACA,YAAA,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE;AAC5C,YAAA,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBACzB,OAAO,IAAI,CAAC,OAAO,CACf,WAAW,EACX,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACpC;YACL;AACA,YAAA,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,IAAI,CAAC,OAAO,CACf,OAAO,CAAC,GAAG,EAAE,EACb,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACpC;YACL;AACA,YAAA,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAAE,gBAAA,OAAO,CAAC;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QACvC;AAAE,QAAA,MAAM;AACJ,YAAA,OAAO,IAAI;QACf;IACJ;AACH;AAGD;AACA,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;KACf,EAAE,GAAG,OAAO,CAAC,GAAG;;;AAKpC,IAAA,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;AAC9B,IAAA,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;AACjB,QAAA,IAAI;AACA,YAAA,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACrD,YAAA,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;AAC7B,gBAAA,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;YAC3C;QACJ;QAAE,OAAO,CAAC,EAAE;;QAEZ;IACJ;IAEA,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI;AAC3C,IAAA,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;;IAG7B,MAAM,QAAQ,GAAa,EAAE;IAC7B,IAAI,OAAO,GAAG,UAAU;AACxB,IAAA,OAAO,OAAO,KAAK,OAAO,EAAE;AACxB,QAAA,IAAIH,8BAAa,CAAC,OAAO,CAAC,EAAE;AACxB,YAAA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;QAC1B;AACA,QAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACnC;;AAGA,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACrB,QAAA,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC;IAC3B;SAAO;;QAEH,OAAO,GAAG,UAAU;AACpB,QAAA,OAAO,OAAO,KAAK,OAAO,EAAE;AACxB,YAAA,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE;gBACnD,SAAS,GAAG,OAAO;gBACnB;YACJ;AACA,YAAA,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACnC;IACJ;;AAGA,IAAA,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8C;;AAGzE,IAAA,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;QACjD,MAAM,OAAO,GAAuC,EAAE;AAEtD,QAAA,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AACxB,YAAA,MAAM,MAAM,GAAGI,yBAAY,CAAC,IAAI,CAAC;gBAC7B,IAAI,EAAE,CAAC,OAAO,CAAC;AACf,gBAAA,QAAQ,EAAE,IAAI;AACjB,aAAA,CAAC;AACF,YAAA,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAW;YACxC;QACJ;AACA,QAAA,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACzC;;AAGC,IAAA,UAAkB,CAACC,oBAAgB,CAAC,GAAG,WAAW;;IAGnD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE;IACnD,MAAM,WAAW,GAAG,QAAQ,CAAE,UAAkB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;AAEnE,IAAA,IAAI,CAAE,UAAkB,CAAC,OAAO,EAAE;AAC9B,QAAA,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;AAChC,YAAA,QAAQ,EAAE,SAAS;AACnB,YAAA,QAAQ,EAAE,WAAW;AACrB,YAAA,QAAQ,EAAE,WAAW;AACrB,YAAA,QAAQ,EAAG,UAAkB,CAAC,UAAU,CAAC,IAAI,aAAa;AAC7D,SAAA,CAAC;;;;;AAMF,QAAA,MAAM,WAAW,GAAGC,mCAAoB,CAAC,WAAW,CAAC;;AAGrD,QAAA,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE;AACzC,YAAA,KAAK,EAAE,WAAW;AAClB,YAAA,QAAQ,EAAE,KAAK;AACf,YAAA,UAAU,EAAE,IAAI;AAChB,YAAA,YAAY,EAAE,KAAK;AACtB,SAAA,CAAC;IACN;AACJ;AAEA;AACO,MAAM,OAAO,GAAI,UAAkB,CAAC;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["Configs"],"mappings":";;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACA,cAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACF,OAAe,EAAE,QAAQ;oBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,gBAAgB;gBACpB,YAAY,EAAE,CAAC,CAAC,YAAY;AAC5B,gBAAA,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;AAC5B,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,OAAO,EAAE,CAAC,CAAC,OAAc;AACzB,gBAAA,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;gBAClC,cAAc,EAAE,CAAC,CAAC,cAAc;AAChC,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,aAAa,EAAE,GAAG,CAAC,GAAG;AACtB,gBAAA,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ;AACxB,gBAAA,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,eAAe;aACpC;AAED,YAAA,MAAM,IAAI,GAAG,gBAAgB,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"NotFoundHandler.js","sources":["../../../../../src/server/handlers/NotFoundHandler.ts"],"sourcesContent":[null],"names":["Configs"],"mappings":";;;;;AAAA;;;;;AAKG;MAcU,eAAe,CAAA;AAGxB,IAAA,WAAA,GAAA;AAMA;;AAEG;AACI,QAAA,IAAA,CAAA,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,KAAU;AACnD,YAAA,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM;AACrB,YAAA,IAAI;gBACA,cAAc,CAAC,CAAC,CAAC;YACrB;YAAE,OAAO,KAAK,EAAE;AACZ,gBAAA,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAI/B,gBAAA,MAAM,KAAK;YACf;;;;;;;AASA,YAAA,MAAM,EAAE,GAAyB;gBAC7B,OAAO,EACF,OAAe,EAAE,QAAQ;oBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,gBAAgB;gBACpB,YAAY,EAAE,CAAC,CAAC,YAAY;AAC5B,gBAAA,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;AAC5B,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,OAAO,EAAE,CAAC,CAAC,OAAc;AACzB,gBAAA,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;gBAClC,cAAc,EAAE,CAAC,CAAC,cAAc;AAChC,gBAAA,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;gBAC9B,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,aAAa,EAAE,GAAG,CAAC,GAAG;AACtB,gBAAA,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,QAAQ;AACxB,gBAAA,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,eAAe;aACpC;AAED,YAAA,MAAM,IAAI,GAAG,gBAAgB,CAAC,EAAE,CAAC;YAEjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AAC9B,QAAA,CAAC;QAhDG,MAAM,MAAM,GAAGA,oBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE;AAE5C,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;IACxB;AA+CA;;AAEG;AACI,IAAA,YAAY,CAAC,SAAkC,EAAA;;AAElD,QAAAA,oBAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC;IACzC;AACH;AAED;;AAEG;AACG,SAAU,qBAAqB,CACjC,OAAsB,EAAA;IAEtB,MAAM,GAAG,GAAGA,oBAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IACnC,MAAM,EAAE,GAAGA,oBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAEzC,IAAA,MAAM,iBAAiB,GAAG,GAAG,EAAE,OAAO,KAAK,KAAK;IAEhD,IAAI,CAAC,iBAAiB,EAAE;AACpB,QAAA,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE;AACd,YAAA,MAAM,IAAI,KAAK,CACX,kHAAkH,CACrH;QACL;AACA,QAAA,OAAO,IAAI;IACf;IACA,OAAO,IAAI,eAAe,EAAE;AAChC;;;;"}
|
|
@@ -6,6 +6,7 @@ import { XY_XHSC_REGISTER_FS } from '../../xhsc/api/env/env.js';
|
|
|
6
6
|
import { getCallerProjectRoot } from '../../utils/ProjectDiscovery.js';
|
|
7
7
|
import { ConfigSyntaxParser } from '../../utils/ConfigSyntaxParser.js';
|
|
8
8
|
import { MetaConfigRunner } from './MetaConfigRunner.js';
|
|
9
|
+
import { JsonUtils } from '../../utils/JsonUtils.js';
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* XyPriss Configuration Loader
|
|
@@ -57,8 +58,7 @@ class ConfigLoader {
|
|
|
57
58
|
if (!this.sys.fs.exist(configPath))
|
|
58
59
|
return;
|
|
59
60
|
const rawContent = this.sys.fs.readSync(configPath);
|
|
60
|
-
const
|
|
61
|
-
const rawConfig = JSON.parse(cleanContent);
|
|
61
|
+
const rawConfig = JsonUtils.parse(rawContent);
|
|
62
62
|
// Load package.json if not already loaded
|
|
63
63
|
this.loadPackageJson(projectRoot);
|
|
64
64
|
logger.debug("server", `ConfigLoader: Resolving references for ${this.sys.path.basename(configPath)}`);
|
|
@@ -161,10 +161,6 @@ class ConfigLoader {
|
|
|
161
161
|
return null;
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
|
-
stripComments(content) {
|
|
165
|
-
const noComments = content.replace(/("(?:[^"\\]|\\.)*")|\/\/.*|\/\*[\s\S]*?\*\//g, (match, group1) => (group1 ? group1 : ""));
|
|
166
|
-
return noComments.replace(/("(?:[^"\\]|\\.)*")|,\s*([}\]])/g, (match, group1, group2) => (group1 ? group1 : group2));
|
|
167
|
-
}
|
|
168
164
|
loadPackageJson(root) {
|
|
169
165
|
if (this.packageJson)
|
|
170
166
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigLoader.js","sources":["../../../../../src/server/utils/ConfigLoader.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* JSON Utility Library
|
|
3
|
+
*
|
|
4
|
+
* Implements robust comment stripping and safe parsing for JSONC/JSON configuration files.
|
|
5
|
+
*/
|
|
6
|
+
class JsonUtils {
|
|
7
|
+
/**
|
|
8
|
+
* Strip single-line (//) and multi-line (/*) comments from a string content,
|
|
9
|
+
* while retaining strings and resolving trailing commas for JSON-compatibility.
|
|
10
|
+
*
|
|
11
|
+
* @param content - Raw JSONC content.
|
|
12
|
+
* @returns Sanitized standard JSON string.
|
|
13
|
+
*/
|
|
14
|
+
static stripComments(content) {
|
|
15
|
+
const noComments = content.replace(/("(?:[^"\\]|\\.)*")|\/\/.*|\/\*[\s\S]*?\*\//g, (match, group1) => (group1 ? group1 : ""));
|
|
16
|
+
return noComments.replace(/("(?:[^"\\]|\\.)*")|,\s*([}\]])/g, (match, group1, group2) => (group1 ? group1 : group2));
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Safely parse comments-enabled JSONC strings into JavaScript objects.
|
|
20
|
+
*
|
|
21
|
+
* @param content - Raw JSONC string.
|
|
22
|
+
* @returns Parsed object.
|
|
23
|
+
*/
|
|
24
|
+
static parse(content) {
|
|
25
|
+
const clean = this.stripComments(content);
|
|
26
|
+
return JSON.parse(clean);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export { JsonUtils };
|
|
31
|
+
//# sourceMappingURL=JsonUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JsonUtils.js","sources":["../../../../src/utils/JsonUtils.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;AAIG;MACU,SAAS,CAAA;AAClB;;;;;;AAMG;IACI,OAAO,aAAa,CAAC,OAAe,EAAA;QACvC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAC9B,8CAA8C,EAC9C,CAAC,KAAK,EAAE,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,CAC5C;QACD,OAAO,UAAU,CAAC,OAAO,CACrB,kCAAkC,EAClC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,CACxD;IACL;AAEA;;;;;AAKG;IACI,OAAO,KAAK,CAAU,OAAe,EAAA;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;AACzC,QAAA,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC5B;AACH;;;;"}
|
package/dist/esm/src/xhsc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xhsc.js","sources":["../../../src/xhsc.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":";;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"xhsc.js","sources":["../../../src/xhsc.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -54,9 +54,6 @@
|
|
|
54
54
|
"main": "./dist/cjs/src/index.js",
|
|
55
55
|
"module": "./dist/esm/src/index.js",
|
|
56
56
|
"name": "xypriss",
|
|
57
|
-
"peerDependencies": {
|
|
58
|
-
"react": ">=19.0.0"
|
|
59
|
-
},
|
|
60
57
|
"scripts": {
|
|
61
58
|
"benchmark": "node benchmarks/index.js",
|
|
62
59
|
"build": "NODE_OPTIONS='--max-old-space-size=4096' xfpm exec rollup -c rollup.config.js",
|
|
@@ -71,5 +68,6 @@
|
|
|
71
68
|
},
|
|
72
69
|
"type": "module",
|
|
73
70
|
"types": "./dist/index.d.ts",
|
|
74
|
-
"version": "9.10.
|
|
75
|
-
}
|
|
71
|
+
"version": "9.10.19"
|
|
72
|
+
}
|
|
73
|
+
|