pyfig 0.6.2 → 0.7.0

package/dist/{virtual-environment.js → python-venv.js}

@@ -1,21 +1,24 @@
 import fs from 'node:fs';
 import path from 'node:path';
-export const VIRTUAL_ENV_DIRECTORY_NAME = path.join('node_modules', '.pyfig', 'venv');
-export function virtualEnvironmentDirectory(projectRoot) {
-    return path.join(projectRoot, VIRTUAL_ENV_DIRECTORY_NAME);
+export const VIRTUAL_ENV_ROOT_NAME = path.join('node_modules', '.pyfig', 'venvs');
+export function pythonVenvRoot(projectRoot) {
+    return path.join(projectRoot, VIRTUAL_ENV_ROOT_NAME);
+}
+export function pythonVenvDirectory(projectRoot, venvDirectory) {
+    return path.join(pythonVenvRoot(projectRoot), venvDirectory);
 }
 /** Existing application environments are eligible for read-only reuse. */
-export function externalVirtualEnvironmentDirectories(projectRoot, env) {
+export function externalPythonVenvDirectories(projectRoot, env) {
     const candidates = [env['VIRTUAL_ENV'], path.join(projectRoot, '.venv')]
         .filter((value) => Boolean(value))
         .map((value) => path.resolve(value));
     return [...new Map(candidates.map((value) => [canonicalPath(value), value])).values()];
 }
-export function virtualEnvironmentPythonExecutable(virtualEnvironment) {
-    return path.join(virtualEnvironment, process.platform === 'win32' ? 'Scripts' : 'bin', process.platform === 'win32' ? 'python.exe' : 'python');
+export function pythonVenvExecutable(pythonVenv) {
+    return path.join(pythonVenv, process.platform === 'win32' ? 'Scripts' : 'bin', process.platform === 'win32' ? 'python.exe' : 'python');
 }
 /** Apply the environment changes that shell activation scripts make for child processes. */
-export function activateVirtualEnvironment(env, virtualEnvironment, pythonExecutable) {
+export function activatePythonVenv(env, pythonVenv, pythonExecutable) {
     const activated = { ...env };
     const pathEntry = Object.keys(activated).find((key) => key.toUpperCase() === 'PATH');
     const existingPath = pathEntry ? activated[pathEntry] : undefined;
@@ -28,7 +31,7 @@ export function activateVirtualEnvironment(env, virtualEnvironment, pythonExecut
     activated['PATH'] = [path.dirname(pythonExecutable), existingPath]
         .filter((value) => Boolean(value))
         .join(path.delimiter);
-    activated['VIRTUAL_ENV'] = virtualEnvironment;
+    activated['VIRTUAL_ENV'] = pythonVenv;
     return activated;
 }
 export function pathsEqual(left, right) {
@@ -46,4 +49,4 @@ export function canonicalPath(value) {
     }
     return process.platform === 'win32' ? canonical.toLowerCase() : canonical;
 }
-//# sourceMappingURL=virtual-environment.js.map
+//# sourceMappingURL=python-venv.js.map

package/dist/python-venv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"python-venv.js","sourceRoot":"","sources":["../src/python-venv.ts"],"names":[],"mappings":"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"}

package/dist/runners.js

@@ -1,17 +1,17 @@
 import { spawn, spawnSync, } from 'node:child_process';
-import { resolveOptions, uvEnvironment, } from './config.js';
-import { targetUvArguments, uvCommandEnvironment, uvCommandNeedsEnvironment, } from './package-target.js';
-import { ensureEnvironment, ensureUv } from './provision.js';
+import { resolveOptions, uvProcessEnvironment, } from './config.js';
+import { targetUvArguments, uvCommandNeedsPython, uvCommandProcessEnvironment, } from './package-target.js';
+import { ensurePython, ensureUv } from './provision.js';
 import { runtimeFile } from './runtime-files.js';
 /** Run uv, pinning uv pip and uv run to Pyfig's selected environment. */
 export async function uvSpawn(args = [], spawnOptions = {}, pyfigOptions = {}) {
     const options = optionsForInvocation(pyfigOptions, spawnOptions.env);
     const resolved = resolveOptions(options);
-    const environment = uvCommandNeedsEnvironment(args)
-        ? await ensureEnvironment(resolved)
+    const python = uvCommandNeedsPython(args)
+        ? await ensurePython(resolved)
         : undefined;
-    const uv = environment?.uv ?? await ensureUv(resolved);
-    const command = buildUvCommand(uv, args, resolved, environment?.python);
+    const uv = python?.uv ?? await ensureUv(resolved);
+    const command = buildUvCommand(uv, args, resolved, python?.python);
     return spawn(command.executable, command.args, {
         ...spawnOptions,
         env: command.env,
@@ -21,11 +21,11 @@ export async function uvSpawn(args = [], spawnOptions = {}, pyfigOptions = {}) {
 export function uvSpawnSync(args = [], spawnOptions = {}, pyfigOptions = {}) {
     const options = optionsForInvocation(pyfigOptions, spawnOptions.env);
     const resolved = resolveOptions(options);
-    const environment = uvCommandNeedsEnvironment(args)
-        ? resolveSynchronously('environment', resolved)
+    const python = uvCommandNeedsPython(args)
+        ? resolveSynchronously('python', resolved)
         : undefined;
-    const uv = environment?.uv ?? resolveSynchronously('uv', resolved);
-    const command = buildUvCommand(uv, args, resolved, environment?.python);
+    const uv = python?.uv ?? resolveSynchronously('uv', resolved);
+    const command = buildUvCommand(uv, args, resolved, python?.python);
     return spawnSync(command.executable, command.args, {
         ...spawnOptions,
         env: command.env,
@@ -35,7 +35,7 @@ export function buildUvCommand(uv, args, options, python) {
     return {
         executable: uv.executable,
         args: python ? targetUvArguments(args, python) : [...args],
-        env: uvCommandEnvironment(uvEnvironment(options), python),
+        env: uvCommandProcessEnvironment(uvProcessEnvironment(options), python),
     };
 }
 function optionsForInvocation(pyfigOptions, spawnEnv) {

package/dist/runners.js.map

@@ -1 +1 @@
-{"version":3,"file":"runners.js","sourceRoot":"","sources":["../src/runners.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runners.js","sourceRoot":"","sources":["../src/runners.ts"],"names":[],"mappings":"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"}

package/dist/sync-resolver.js

@@ -1,10 +1,10 @@
 import { readFileSync } from 'node:fs';
-import { ensureEnvironment, ensureUv } from './provision.js';
+import { ensurePython, ensureUv } from './provision.js';
 async function main() {
     const request = JSON.parse(readFileSync(0, 'utf8'));
     const result = request.target === 'uv'
         ? await ensureUv(request.options)
-        : await ensureEnvironment(request.options);
+        : await ensurePython(request.options);
     process.stdout.write(JSON.stringify(result));
 }
 main().catch((error) => {

package/dist/sync-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-resolver.js","sourceRoot":"","sources":["../src/sync-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO7D,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAA0B,CAAC;IAC7E,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,IAAI;QACpC,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QACjC,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"sync-resolver.js","sourceRoot":"","sources":["../src/sync-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAOxD,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAA0B,CAAC;IAC7E,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,IAAI;QACpC,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QACjC,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}

package/dist/venv-identity.d.ts

@@ -0,0 +1,36 @@
+import type { PythonInfo } from './probes.js';
+export declare const VENV_SCHEMA = 1;
+export declare const VENV_METADATA = ".pyfig-venv.json";
+export interface VenvContract {
+    schema: typeof VENV_SCHEMA;
+    runtime: {
+        architecture: string;
+        platform: NodeJS.Platform;
+    };
+    python: {
+        architecture: string;
+        baseExecutable: string;
+        basePrefix: string;
+        embeddingHeader: string | null;
+        embeddingLibrary: string | null;
+        gilDisabled: boolean;
+        implementation: string;
+        pointerBits: number;
+        version: string;
+    };
+    requirementsSha256: string;
+}
+export interface VenvIdentity {
+    contract: VenvContract;
+    directoryName: string;
+    id: string;
+}
+/** Derive one stable venv identity from its interpreter and exact resolution. */
+export declare function createVenvIdentity(python: PythonInfo, requirementsSha256: string): VenvIdentity;
+export declare function requirementsDigest(content: string): string;
+export declare function venvMetadataFile(directory: string): string;
+/** Metadata is the publication marker; an environment without it is incomplete. */
+export declare function venvMatches(directory: string, venv: VenvIdentity): Promise<boolean>;
+/** Publish the venv marker atomically after creation and installation succeed. */
+export declare function writeVenvMetadata(directory: string, venv: VenvIdentity): Promise<void>;
+//# sourceMappingURL=venv-identity.d.ts.map

package/dist/venv-identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"venv-identity.d.ts","sourceRoot":"","sources":["../src/venv-identity.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,eAAO,MAAM,WAAW,IAAI,CAAC;AAC7B,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,OAAO,WAAW,CAAC;IAC3B,OAAO,EAAE;QACP,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;KAC3B,CAAC;IACF,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,WAAW,EAAE,OAAO,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;CACZ;AAOD,iFAAiF;AACjF,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,UAAU,EAClB,kBAAkB,EAAE,MAAM,GACzB,YAAY,CA4Bd;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,mFAAmF;AACnF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,kFAAkF;AAClF,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAiBf"}

package/dist/venv-identity.js

@@ -0,0 +1,80 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { canonicalPath } from './python-venv.js';
+export const VENV_SCHEMA = 1;
+export const VENV_METADATA = '.pyfig-venv.json';
+/** Derive one stable venv identity from its interpreter and exact resolution. */
+export function createVenvIdentity(python, requirementsSha256) {
+    const contract = {
+        schema: VENV_SCHEMA,
+        runtime: {
+            architecture: process.arch,
+            platform: process.platform,
+        },
+        python: {
+            architecture: python.architecture,
+            baseExecutable: canonicalPath(python.executable),
+            basePrefix: canonicalPath(python.basePrefix),
+            embeddingHeader: python.embedding ? canonicalPath(python.embedding.headerPath) : null,
+            embeddingLibrary: python.embedding ? canonicalPath(python.embedding.libraryPath) : null,
+            gilDisabled: python.gilDisabled,
+            implementation: python.implementation,
+            pointerBits: python.pointerBits,
+            version: python.version,
+        },
+        requirementsSha256,
+    };
+    const id = sha256(JSON.stringify(contract));
+    const implementation = safePathSegment(python.implementation);
+    const version = safePathSegment(python.version);
+    return {
+        contract,
+        directoryName: `${implementation}-${version}-${id.slice(0, 20)}`,
+        id,
+    };
+}
+export function requirementsDigest(content) {
+    return sha256(content);
+}
+export function venvMetadataFile(directory) {
+    return path.join(directory, VENV_METADATA);
+}
+/** Metadata is the publication marker; an environment without it is incomplete. */
+export async function venvMatches(directory, venv) {
+    try {
+        const parsed = JSON.parse(await readFile(venvMetadataFile(directory), 'utf8'));
+        return parsed.venvId === venv.id &&
+            JSON.stringify(parsed.contract) === JSON.stringify(venv.contract);
+    }
+    catch {
+        return false;
+    }
+}
+/** Publish the venv marker atomically after creation and installation succeed. */
+export async function writeVenvMetadata(directory, venv) {
+    await mkdir(directory, { recursive: true });
+    const file = venvMetadataFile(directory);
+    const staged = `${file}.${process.pid}.${randomUUID()}.tmp`;
+    const metadata = {
+        contract: venv.contract,
+        venvId: venv.id,
+    };
+    try {
+        await writeFile(staged, `${JSON.stringify(metadata, null, 2)}\n`, {
+            encoding: 'utf8',
+            flag: 'wx',
+        });
+        await rename(staged, file);
+    }
+    finally {
+        await rm(staged, { force: true });
+    }
+}
+function safePathSegment(value) {
+    return value.toLowerCase().replace(/[^a-z0-9.-]+/gu, '-').replace(/^-+|-+$/gu, '') || 'python';
+}
+function sha256(value) {
+    return createHash('sha256').update(value).digest('hex');
+}
+//# sourceMappingURL=venv-identity.js.map

package/dist/venv-identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"venv-identity.js","sourceRoot":"","sources":["../src/venv-identity.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pyfig",
-  "version": "0.6.2",
-  "description": "Prepare uv-first Python runtime environments without editing project files.",
+  "version": "0.7.0",
+  "description": "Prepare isolated, content-addressed Python venvs with uv.",
   "type": "module",
   "main": "./dist/cjs/index.js",
   "types": "./dist/index.d.ts",

package/dist/virtual-environment.d.ts

@@ -1,11 +0,0 @@
-export declare const VIRTUAL_ENV_DIRECTORY_NAME: string;
-export declare function virtualEnvironmentDirectory(projectRoot: string): string;
-/** Existing application environments are eligible for read-only reuse. */
-export declare function externalVirtualEnvironmentDirectories(projectRoot: string, env: NodeJS.ProcessEnv): string[];
-export declare function virtualEnvironmentPythonExecutable(virtualEnvironment: string): string;
-/** Apply the environment changes that shell activation scripts make for child processes. */
-export declare function activateVirtualEnvironment(env: NodeJS.ProcessEnv, virtualEnvironment: string, pythonExecutable: string): NodeJS.ProcessEnv;
-export declare function pathsEqual(left: string, right: string): boolean;
-/** Canonicalize existing paths so symlink, junction, and filesystem casing aliases compare equally. */
-export declare function canonicalPath(value: string): string;
-//# sourceMappingURL=virtual-environment.d.ts.map

package/dist/virtual-environment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"virtual-environment.d.ts","sourceRoot":"","sources":["../src/virtual-environment.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,QAA8C,CAAC;AAEtF,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,0EAA0E;AAC1E,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,MAAM,EAAE,CAKV;AAED,wBAAgB,kCAAkC,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAMrF;AAED,4FAA4F;AAC5F,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAAC,UAAU,CAenB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,uGAAuG;AACvG,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CASnD"}

package/dist/virtual-environment.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"virtual-environment.js","sourceRoot":"","sources":["../src/virtual-environment.ts"],"names":[],"mappings":"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"}