@dbx-tools/projen 0.6.112 → 0.6.114

package/README.md

@@ -53,6 +53,9 @@ new package membership.
 without turning Python packages into JavaScript workspace projects. It generates
 the root and member `pyproject.toml` files, standard `py:*` tasks, the VS Code
 interpreter setting, and an optional manual PyPI trusted-publishing workflow.
+Every generated TOML file is parsed and reserialized with `smol-toml`, so nested
+tables and arrays use consistent formatting instead of projen's indented table
+headers.
 
 ```ts
 import { project, projectPy } from "@dbx-tools/projen";

package/package.json

@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/core": "0.6.112",
-    "@dbx-tools/path": "0.6.112",
-    "@dbx-tools/shared-core": "0.6.112",
+    "@dbx-tools/core": "0.6.114",
+    "@dbx-tools/path": "0.6.114",
+    "@dbx-tools/shared-core": "0.6.114",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "constructs": "^10.6.0",
@@ -36,6 +36,7 @@
     "openapi-typescript": "^7.13.0",
     "oxc-parser": "^0.90.0",
     "projen": "^0.101.16",
+    "smol-toml": "^1.7.1",
     "ts-to-zod": "^5.1.0",
     "yaml": "^2.9.0"
   },
@@ -47,7 +48,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.6.112",
+  "version": "0.6.114",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/packages.ts

@@ -314,12 +314,16 @@ export function recordedPackages(projectRoot: string = repoRoot): RecordedPackag
 }
 
 /**
- * The roots to scan for a live filesystem check: the distinct first segment of
- * every recorded member, unioned with the defaults. Lets a command compare disk
- * against the recorded truth without knowing the `packageRoots` the last
- * synth was configured with.
+ * The configured roots recorded in the root manifest. Older workspaces without
+ * that field fall back to the distinct first segment of every recorded member,
+ * unioned with the defaults.
  */
 export function recordedRoots(projectRoot: string = repoRoot): string[] {
+  const configured = readDbxToolsConfig(projectRoot)?.packageRoots;
+  if (Array.isArray(configured)) {
+    const roots = string.parseList(configured.map((root) => String(root)));
+    if (roots.length) return roots;
+  }
   const roots = new Set<string>(DEFAULT_PACKAGE_ROOTS);
   for (const member of readRecordedMembers(projectRoot)) {
     const pkg = packageOfMember(projectRoot, member);

package/src/project-js.ts

@@ -611,9 +611,10 @@ export class DBXToolsNodeProject
  *
  * Every projen child has its own `NodePackage` post-synth hook, which otherwise
  * runs `bun install` against the same root workspace once per package. Clear the
- * child install tasks while leaving the root's real install/install:ci tasks
- * intact. Applied in root `preSynthesize` so manually attached late children are
- * included and repeated synths remain idempotent.
+ * child install tasks and suppress the package hook's install call and trigger
+ * log while leaving dependency resolution and the root's real install/install:ci
+ * tasks intact. Applied in root `preSynthesize` so manually attached late
+ * children are included and repeated synths remain idempotent.
  */
 export const ROOT_INSTALL_ONLY_MIXIN = mixin.create(
   (construct: IConstruct): construct is DBXToolsNodeProject | DBXToolsTypeScriptProject =>
@@ -622,6 +623,12 @@ export const ROOT_INSTALL_ONLY_MIXIN = mixin.create(
   (child) => {
     child.package.installTask.reset();
     child.package.installCiTask.reset();
+    const nodePackage = child.package as unknown as {
+      installDependencies(trigger: unknown): void;
+      logInstallTrigger(trigger: unknown): void;
+    };
+    nodePackage.installDependencies = () => {};
+    nodePackage.logInstallTrigger = () => {};
   },
 );
 
@@ -1014,6 +1021,8 @@ function initProject(
   // Root carries the bare `repository` (no `directory`); children add their subpath.
   applyRepository(project, options.repository);
 
+  const roots = options.packageRoots ?? DEFAULT_PACKAGE_ROOTS;
+  project.dbxToolsConfig.packageRoots = [...roots];
   if (options.syncResynthPaths?.length) {
     project.dbxToolsConfig.syncResynthPaths = [...options.syncResynthPaths];
   }
@@ -1040,7 +1049,6 @@ function initProject(
   // local editor state. Both ignore CONTENTS (`.idea/*`) rather than the
   // directory, so a later `!` negation can still reach a file inside.
   project.gitignore.addPatterns(".env", ".env.*", "!.env.example", "!.env.sample", ".idea/*");
-  const roots = options.packageRoots ?? DEFAULT_PACKAGE_ROOTS;
   for (const root of roots) {
     project.annotateGenerated(`/${root}/**/index.ts`);
     project.annotateGenerated(`/${root}/openapi/**`);

package/src/project-py.ts

@@ -1,8 +1,10 @@
 /** Reusable uv workspace generation for Python packages hosted in a projen tree. */
 import { string } from "@dbx-tools/shared-core";
 import { Component, type Project, javascript, python, vscode } from "projen";
