@markuplint/file-resolver 5.0.0-rc.0 → 5.0.0-rc.1

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-rc.1](https://github.com/markuplint/markuplint/compare/v5.0.0-rc.0...v5.0.0-rc.1) (2026-03-27)
+
+### Bug Fixes
+
+- **file-resolver:** handle ERR_PACKAGE_PATH_NOT_EXPORTED in generalImport ([d563d60](https://github.com/markuplint/markuplint/commit/d563d6000c4c38be54c17ea015b0f26c80c5229c)), closes [#3516](https://github.com/markuplint/markuplint/issues/3516)
+- **file-resolver:** resolve package subpaths before import to avoid runtime-specific errors ([cb2b641](https://github.com/markuplint/markuplint/commit/cb2b641e25cd9de487d395b6f219dd8b60ecd306))
+
 # [5.0.0-rc.0](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.3...v5.0.0-rc.0) (2026-03-12)
 
 ### Bug Fixes

package/lib/config-provider.js

@@ -2,8 +2,7 @@ import path from 'node:path';
 import { mergeConfig } from '@markuplint/ml-config';
 import { ConfigParserError } from '@markuplint/parser-utils';
 import { InvalidSelectorError, createSelector } from '@markuplint/selector';
-import { nonNullableFilter, toNoEmptyStringArrayFromStringOrArray } from '@markuplint/shared';
-import { ConfigLoadError } from './config-load-error.js';
+import { nonNullableFilter, toNoEmptyStringArrayFromStringOrArray, ConfigLoadError } from '@markuplint/shared';
 import { load as loadConfig, search } from './cosmiconfig.js';
 import { log } from './debug.js';
 import { generalImport } from './general-import.js';

package/lib/cosmiconfig.d.ts

@@ -1,5 +1,5 @@
 import type { LoaderSync } from 'cosmiconfig';
-import { ConfigLoadError } from './config-load-error.js';
+import { ConfigLoadError } from '@markuplint/shared';
 type CosmiConfig = ReturnType<LoaderSync>;
 export declare function search<T = CosmiConfig>(filePath: string, cacheClear: boolean): Promise<{
     filePath: string;

package/lib/cosmiconfig.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { ConfigParserError } from '@markuplint/parser-utils';
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
 import { jsonc } from 'jsonc';
-import { ConfigLoadError } from './config-load-error.js';
+import { ConfigLoadError } from '@markuplint/shared';
 import { log } from './debug.js';
 const searchLog = log.extend('search');
 const jsoncLoader = (path, content) => {

package/lib/general-import.js

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { isFatalError } from '@markuplint/shared';
 import { resolve } from 'import-meta-resolve';
 import { log } from './debug.js';
 import { fromFileURL } from './path-utils.js';
@@ -14,6 +15,17 @@ export async function generalImport(name) {
     if (cache.has(name)) {
         return cache.get(name);
     }
+    // When the specifier is a package subpath (e.g., "@scope/pkg/file.json"),
+    // the package's exports map may not include it. Instead of relying on
+    // error codes (which differ between Node.js and vitest/vite), resolve
+    // the package directory upfront and convert to an absolute path.
+    const resolved = resolvePackageSubpath(name);
+    if (resolved) {
+        gLog('Resolved package subpath "%s" to "%s"', name, resolved);
+        const result = await generalImport(resolved);
+        cache.set(name, result);
+        return result;
+    }
     try {
         // Convert absolute paths to file:// URL format
         let importPath = name;
@@ -64,14 +76,110 @@ export async function generalImport(name) {
             }
         }
         if (path.isAbsolute(name) && name.endsWith('.json')) {
-            const file = await fs.readFile(name, 'utf8');
-            const json = JSON.parse(file);
-            gLogSuccess('Success by readFile("%s") and JSON.parse: %O', name, json);
-            cache.set(name, json);
-            return json;
+            try {
+                const file = await fs.readFile(name, 'utf8');
+                const json = JSON.parse(file);
+                gLogSuccess('Success by readFile("%s") and JSON.parse: %O', name, json);
+                cache.set(name, json);
+                return json;
+            }
+            catch (readError) {
+                gLogError('Error in readFile("%s"): %O', name, readError);
+            }
         }
         gLogError('Error in `import()`: %O', error);
         cache.set(name, null);
         return null;
     }
 }
+/**
+ * Detects a bare package subpath specifier (e.g., `@scope/pkg/file.json`)
+ * and resolves it to an absolute file path when the package's exports map
+ * does not include the subpath.
+ *
+ * Returns the absolute path if resolution succeeds, or `null` if:
+ * - The specifier is not a package subpath (absolute path, relative path, no subpath)
+ * - The package's exports map already includes the subpath (no bypass needed)
+ * - The package cannot be found at all
+ */
+function resolvePackageSubpath(name) {
+    if (path.isAbsolute(name) || name.startsWith('.')) {
+        return null;
+    }
+    const packageName = name.startsWith('@') ? name.split('/').slice(0, 2).join('/') : name.split('/')[0];
+    if (!packageName) {
+        return null;
+    }
+    const subpath = name.slice(packageName.length + 1);
+    if (!subpath) {
+        return null;
+    }
+    const pkgDir = resolvePackageDir(packageName);
+    if (!pkgDir) {
+        return null;
+    }
+    try {
+        const pkgJson = require(path.join(pkgDir, 'package.json'));
+        if (!pkgJson.exports) {
+            return null; // No exports map — import() should work fine
+        }
+        // If the exports map explicitly includes this subpath, let import() handle it
+        const exportKey = `./${subpath}`;
+        if (typeof pkgJson.exports === 'object' && !Array.isArray(pkgJson.exports) && exportKey in pkgJson.exports) {
+            return null;
+        }
+        // Subpath not in exports — resolve to absolute path to bypass the restriction
+        return path.join(pkgDir, subpath);
+    }
+    catch (error) {
+        if (isFatalError(error)) {
+            throw error;
+        }
+        return null;
+    }
+}
+/**
+ * Resolves the root directory of a package by name.
+ */
+function resolvePackageDir(packageName) {
+    // Try CJS require.resolve first — it can often resolve package.json
+    // even when the ESM exports map doesn't include it
+    try {
+        return path.dirname(require.resolve(`${packageName}/package.json`));
+    }
+    catch (error) {
+        if (isFatalError(error)) {
+            throw error;
+        }
+        // Fall through
+    }
+    // Fall back to import-meta-resolve to find the main entry, then walk up
+    try {
+        const mainUrl = resolve(packageName, import.meta.url);
+        const mainPath = mainUrl.startsWith('file:') ? fromFileURL(mainUrl) : mainUrl;
+        let dir = path.dirname(mainPath);
+        for (let i = 0; i < 10; i++) {
+            try {
+                require(path.join(dir, 'package.json'));
+                return dir;
+            }
+            catch (innerError) {
+                if (isFatalError(innerError)) {
+                    throw innerError;
+                }
+                const parent = path.dirname(dir);
+                if (parent === dir) {
+                    break; // Reached filesystem root
+                }
+                dir = parent;
+            }
+        }
+    }
+    catch (error) {
+        if (isFatalError(error)) {
+            throw error;
+        }
+        // Package not found at all
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "5.0.0-rc.0",
+	"version": "5.0.0-rc.1",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -30,15 +30,15 @@
 		"@types/node": "24.5.1"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "5.0.0-rc.0",
-		"@markuplint/ml-ast": "5.0.0-rc.0",
-		"@markuplint/ml-config": "5.0.0-rc.0",
-		"@markuplint/ml-core": "5.0.0-rc.0",
-		"@markuplint/ml-spec": "5.0.0-rc.0",
-		"@markuplint/parser-utils": "5.0.0-rc.0",
-		"@markuplint/pretenders": "5.0.0-rc.0",
-		"@markuplint/selector": "5.0.0-rc.0",
-		"@markuplint/shared": "5.0.0-rc.0",
+		"@markuplint/html-parser": "5.0.0-rc.1",
+		"@markuplint/ml-ast": "5.0.0-rc.1",
+		"@markuplint/ml-config": "5.0.0-rc.1",
+		"@markuplint/ml-core": "5.0.0-rc.1",
+		"@markuplint/ml-spec": "5.0.0-rc.1",
+		"@markuplint/parser-utils": "5.0.0-rc.1",
+		"@markuplint/pretenders": "5.0.0-rc.1",
+		"@markuplint/selector": "5.0.0-rc.1",
+		"@markuplint/shared": "5.0.0-rc.1",
 		"cosmiconfig": "9.0.1",
 		"debug": "4.4.3",
 		"glob": "13.0.6",
@@ -47,5 +47,5 @@
 		"jsonc": "2.0.0",
 		"minimatch": "10.2.4"
 	},
-	"gitHead": "ebf4d7cfca0c259aead3b292c6b8a202db4cd802"
+	"gitHead": "0d6b4324d9a7d6b9e1ba57d4a57e45d36975cba9"
 }

package/lib/config-load-error.d.ts

@@ -1,6 +0,0 @@
-export declare class ConfigLoadError extends Error {
-    filePath: string;
-    name: string;
-    referrer: string;
-    constructor(message: string, filePath: string, referrer: string);
-}

package/lib/config-load-error.js

@@ -1,10 +0,0 @@
-export class ConfigLoadError extends Error {
-    filePath;
-    name = 'ConfigLoadError';
-    referrer;
-    constructor(message, filePath, referrer) {
-        super(message + ` in ${referrer}`);
-        this.filePath = filePath;
-        this.referrer = referrer;
-    }
-}