@sanity/cli-core 1.1.0 → 1.1.1

package/dist/index.d.ts

@@ -980,6 +980,52 @@ export declare function resolveLocalPackage<T = unknown>(
   workDir: string,
 ): Promise<T>;
 
+/**
+ * Resolves and imports a package relative to another resolved module URL.
+ * Useful for resolving transitive dependencies that may not be directly
+ * accessible from the project root (e.g., in pnpm strict mode).
+ *
+ * @param packageName - The name of the package to resolve
+ * @param parentUrl - The URL of the parent module to resolve from
+ * @returns The imported module
+ * @throws If the package cannot be resolved or imported
+ *
+ * @example
+ * ```ts
+ * const sanityUrl = resolveLocalPackagePath('sanity', workDir)
+ * const ui = await resolveLocalPackageFrom<typeof import('@sanity/ui')>('@sanity/ui', sanityUrl)
+ * ```
+ *
+ * @internal
+ */
+export declare function resolveLocalPackageFrom<T = unknown>(
+  packageName: string,
+  parentUrl: URL,
+): Promise<T>;
+
+/**
+ * Resolves the URL of a package from the local project's node_modules,
+ * relative to the given working directory, without importing it.
+ *
+ * @param packageName - The name of the package to resolve (e.g., 'sanity')
+ * @param workDir - The working directory to resolve the package from
+ * @returns The resolved URL of the package entry point
+ * @throws If the package cannot be resolved
+ *
+ * @example
+ * ```ts
+ * // Resolve a transitive dependency via its parent package:
+ * const sanityUrl = resolveLocalPackagePath('sanity', workDir)
+ * const uiUrl = resolveLocalPackagePathFrom('@sanity/ui', sanityUrl)
+ * ```
+ *
+ * @internal
+ */
+export declare function resolveLocalPackagePath(
+  packageName: string,
+  workDir: string,
+): URL;
+
 /**
  * `structuredClone()`, but doesn't throw on non-clonable values - instead it drops them.
  *

package/dist/util/resolveLocalPackage.js

@@ -19,15 +19,59 @@ import { doImport } from './doImport.js';
  *
  * @internal
  */ export async function resolveLocalPackage(packageName, workDir) {
-    // Create a fake cli config URL - doesn't have to be correct, just need the root path
-    // This ensures we resolve packages relative to the user's repo, not the CLI package
+    const packageUrl = resolveLocalPackagePath(packageName, workDir);
+    const module = await doImport(packageUrl.href);
+    return module;
+}
+/**
+ * Resolves the URL of a package from the local project's node_modules,
+ * relative to the given working directory, without importing it.
+ *
+ * @param packageName - The name of the package to resolve (e.g., 'sanity')
+ * @param workDir - The working directory to resolve the package from
+ * @returns The resolved URL of the package entry point
+ * @throws If the package cannot be resolved
+ *
+ * @example
+ * ```ts
+ * // Resolve a transitive dependency via its parent package:
+ * const sanityUrl = resolveLocalPackagePath('sanity', workDir)
+ * const uiUrl = resolveLocalPackagePathFrom('@sanity/ui', sanityUrl)
+ * ```
+ *
+ * @internal
+ */ export function resolveLocalPackagePath(packageName, workDir) {
     const fakeCliConfigUrl = pathToFileURL(resolve(workDir, 'sanity.cli.mjs'));
     try {
-        const packageUrl = moduleResolve(packageName, fakeCliConfigUrl);
+        return moduleResolve(packageName, fakeCliConfigUrl);
+    } catch (error) {
+        throw new Error(`Failed to resolve package "${packageName}" from "${workDir}": ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+/**
+ * Resolves and imports a package relative to another resolved module URL.
+ * Useful for resolving transitive dependencies that may not be directly
+ * accessible from the project root (e.g., in pnpm strict mode).
+ *
+ * @param packageName - The name of the package to resolve
+ * @param parentUrl - The URL of the parent module to resolve from
+ * @returns The imported module
+ * @throws If the package cannot be resolved or imported
+ *
+ * @example
+ * ```ts
+ * const sanityUrl = resolveLocalPackagePath('sanity', workDir)
+ * const ui = await resolveLocalPackageFrom<typeof import('@sanity/ui')>('@sanity/ui', sanityUrl)
+ * ```
+ *
+ * @internal
+ */ export async function resolveLocalPackageFrom(packageName, parentUrl) {
+    try {
+        const packageUrl = moduleResolve(packageName, parentUrl);
         const module = await doImport(packageUrl.href);
         return module;
     } catch (error) {
-        throw new Error(`Failed to resolve package "${packageName}" from "${workDir}": ${error instanceof Error ? error.message : String(error)}`);
+        throw new Error(`Failed to resolve package "${packageName}" from "${parentUrl.href}": ${error instanceof Error ? error.message : String(error)}`);
     }
 }
 

package/dist/util/resolveLocalPackage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/resolveLocalPackage.ts"],"sourcesContent":["import {resolve} from 'node:path'\nimport {pathToFileURL} from 'node:url'\n\nimport {moduleResolve} from 'import-meta-resolve'\n\nimport {doImport} from './doImport.js'\n\n/**\n * Resolves and imports a package from the local project's node_modules,\n * relative to the given working directory. This avoids circular dependencies\n * and ensures the correct version of the package is used.\n *\n * @param packageName - The name of the package to resolve (e.g., 'sanity')\n * @param workDir - The working directory to resolve the package from\n * @returns The imported module\n * @throws If the package cannot be resolved or imported\n *\n * @example\n * ```ts\n * const {createSchema} = await resolveLocalPackage('sanity', workDir)\n * ```\n *\n * @internal\n */\nexport async function resolveLocalPackage<T = unknown>(\n  packageName: string,\n  workDir: string,\n): Promise<T> {\n  // Create a fake cli config URL - doesn't have to be correct, just need the root path\n  // This ensures we resolve packages relative to the user's repo, not the CLI package\n  const fakeCliConfigUrl = pathToFileURL(resolve(workDir, 'sanity.cli.mjs'))\n\n  try {\n    const packageUrl = moduleResolve(packageName, fakeCliConfigUrl)\n    const module = await doImport(packageUrl.href)\n    return module as T\n  } catch (error) {\n    throw new Error(\n      `Failed to resolve package \"${packageName}\" from \"${workDir}\": ${error instanceof Error ? error.message : String(error)}`,\n    )\n  }\n}\n"],"names":["resolve","pathToFileURL","moduleResolve","doImport","resolveLocalPackage","packageName","workDir","fakeCliConfigUrl","packageUrl","module","href","error","Error","message","String"],"mappings":"AAAA,SAAQA,OAAO,QAAO,YAAW;AACjC,SAAQC,aAAa,QAAO,WAAU;AAEtC,SAAQC,aAAa,QAAO,sBAAqB;AAEjD,SAAQC,QAAQ,QAAO,gBAAe;AAEtC;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,eAAeC,oBACpBC,WAAmB,EACnBC,OAAe;IAEf,qFAAqF;IACrF,oFAAoF;IACpF,MAAMC,mBAAmBN,cAAcD,QAAQM,SAAS;IAExD,IAAI;QACF,MAAME,aAAaN,cAAcG,aAAaE;QAC9C,MAAME,SAAS,MAAMN,SAASK,WAAWE,IAAI;QAC7C,OAAOD;IACT,EAAE,OAAOE,OAAO;QACd,MAAM,IAAIC,MACR,CAAC,2BAA2B,EAAEP,YAAY,QAAQ,EAAEC,QAAQ,GAAG,EAAEK,iBAAiBC,QAAQD,MAAME,OAAO,GAAGC,OAAOH,QAAQ;IAE7H;AACF"}
+{"version":3,"sources":["../../src/util/resolveLocalPackage.ts"],"sourcesContent":["import {resolve} from 'node:path'\nimport {pathToFileURL} from 'node:url'\n\nimport {moduleResolve} from 'import-meta-resolve'\n\nimport {doImport} from './doImport.js'\n\n/**\n * Resolves and imports a package from the local project's node_modules,\n * relative to the given working directory. This avoids circular dependencies\n * and ensures the correct version of the package is used.\n *\n * @param packageName - The name of the package to resolve (e.g., 'sanity')\n * @param workDir - The working directory to resolve the package from\n * @returns The imported module\n * @throws If the package cannot be resolved or imported\n *\n * @example\n * ```ts\n * const {createSchema} = await resolveLocalPackage('sanity', workDir)\n * ```\n *\n * @internal\n */\nexport async function resolveLocalPackage<T = unknown>(\n  packageName: string,\n  workDir: string,\n): Promise<T> {\n  const packageUrl = resolveLocalPackagePath(packageName, workDir)\n  const module = await doImport(packageUrl.href)\n  return module as T\n}\n\n/**\n * Resolves the URL of a package from the local project's node_modules,\n * relative to the given working directory, without importing it.\n *\n * @param packageName - The name of the package to resolve (e.g., 'sanity')\n * @param workDir - The working directory to resolve the package from\n * @returns The resolved URL of the package entry point\n * @throws If the package cannot be resolved\n *\n * @example\n * ```ts\n * // Resolve a transitive dependency via its parent package:\n * const sanityUrl = resolveLocalPackagePath('sanity', workDir)\n * const uiUrl = resolveLocalPackagePathFrom('@sanity/ui', sanityUrl)\n * ```\n *\n * @internal\n */\nexport function resolveLocalPackagePath(packageName: string, workDir: string): URL {\n  const fakeCliConfigUrl = pathToFileURL(resolve(workDir, 'sanity.cli.mjs'))\n\n  try {\n    return moduleResolve(packageName, fakeCliConfigUrl)\n  } catch (error) {\n    throw new Error(\n      `Failed to resolve package \"${packageName}\" from \"${workDir}\": ${error instanceof Error ? error.message : String(error)}`,\n    )\n  }\n}\n\n/**\n * Resolves and imports a package relative to another resolved module URL.\n * Useful for resolving transitive dependencies that may not be directly\n * accessible from the project root (e.g., in pnpm strict mode).\n *\n * @param packageName - The name of the package to resolve\n * @param parentUrl - The URL of the parent module to resolve from\n * @returns The imported module\n * @throws If the package cannot be resolved or imported\n *\n * @example\n * ```ts\n * const sanityUrl = resolveLocalPackagePath('sanity', workDir)\n * const ui = await resolveLocalPackageFrom<typeof import('@sanity/ui')>('@sanity/ui', sanityUrl)\n * ```\n *\n * @internal\n */\nexport async function resolveLocalPackageFrom<T = unknown>(\n  packageName: string,\n  parentUrl: URL,\n): Promise<T> {\n  try {\n    const packageUrl = moduleResolve(packageName, parentUrl)\n    const module = await doImport(packageUrl.href)\n    return module as T\n  } catch (error) {\n    throw new Error(\n      `Failed to resolve package \"${packageName}\" from \"${parentUrl.href}\": ${error instanceof Error ? error.message : String(error)}`,\n    )\n  }\n}\n"],"names":["resolve","pathToFileURL","moduleResolve","doImport","resolveLocalPackage","packageName","workDir","packageUrl","resolveLocalPackagePath","module","href","fakeCliConfigUrl","error","Error","message","String","resolveLocalPackageFrom","parentUrl"],"mappings":"AAAA,SAAQA,OAAO,QAAO,YAAW;AACjC,SAAQC,aAAa,QAAO,WAAU;AAEtC,SAAQC,aAAa,QAAO,sBAAqB;AAEjD,SAAQC,QAAQ,QAAO,gBAAe;AAEtC;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,eAAeC,oBACpBC,WAAmB,EACnBC,OAAe;IAEf,MAAMC,aAAaC,wBAAwBH,aAAaC;IACxD,MAAMG,SAAS,MAAMN,SAASI,WAAWG,IAAI;IAC7C,OAAOD;AACT;AAEA;;;;;;;;;;;;;;;;;CAiBC,GACD,OAAO,SAASD,wBAAwBH,WAAmB,EAAEC,OAAe;IAC1E,MAAMK,mBAAmBV,cAAcD,QAAQM,SAAS;IAExD,IAAI;QACF,OAAOJ,cAAcG,aAAaM;IACpC,EAAE,OAAOC,OAAO;QACd,MAAM,IAAIC,MACR,CAAC,2BAA2B,EAAER,YAAY,QAAQ,EAAEC,QAAQ,GAAG,EAAEM,iBAAiBC,QAAQD,MAAME,OAAO,GAAGC,OAAOH,QAAQ;IAE7H;AACF;AAEA;;;;;;;;;;;;;;;;;CAiBC,GACD,OAAO,eAAeI,wBACpBX,WAAmB,EACnBY,SAAc;IAEd,IAAI;QACF,MAAMV,aAAaL,cAAcG,aAAaY;QAC9C,MAAMR,SAAS,MAAMN,SAASI,WAAWG,IAAI;QAC7C,OAAOD;IACT,EAAE,OAAOG,OAAO;QACd,MAAM,IAAIC,MACR,CAAC,2BAA2B,EAAER,YAAY,QAAQ,EAAEY,UAAUP,IAAI,CAAC,GAAG,EAAEE,iBAAiBC,QAAQD,MAAME,OAAO,GAAGC,OAAOH,QAAQ;IAEpI;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli-core",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Sanity CLI core package",
   "keywords": [
     "cli",
@@ -87,8 +87,8 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
     "@repo/package.config": "0.0.1",
-    "@sanity/eslint-config-cli": "1.0.0",
-    "@repo/tsconfig": "3.70.0"
+    "@repo/tsconfig": "3.70.0",
+    "@sanity/eslint-config-cli": "1.0.0"
   },
   "peerDependencies": {
     "@sanity/telemetry": ">=0.8.1 <0.9.0"