@styx-api/core 0.5.0 → 0.5.2

package/dist/index.cjs

@@ -4461,17 +4461,19 @@ function licenseField(proj) {
 	return `{ text = "${tomlStr(proj.license?.description ?? "unknown")}" }`;
 }
 /**
-* Per-suite `pyproject.toml`. The flat layout (`python/<pkg>/bet.py`) makes the
-* directory itself the importable package, so setuptools' `package-dir` maps the
-* import name (`<pkg>`) onto the distribution's root directory. The styxdefs
+* Per-suite `pyproject.toml`. The suite source stays in a flat directory
+* (`python/<pkg>/bet.py`), but setuptools' `package-dir` maps that directory onto
+* the dotted import package `<project>.<pkg>`, so every suite nests under the
+* metapackage's `<project>/` namespace. That restores `from <project> import
+* <pkg>` while keeping each suite a separately-installable distribution (and
+* leaves no top-level `<pkg>` polluting the global namespace). With no project
+* name the import name is the bare `<pkg>` (top-level fallback). The styxdefs
 * floor is the only runtime dependency.
 *
-* Precondition: `pkg.name` must be a valid Python identifier - the flat layout's
-* relative imports (`from .bet import *`) already require this, and the CLI uses
-* it verbatim as the directory name, so this stays consistent with that.
+* Precondition: `importName` is a valid (possibly dotted) Python package path -
+* the caller scrubs the project + package names into identifiers accordingly.
 */
