Fix circular dependency in get-format

wooorm · Mar 6, 2023 · a764973 · a764973
1 parent cf9de89
commit a764973
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/lib/get-format.js b/lib/get-format.js
@@ -4,7 +4,7 @@
 
 import path from 'node:path'
 import {URL, fileURLToPath} from 'node:url'
-import {getPackageType} from './resolve.js'
+import {getPackageType} from './package-type.js'
 import {codes} from './errors.js'
 
 const {ERR_UNKNOWN_FILE_EXTENSION} = codes

diff --git a/lib/package-type.js b/lib/package-type.js
@@ -0,0 +1,14 @@
+import {getPackageScopeConfig} from './package-config.js'
+
+/**
+ * @typedef {import('./package-config.js').PackageType} PackageType
+ */
+
+/**
+ * @param {URL} url
+ * @returns {PackageType}
+ */
+export function getPackageType(url) {
+  const packageConfig = getPackageScopeConfig(url)
+  return packageConfig.type
+}
diff --git a/lib/resolve.js b/lib/resolve.js
@@ -5,7 +5,6 @@
 /**
  * @typedef {import('./errors.js').ErrnoException} ErrnoException
  * @typedef {import('./package-config.js').PackageConfig} PackageConfig
- * @typedef {import('./package-config.js').PackageType} PackageType
  */
 
 import assert from 'node:assert'
@@ -883,15 +882,6 @@ function packageImportsResolve(name, base, conditions) {
   throw importNotDefined(name, packageJsonUrl, base)
 }
 
-/**
- * @param {URL} url
- * @returns {PackageType}
- */
-export function getPackageType(url) {
-  const packageConfig = getPackageScopeConfig(url)
-  return packageConfig.type
-}
-
 /**
  * @param {string} specifier
  * @param {URL} base