+import type { IResolver } from "projen/lib/file";
 import { GithubWorkflow } from "projen/lib/github";
 import { JobPermission } from "projen/lib/github/workflows-model";
+import { parse, stringify } from "smol-toml";
 import type { DBXToolsProject, DBXToolsProjectOptions } from "./project.ts";
 import { readWorkspaceVersion } from "./workspace-version.ts";
 
@@ -45,7 +47,11 @@ export interface PythonReleaseOptions {
 export interface DBXToolsPythonWorkspaceOptions {
   readonly packages: readonly PythonPackageOptions[];
   readonly repository: PythonRepositoryOptions;
+  /** Workspace packages exposed as commands from the repository root. */
+  readonly dependencies?: readonly string[];
   readonly requiresPython?: string;
+  /** uv strategy for repositories that intentionally use multiple trusted indexes. */
+  readonly indexStrategy?: "first-index" | "unsafe-first-match" | "unsafe-best-match";
   readonly ruffTarget?: string;
   readonly workspaceName?: string;
   readonly devDependencies?: readonly string[];
@@ -65,6 +71,24 @@ const DEFAULT_DEV_DEPENDENCIES = [
 
 const quote = (value: string): string => JSON.stringify(value);
 
+interface TomlSynthesizer {
+  synthesizeContent(resolver: IResolver): string | undefined;
+}
+
+function formatPyproject(file: python.PyprojectTomlFile): void {
+  const target = file as unknown as TomlSynthesizer;
+  const synthesize = target.synthesizeContent.bind(file);
+  target.synthesizeContent = (resolver) => {
+    const content = synthesize(resolver);
+    if (!content) return content;
+    const marker = content.startsWith("# ") ? content.slice(0, content.indexOf("\n")) : undefined;
+    const body = stringify(parse(content))
+      .trimEnd()
+      .replace(/ = \[ (.*) \]$/gm, " = [$1]");
+    return `${marker ? `${marker}\n\n` : ""}${body}\n`;
+  };
+}
+
 /** Repository-relative path for a Python package directory. */
 export function pythonPackagePath(repository: PythonRepositoryOptions, directory: string): string {
   return `${repository.root ?? "packages/py"}/${directory}`;
@@ -147,6 +171,7 @@ export class DBXToolsPythonProject extends python.PythonProject implements DBXTo
     if (pkg.scripts) {
       this.uv.file.addOverride("project.scripts", pkg.scripts);
     }
+    formatPyproject(this.uv.file);
     this.uv.file.readonly = true;
 
     for (const path of [".gitattributes", ".gitignore"]) {
@@ -230,7 +255,7 @@ export class DBXToolsPythonWorkspace extends Component {
         name: options.workspaceName ?? `${string.toSlug(project.name)}-python-workspace`,
         version: this.version,
         requiresPython: this.requiresPython,
-        dependencies: [],
+        dependencies: [...(options.dependencies ?? [])],
       },
       dependencyGroups: {
         dev: [...(options.devDependencies ?? DEFAULT_DEV_DEPENDENCIES)],
@@ -255,10 +280,14 @@ export class DBXToolsPythonWorkspace extends Component {
         },
       },
     });
+    if (options.indexStrategy) {
+      file.addOverride("tool.uv.index-strategy", options.indexStrategy);
+    }
     file.addOverride(
       "tool.uv.sources",
       Object.fromEntries(options.packages.map((pkg) => [pkg.name, { workspace: true }])),
     );
+    formatPyproject(file);
     file.readonly = true;
     return file;
   }