-function generateSubPyproject(proj, pkg) {
-	const importName = pkgDir(pkg);
+function generateSubPyproject(proj, pkg, importName) {
 	const cb = new CodeBuilder("  ");
 	cb.line("[project]");
 	cb.line(`name = "${tomlStr(pyDistName(proj, pkg))}"`);
@@ -4508,11 +4510,24 @@ function generateRootInitPy() {
 }
 /**
 * Root `pyproject.toml`: a metapackage depending on `styxkit[all]` (the runner
-* stack it re-exports) plus each per-suite distribution. `packages` lists only
-* the metapackage's own module so setuptools ships the styxkit re-export without
-* sweeping the sibling suite directories into this distribution.
+* stack it re-exports) plus each per-suite distribution, pinned to this exact
+* project version (`niwrap_fsl==1.2.3`). The suites all ride the project version
+* and ship in lockstep, so an exact pin keeps `pip install niwrap==X` consistent:
+* during the post-release index-propagation window (or any momentary registry
+* inconsistency) pip errors cleanly instead of silently grafting an older suite
+* whose layout no longer matches the metapackage. Mirrors the way the CLI pins
+* `@styx-api/core` exactly.
+*
+* `packages` lists only the metapackage's own module so setuptools ships the
+* styxkit re-export without sweeping the sibling suite directories into this
+* distribution. The module is the `<project>/` namespace package the suites nest
+* into, so installing the metapackage makes `<project>.use_docker()` reachable
+* alongside the suites' `from <project> import <pkg>`. `moduleDir` is the on-disk
+* source directory; it differs from the import `moduleName` only when a suite is
+* named after the project, in which case a `package-dir` remap keeps the import
+* name intact.
 */
-function generateRootPyproject(proj, distNames, moduleName) {
+function generateRootPyproject(proj, distNames, moduleName, moduleDir) {
 	const cb = new CodeBuilder("  ");
 	cb.line("[project]");
 	cb.line(`name = "${tomlStr(proj.name ?? "project")}"`);
@@ -4524,11 +4539,13 @@ function generateRootPyproject(proj, distNames, moduleName) {
 	cb.line(`requires-python = "${REQUIRES_PYTHON}"`);
 	cb.line("dependencies = [");
 	for (const dep of PYTHON_RUNNER_DEPS) cb.line(`  "${dep}",`);
-	for (const dist of distNames) cb.line(`  "${tomlStr(dist)}",`);
+	const suitePin = tomlStr(proj.version ?? "0.0.0");
+	for (const dist of distNames) cb.line(`  "${tomlStr(dist)}==${suitePin}",`);
 	cb.line("]");
 	cb.blank();
 	cb.line("[tool.setuptools]");
 	cb.line(`packages = ["${moduleName}"]`);
+	if (moduleDir !== moduleName) cb.line(`package-dir = { "${moduleName}" = "${moduleDir}" }`);
 	cb.blank();
 	cb.line("[tool.setuptools.package-data]");
 	cb.line(`"${moduleName}" = ["py.typed"]`);
@@ -5548,23 +5565,26 @@ var PythonBackend = class {
 		const distNames = [];
 		const pkgDirs = [];
 		const warnings = [];
+		const nsName = proj.name && proj.name.trim() ? pyScrubIdent(proj.name, PY_RESERVED) : void 0;
 		for (const p of packages) {
 			const pkg = p.meta ?? {};
 			const dir = pkg.name ?? "package";
 			pkgDirs.push(dir);
 			distNames.push(pyDistName(proj, pkg));
-			files.set(`${dir}/pyproject.toml`, generateSubPyproject(proj, pkg));
+			const importPkg = nsName ? `${nsName}.${dir}` : dir;
+			files.set(`${dir}/pyproject.toml`, generateSubPyproject(proj, pkg, importPkg));
 			files.set(`${dir}/README.md`, generateSubReadme(proj, pkg));
 		}
-		let rootMod = pyScrubIdent(proj.name && proj.name.trim() ? proj.name : "project", PY_RESERVED);
-		if (pkgDirs.includes(rootMod)) {
-			const collided = rootMod;
-			while (pkgDirs.includes(rootMod)) rootMod += "_";
-			warnings.push({ message: `metapackage module "${collided}" collides with a suite directory; emitting as "${rootMod}" instead` });
+		const metaImport = nsName ?? "project";
+		let metaDir = metaImport;
+		if (pkgDirs.includes(metaDir)) {
+			const collided = metaDir;
+			while (pkgDirs.includes(metaDir)) metaDir += "_";
+			warnings.push({ message: `metapackage directory "${collided}" collides with a suite directory; emitting its sources in "${metaDir}" instead (import name stays "${metaImport}")` });
 		}
-		files.set(`${rootMod}/__init__.py`, generateRootInitPy());
-		files.set(`${rootMod}/py.typed`, "");
-		files.set("pyproject.toml", generateRootPyproject(proj, distNames, rootMod));
+		files.set(`${metaDir}/__init__.py`, generateRootInitPy());
+		files.set(`${metaDir}/py.typed`, "");
+		files.set("pyproject.toml", generateRootPyproject(proj, distNames, metaImport, metaDir));
 		files.set("README.md", generateRootReadme(proj, distNames));
 		files.set("requirements.txt", generateRequirementsTxt(pkgDirs));
 		return {

package/dist/index.mjs

@@ -4460,17 +4460,19 @@ function licenseField(proj) {
 	return `{ text = "${tomlStr(proj.license?.description ?? "unknown")}" }`;
 }
 /**
-* Per-suite `pyproject.toml`. The flat layout (`python/<pkg>/bet.py`) makes the
-* directory itself the importable package, so setuptools' `package-dir` maps the
-* import name (`<pkg>`) onto the distribution's root directory. The styxdefs
+* Per-suite `pyproject.toml`. The suite source stays in a flat directory
+* (`python/<pkg>/bet.py`), but setuptools' `package-dir` maps that directory onto
+* the dotted import package `<project>.<pkg>`, so every suite nests under the
+* metapackage's `<project>/` namespace. That restores `from <project> import
+* <pkg>` while keeping each suite a separately-installable distribution (and
+* leaves no top-level `<pkg>` polluting the global namespace). With no project
+* name the import name is the bare `<pkg>` (top-level fallback). The styxdefs
 * floor is the only runtime dependency.
 *
-* Precondition: `pkg.name` must be a valid Python identifier - the flat layout's
-* relative imports (`from .bet import *`) already require this, and the CLI uses
-* it verbatim as the directory name, so this stays consistent with that.
+* Precondition: `importName` is a valid (possibly dotted) Python package path -
+* the caller scrubs the project + package names into identifiers accordingly.
 */
-function generateSubPyproject(proj, pkg) {
-	const importName = pkgDir(pkg);
+function generateSubPyproject(proj, pkg, importName) {
 	const cb = new CodeBuilder("  ");
 	cb.line("[project]");
 	cb.line(`name = "${tomlStr(pyDistName(proj, pkg))}"`);
@@ -4507,11 +4509,24 @@ function generateRootInitPy() {
 }
 /**
 * Root `pyproject.toml`: a metapackage depending on `styxkit[all]` (the runner
-* stack it re-exports) plus each per-suite distribution. `packages` lists only
-* the metapackage's own module so setuptools ships the styxkit re-export without
-* sweeping the sibling suite directories into this distribution.
+* stack it re-exports) plus each per-suite distribution, pinned to this exact
+* project version (`niwrap_fsl==1.2.3`). The suites all ride the project version
+* and ship in lockstep, so an exact pin keeps `pip install niwrap==X` consistent:
+* during the post-release index-propagation window (or any momentary registry
+* inconsistency) pip errors cleanly instead of silently grafting an older suite
+* whose layout no longer matches the metapackage. Mirrors the way the CLI pins
+* `@styx-api/core` exactly.
+*
+* `packages` lists only the metapackage's own module so setuptools ships the
+* styxkit re-export without sweeping the sibling suite directories into this
+* distribution. The module is the `<project>/` namespace package the suites nest
+* into, so installing the metapackage makes `<project>.use_docker()` reachable
+* alongside the suites' `from <project> import <pkg>`. `moduleDir` is the on-disk
+* source directory; it differs from the import `moduleName` only when a suite is
+* named after the project, in which case a `package-dir` remap keeps the import
+* name intact.
 */
-function generateRootPyproject(proj, distNames, moduleName) {
+function generateRootPyproject(proj, distNames, moduleName, moduleDir) {
 	const cb = new CodeBuilder("  ");
 	cb.line("[project]");
 	cb.line(`name = "${tomlStr(proj.name ?? "project")}"`);
@@ -4523,11 +4538,13 @@ function generateRootPyproject(proj, distNames, moduleName) {
 	cb.line(`requires-python = "${REQUIRES_PYTHON}"`);
 	cb.line("dependencies = [");
 	for (const dep of PYTHON_RUNNER_DEPS) cb.line(`  "${dep}",`);
-	for (const dist of distNames) cb.line(`  "${tomlStr(dist)}",`);
+	const suitePin = tomlStr(proj.version ?? "0.0.0");
+	for (const dist of distNames) cb.line(`  "${tomlStr(dist)}==${suitePin}",`);
 	cb.line("]");
 	cb.blank();
 	cb.line("[tool.setuptools]");
 	cb.line(`packages = ["${moduleName}"]`);
+	if (moduleDir !== moduleName) cb.line(`package-dir = { "${moduleName}" = "${moduleDir}" }`);
 	cb.blank();
 	cb.line("[tool.setuptools.package-data]");
 	cb.line(`"${moduleName}" = ["py.typed"]`);
@@ -5547,23 +5564,26 @@ var PythonBackend = class {
 		const distNames = [];
 		const pkgDirs = [];
 		const warnings = [];
+		const nsName = proj.name && proj.name.trim() ? pyScrubIdent(proj.name, PY_RESERVED) : void 0;
 		for (const p of packages) {
 			const pkg = p.meta ?? {};
 			const dir = pkg.name ?? "package";
 			pkgDirs.push(dir);
 			distNames.push(pyDistName(proj, pkg));
-			files.set(`${dir}/pyproject.toml`, generateSubPyproject(proj, pkg));
+			const importPkg = nsName ? `${nsName}.${dir}` : dir;
+			files.set(`${dir}/pyproject.toml`, generateSubPyproject(proj, pkg, importPkg));
 			files.set(`${dir}/README.md`, generateSubReadme(proj, pkg));
 		}
-		let rootMod = pyScrubIdent(proj.name && proj.name.trim() ? proj.name : "project", PY_RESERVED);
-		if (pkgDirs.includes(rootMod)) {
-			const collided = rootMod;
-			while (pkgDirs.includes(rootMod)) rootMod += "_";
-			warnings.push({ message: `metapackage module "${collided}" collides with a suite directory; emitting as "${rootMod}" instead` });
+		const metaImport = nsName ?? "project";
+		let metaDir = metaImport;
+		if (pkgDirs.includes(metaDir)) {
+			const collided = metaDir;
+			while (pkgDirs.includes(metaDir)) metaDir += "_";
+			warnings.push({ message: `metapackage directory "${collided}" collides with a suite directory; emitting its sources in "${metaDir}" instead (import name stays "${metaImport}")` });
 		}
-		files.set(`${rootMod}/__init__.py`, generateRootInitPy());
-		files.set(`${rootMod}/py.typed`, "");
-		files.set("pyproject.toml", generateRootPyproject(proj, distNames, rootMod));
+		files.set(`${metaDir}/__init__.py`, generateRootInitPy());
+		files.set(`${metaDir}/py.typed`, "");
+		files.set("pyproject.toml", generateRootPyproject(proj, distNames, metaImport, metaDir));
 		files.set("README.md", generateRootReadme(proj, distNames));
 		files.set("requirements.txt", generateRequirementsTxt(pkgDirs));
 		return {