@jsnw/srv-utils 1.0.7 → 1.0.9

package/dist/config/config-loader.js

@@ -7,7 +7,7 @@ const zod_1 = require("zod");
 const yaml_1 = require("yaml");
 const file_exists_1 = require("../file-exists");
 const getRootPackageDirname_1 = require("../getRootPackageDirname");
-const PKG_ROOT_REGEX = /^%pkgroot[\/\\]/i;
+const PKG_ROOT_REGEX = /^%pkgroot(?:[\/\\]|$)/i;
 class ConfigLoader {
     static _instance;
     /**
@@ -34,7 +34,7 @@ class ConfigLoader {
             console.error(loadError.message);
             process.exit(1);
         }
-        const [processedYaml, includeErrors] = loader.processIncludes(path, yaml);
+        const [processedYaml, includeErrors] = loader.processIncludes((0, node_path_1.dirname)(path), yaml);
         if (includeErrors && includeErrors.length > 0) {
             for (const err of includeErrors)
                 console.error(`$include error: ${err.message}`);
@@ -97,12 +97,12 @@ class ConfigLoader {
         return [parsed, null];
     }
     /**
-     * @param {string} mainYamlPath
+     * @param {string} mainYamlDirname
      * @param yaml
      * @returns {ErrorResult<any, Error[]>}
      * @protected
      */
-    processIncludes(mainYamlPath, yaml) {
+    processIncludes(mainYamlDirname, yaml) {
         if (typeof yaml !== 'object')
             return yaml;
         const nodesToVisit = [yaml], errors = [];
@@ -111,7 +111,7 @@ class ConfigLoader {
             if (typeof node !== 'object' || Array.isArray(node))
                 continue;
             if (node['$include'] && typeof node['$include'] === 'string') {
-                const [loadedYaml, loadError] = this.loadYamlFile((0, node_path_1.resolve)(mainYamlPath, node['$include']));
+                const [loadedYaml, loadError] = this.loadYamlFile(this.resolveIncludePath(mainYamlDirname, node['$include']));
                 delete node['$include'];
                 if (loadError) {
                     errors.push(loadError);
@@ -134,7 +134,16 @@ class ConfigLoader {
     resolvePkgRootPath(path) {
         if (PKG_ROOT_REGEX.test(path))
             path = path.replace(PKG_ROOT_REGEX, (0, getRootPackageDirname_1.getRootPackageDirnameSync)() + node_path_1.sep);
-        return path;
+        return (0, node_path_1.resolve)(path);
+    }
+    /**
+     * @param {string} fromDirname
+     * @param {string} toPath
+     * @returns {string}
+     * @private
+     */
+    resolveIncludePath(fromDirname, toPath) {
+        return (0, node_path_1.resolve)(this.resolvePkgRootPath(fromDirname), toPath);
     }
 }
 exports.ConfigLoader = ConfigLoader;

package/dist/types/config/config-loader.d.ts

@@ -33,11 +33,18 @@ export declare class ConfigLoader {
      */
     protected validateYaml<T extends z.ZodTypeAny>(data: any, schema: T): ErrorResult<z.infer<T>, Error>;
     /**
-     * @param {string} mainYamlPath
+     * @param {string} mainYamlDirname
      * @param yaml
      * @returns {ErrorResult<any, Error[]>}
      * @protected
      */
-    protected processIncludes(mainYamlPath: string, yaml: any): ErrorResult<any, Error[]>;
+    protected processIncludes(mainYamlDirname: string, yaml: any): ErrorResult<any, Error[]>;
     private resolvePkgRootPath;
+    /**
+     * @param {string} fromDirname
+     * @param {string} toPath
+     * @returns {string}
+     * @private
+     */
+    private resolveIncludePath;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsnw/srv-utils",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Server-side utilities for Node.js/TypeScript: tsconfig paths, Nest helpers, and config loading.",
   "main": "./dist/index.js",
   "types": "./dist/types/index.d.ts",