@contrast/esm-hooks 2.0.3 → 2.1.1

package/lib/get-file-type.mjs

@@ -13,10 +13,11 @@
  * way not consistent with the End User License Agreement.
  */
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'path';
 import M from 'module';
 
+import { findPackageJsonSync } from '@contrast/find-package-json';
+
 const isBuiltin = M.isBuiltin || function(pathname) {
   if (pathname.startsWith('node:')) {
     pathname = pathname.slice(5);
@@ -54,14 +55,17 @@ export function getFileType(filename) {
     return 'commonjs';
   }
 
-  // Node assumes `commonjs ` if there's no `type` set in package.json
+  // Node assumes `commonjs` if `type` is not set in package.json
   let parentType = 'commonjs';
   try {
-    let pkg = parent(pathname);
+    // should this have stopAt set at the application root? do we know what the
+    // root of the application is?
+    const pkg = findPackageJsonSync({ cwd: fixPath(path.dirname(pathname)) });
     if (pkg) {
-      pkg = pkg.parse();
-      if (pkg.type) {
-        parentType = pkg.type;
+      let json = fs.readFileSync(pkg, 'utf8');
+      json = JSON.parse(json);
+      if (json.type) {
+        parentType = json.type;
       }
     }
   } catch (err) {
@@ -75,54 +79,3 @@ export function getFileType(filename) {
   // should this assume commonjs?
   return null;
 }
-
-function parent(startPath, ignore) {
-  startPath = path.resolve(fixPath(startPath) || process.cwd());
-  ignore = ignore || 0;
-
-  let searchPath = path.dirname(startPath);
-
-  let root = '/';
-  if (os.platform() === 'win32') {
-    root = path.parse(startPath).root;
-  }
-
-  let packageDotJsonContents;
-
-  // put a limit on this though i think that for(;;) will work fine.
-  for (let i = 100; i > 0; i -= 1) {
-    try {
-      const possible = path.join(searchPath, 'package.json');
-      packageDotJsonContents = fs.readFileSync(possible, 'utf8');
-      if (ignore > 0) {
-        ignore--;
-      } else {
-        break;
-      }
-    } catch (err) {
-      if (err.code !== 'ENOENT') {
-        // log?
-      }
-    }
-
-    // if root there is nothing more to check
-    if (searchPath === root) {
-      break;
-    }
-    searchPath = path.dirname(searchPath);
-  }
-
-  if (packageDotJsonContents) {
-    return {
-      read() {
-        return packageDotJsonContents;
-      },
-      parse() {
-        return JSON.parse(packageDotJsonContents);
-      },
-      path: searchPath,
-    };
-  }
-
-  return null;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/esm-hooks",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "type": "module",
   "description": "Support for loading and instrumenting ECMAScript modules",
   "license": "SEE LICENSE IN LICENSE",
@@ -19,6 +19,7 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/core": "1.27.2"
+    "@contrast/core": "1.28.0",
+    "@contrast/find-package-json": "^1.0.0"
   }
 }