@mcmcjs/julia 0.20.0 → 0.21.1

package/dist/index.d.cts

@@ -223,6 +223,16 @@ declare function resolveVersion(bin: string, channel: string, run: CommandRunner
     args: string[];
     version?: string;
 }>;
+/**
+ * Resolves a channel to the Julia that runs it: through juliaup when it is installed, and
+ * otherwise the `julia` on PATH when that is exactly the version asked for, as on a machine
+ * or notebook runtime that ships Julia without juliaup.
+ */
+declare function resolveJulia(channel: string, run: CommandRunner): Promise<{
+    command: string;
+    args: string[];
+    version?: string;
+}>;
 /** Throws with an actionable message if any requested channel is not installed. */
 declare function assertVersionsInstalled(channels: string[], installed: RuntimeVersion[]): void;
 
@@ -262,4 +272,4 @@ type StopOutcome = "stopped" | "stale" | "pending";
  */
 declare function stopWorker(socket: string): Promise<StopOutcome>;
 
-export { type DoctorReport, type FitIo, type InstallCommand, type LogLikIo, type MatrixEntry, type MatrixIo, type MatrixResult, type PackagePins, type PredictIo, type SetupOptions, type SetupResult, type SetupStep, type SetupStepResult, type StepStatus, type WorkerStatus, addVersion, assertVersionsInstalled, detectJulia, detectJuliaup, ensureProject, gcVersions, juliaEngine, juliaupInstallCommand, killWorker, listVersions, listWorkers, managedProjectDir, managedProjectReady, planSetup, predictData, removeVersion, resolveVersion, runDoctor, runFit, runFitAuto, runLogLik, runMatrix, runPredict, runSetup, setDefaultVersion, sharedTmpParent, stopWorker, updateVersion, validatePins, validateVersionString };
+export { type DoctorReport, type FitIo, type InstallCommand, type LogLikIo, type MatrixEntry, type MatrixIo, type MatrixResult, type PackagePins, type PredictIo, type SetupOptions, type SetupResult, type SetupStep, type SetupStepResult, type StepStatus, type WorkerStatus, addVersion, assertVersionsInstalled, detectJulia, detectJuliaup, ensureProject, gcVersions, juliaEngine, juliaupInstallCommand, killWorker, listVersions, listWorkers, managedProjectDir, managedProjectReady, planSetup, predictData, removeVersion, resolveJulia, resolveVersion, runDoctor, runFit, runFitAuto, runLogLik, runMatrix, runPredict, runSetup, setDefaultVersion, sharedTmpParent, stopWorker, updateVersion, validatePins, validateVersionString };

package/dist/index.d.ts

@@ -223,6 +223,16 @@ declare function resolveVersion(bin: string, channel: string, run: CommandRunner
     args: string[];
     version?: string;
 }>;
+/**
+ * Resolves a channel to the Julia that runs it: through juliaup when it is installed, and
+ * otherwise the `julia` on PATH when that is exactly the version asked for, as on a machine
+ * or notebook runtime that ships Julia without juliaup.
+ */
+declare function resolveJulia(channel: string, run: CommandRunner): Promise<{
+    command: string;
+    args: string[];
+    version?: string;
+}>;
 /** Throws with an actionable message if any requested channel is not installed. */
 declare function assertVersionsInstalled(channels: string[], installed: RuntimeVersion[]): void;
 
@@ -262,4 +272,4 @@ type StopOutcome = "stopped" | "stale" | "pending";
  */
 declare function stopWorker(socket: string): Promise<StopOutcome>;
 
-export { type DoctorReport, type FitIo, type InstallCommand, type LogLikIo, type MatrixEntry, type MatrixIo, type MatrixResult, type PackagePins, type PredictIo, type SetupOptions, type SetupResult, type SetupStep, type SetupStepResult, type StepStatus, type WorkerStatus, addVersion, assertVersionsInstalled, detectJulia, detectJuliaup, ensureProject, gcVersions, juliaEngine, juliaupInstallCommand, killWorker, listVersions, listWorkers, managedProjectDir, managedProjectReady, planSetup, predictData, removeVersion, resolveVersion, runDoctor, runFit, runFitAuto, runLogLik, runMatrix, runPredict, runSetup, setDefaultVersion, sharedTmpParent, stopWorker, updateVersion, validatePins, validateVersionString };
+export { type DoctorReport, type FitIo, type InstallCommand, type LogLikIo, type MatrixEntry, type MatrixIo, type MatrixResult, type PackagePins, type PredictIo, type SetupOptions, type SetupResult, type SetupStep, type SetupStepResult, type StepStatus, type WorkerStatus, addVersion, assertVersionsInstalled, detectJulia, detectJuliaup, ensureProject, gcVersions, juliaEngine, juliaupInstallCommand, killWorker, listVersions, listWorkers, managedProjectDir, managedProjectReady, planSetup, predictData, removeVersion, resolveJulia, resolveVersion, runDoctor, runFit, runFitAuto, runLogLik, runMatrix, runPredict, runSetup, setDefaultVersion, sharedTmpParent, stopWorker, updateVersion, validatePins, validateVersionString };

package/dist/index.js

@@ -866,6 +866,15 @@ async function resolveVersion(bin, channel, run) {
   }
   return { command: match.File, args: match.Args ?? [], version: match.Version };
 }
+async function resolveJulia(channel, run) {
+  const juliaup = await detectJuliaup(run);
+  if (juliaup.found && juliaup.path) return resolveVersion(juliaup.path, channel, run);
+  const julia = await detectJulia(run);
+  if (julia.found && julia.path && julia.version === channel) {
+    return { command: julia.path, args: [], version: julia.version };
+  }
+  throw new Error("juliaup not found. Run `mcmc setup` to install the Julia toolchain.");
+}
 function assertVersionsInstalled(channels, installed) {
   const have = new Set(installed.map((v) => v.id));
   const missing = channels.filter((c) => !have.has(c));
@@ -1223,6 +1232,7 @@ export {
   planSetup,
   predictData,
   removeVersion,
+  resolveJulia,
   resolveVersion,
   runDoctor,
   runFit,