@fuman/build 0.0.6 → 0.0.8

package/cli/commands/docs.js

@@ -54,7 +54,7 @@ class FumanTypedocReader {
         const pkgName = asNonNull(pkg2.json.name);
         if (data2?.includePackages && !data2.includePackages.includes(pkgName)) continue;
         if (data2?.excludePackages?.includes(pkgName)) continue;
-        if (pkg2.json.exports != null && !data2?.includePackages?.includes(pkgName)) continue;
+        if (pkg2.json.exports == null && !data2?.includePackages?.includes(pkgName)) continue;
         entrypoints2.push(pkg2.path);
       }
       options.setValue("entryPoints", entrypoints2, cwd);

package/cli/commands/release.d.ts

@@ -2,6 +2,7 @@ import { bc } from './_utils.js';
 export declare const releaseCli: bc.Command<{
     kind: "auto" | "major" | "minor" | "patch";
     withGithubRelease: boolean;
+    gitExtraOrigins: string | undefined;
     githubToken: string | undefined;
     githubRepo: string | undefined;
     githubApiUrl: string | undefined;
@@ -19,6 +20,7 @@ export declare const releaseCli: bc.Command<{
 }, {
     kind: "auto" | "major" | "minor" | "patch";
     withGithubRelease: boolean;
+    gitExtraOrigins: string | undefined;
     githubToken: string | undefined;
     githubRepo: string | undefined;
     githubApiUrl: string | undefined;

package/cli/commands/release.js

@@ -1,8 +1,7 @@
-import { createReadStream } from "node:fs";
+import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
 import process from "node:process";
-import { nodeReadableToWeb } from "@fuman/node";
-import { asNonNull, notImplemented } from "@fuman/utils";
+import { asNonNull, notImplemented, parallelMap } from "@fuman/utils";
 import { sort } from "semver";
 import { createGithubRelease } from "../../git/github.js";
 import { getLatestTag, getFirstCommit, gitTagExists } from "../../git/utils.js";
@@ -22,6 +21,8 @@ const releaseCli = bc.command({
   options: {
     kind: bc.string("kind").desc("release kind").enum("major", "minor", "patch", "auto").default("auto"),
     withGithubRelease: bc.boolean("with-github-release").desc("whether to create a github release (requires GITHUB_TOKEN env var). if false, will only create a commit with the release notes").default(false),
+    gitExtraOrigins: bc.string("git-extra-origins").desc("extra git origins to push to (e.g. for mirrors). note that these origins will be force-pushed to"),
+    // ...because for some reason forgejo fails to properly push to the mirrors on push :/
     githubToken: bc.string("github-token").desc("github token to use for creating a release (defaults to GITHUB_TOKEN env var)"),
     githubRepo: bc.string("github-repo").desc("github repo to create a release for (defaults to GITHUB_REPOSITORY env var)"),
     githubApiUrl: bc.string("github-api-url").desc("github api url to use for creating a release (for github-compatible apis)"),
@@ -56,12 +57,14 @@ const releaseCli = bc.command({
     let bumpVersionResult;
     if (prevTag != null) {
       bumpVersionResult = await bumpVersion({
-        workspace,
+        workspace: workspaceWithRoot,
         since: prevTag ?? await getFirstCommit(root),
         type: args.kind === "auto" ? void 0 : args.kind,
+        all: args.kind !== "auto",
         cwd: root,
         params: config?.versioning,
-        dryRun: args.dryRun
+        dryRun: args.dryRun,
+        withRoot: true
       });
       changedPackages = bumpVersionResult.changedPackages.map((pkg) => pkg.package);
       if (changedPackages.length === 0) {
@@ -90,6 +93,13 @@ const releaseCli = bc.command({
         process.exit(1);
       }
     }
+    if (!changedPackages.some((pkg) => pkg.json.version === tagName.replace(/^v/, ""))) {
+      console.log(`❗ tag ${tagName} does not match any of the package versions. did the previous release complete successfully?`);
+      console.log("❗ if so, please verify versions in package.json, tag the commit release and try again");
+      if (!args.dryRun) {
+        process.exit(1);
+      }
+    }
     console.log("");
     console.log("📝 generating changelog...");
     const changelog = prevTag != null ? await generateChangelog({
@@ -161,6 +171,7 @@ const releaseCli = bc.command({
         "--quiet",
         "--allow-dirty",
         ...args.dryRun ? ["--dry-run"] : [],
+        ...args.jsrToken != null ? ["--token", args.jsrToken] : [],
         ...args.jsrPublishArgs?.split(" ") ?? []
       ], {
         env: {
@@ -187,11 +198,32 @@ ${changelog}`;
         stdio: "inherit",
         throwOnError: true
       });
-      await exec(["git", "tag", tagName], {
+      await exec(["git", "tag", tagName, "-m", tagName], {
+        cwd: root,
+        stdio: "inherit",
+        throwOnError: true
+      });
+    }
+    if (!args.dryRun) {
+      await exec(["git", "push", "--follow-tags"], {
         cwd: root,
         stdio: "inherit",
         throwOnError: true
       });
+      if (args.gitExtraOrigins != null) {
+        for (const origin of args.gitExtraOrigins.split(",")) {
+          await exec(["git", "push", origin, "--force"], {
+            cwd: root,
+            stdio: "inherit",
+            throwOnError: true
+          });
+          await exec(["git", "push", origin, "--force", "--tags"], {
+            cwd: root,
+            stdio: "inherit",
+            throwOnError: true
+          });
+        }
+      }
     }
     if (args.withGithubRelease) {
       if (args.dryRun) {
@@ -213,22 +245,15 @@ ${changelog}`;
           tag: tagName,
           name: tagName,
           body: changelog,
-          artifacts: tarballs.map((file) => ({
+          artifacts: await parallelMap(tarballs, async (file) => ({
             name: basename(file),
             type: "application/gzip",
-            body: nodeReadableToWeb(createReadStream(file))
+            body: await readFile(file)
           }))
         });
         console.log(`\x1B[;32m✅github release created: https://github.com/${repo}/releases/tag/${tagName}\x1B[;0m`);
       }
     }
-    if (!args.dryRun) {
-      await exec(["git", "push", "--follow-tags"], {
-        cwd: root,
-        stdio: "inherit",
-        throwOnError: true
-      });
-    }
     console.log("");
     console.log("🎉 done!");
   }

package/git/github.d.ts

@@ -9,7 +9,7 @@ export declare function createGithubRelease(params: {
     artifacts?: {
         name: string;
         type: string;
-        body: BodyInit;
+        body: Uint8Array;
     }[];
     apiUrl?: string;
 }): Promise<number>;

package/git/github.js

@@ -6,7 +6,6 @@ async function createGithubRelease(params) {
   const ffetch = ffetchBase.extend({
     baseUrl: params.apiUrl ?? "https://api.github.com",
     addons: [
-      ffetchAddons.retry(),
       ffetchAddons.parser(ffetchZodAdapter())
     ],
     headers: {
@@ -21,20 +20,23 @@ async function createGithubRelease(params) {
       tag_name: params.tag,
       name: params.name,
       body: params.body,
-      draft: params.draft,
-      prerelease: params.prerelease
+      draft: params.draft ?? false,
+      prerelease: params.prerelease ?? false
     },
     validateResponse: (res) => res.status === 201
   }).parsedJson(z.object({
-    id: z.number()
+    id: z.number(),
+    upload_url: z.string()
   }));
+  const uploadUrl = release.upload_url.split("{")[0];
   if (params.artifacts != null && params.artifacts.length > 0) {
     await asyncPool(params.artifacts, async (file) => {
-      await ffetch(`https://uploads.github.com/repos/${params.repo}/releases/${release.id}/assets`, {
+      await ffetch(uploadUrl, {
         method: "POST",
         query: { name: file.name },
         headers: {
-          "Content-Type": file.type
+          "Content-Type": file.type,
+          "Content-Length": file.body.length.toString()
         },
         body: file.body,
         validateResponse: (res) => res.status === 201

package/jsr/generate-workspace.js

@@ -2,6 +2,7 @@ import * as fsp from "node:fs/promises";
 import { join, relative } from "node:path";
 import process from "node:process";
 import { asyncPool } from "@fuman/utils";
+import picomatch from "picomatch";
 import { glob } from "tinyglobby";
 import ts from "typescript";
 import { loadBuildConfig } from "../misc/_config.js";
@@ -62,12 +63,18 @@ async function generateDenoWorkspace(params) {
     const packageConfigJsr = packageConfig?.jsr;
     const srcDir = join(packageRoot, normalizeFilePath(packageConfigJsr?.sourceDir ?? rootConfig?.sourceDir ?? ""));
     const excludeFiles = mergeArrays(rootConfig?.exclude, packageConfigJsr?.exclude);
-    await fsp.cp(srcDir, packageOutRoot, { recursive: true });
-    const printer = ts.createPrinter();
-    const tsFiles = await glob("**/*.ts", {
-      cwd: packageOutRoot,
-      ignore: excludeFiles
+    const exludeFilesPico = picomatch(excludeFiles);
+    await fsp.cp(srcDir, packageOutRoot, {
+      recursive: true,
+      filter(source) {
+        if (exludeFilesPico(relative(srcDir, source))) {
+          return false;
+        }
+        return true;
+      }
     });
+    const printer = ts.createPrinter();
+    const tsFiles = await glob("**/*.ts", { cwd: packageOutRoot });
     await asyncPool(tsFiles, async (filename) => {
       const fullFilePath = join(packageOutRoot, filename);
       let fileContent = await fsp.readFile(fullFilePath, "utf8");
@@ -121,7 +128,7 @@ async function generateDenoWorkspace(params) {
       }
     });
     const hookContext = {
-      outDir: "",
+      outDir: packageOutRoot,
       packageDir: packageOutRoot,
       packageName: pkg.json.name,
       packageJson: pkg.json,
@@ -144,6 +151,8 @@ async function generateDenoWorkspace(params) {
       packageJson.version = fixedVersion;
       packageJsonOrig.version = fixedVersion;
     }
+    hookContext.packageJson = packageJson;
+    await packageConfig?.finalizePackageJson?.(hookContext);
     const denoJson = packageJsonToDeno({
       packageJson,
       packageJsonOrig,
@@ -152,6 +161,7 @@ async function generateDenoWorkspace(params) {
       baseDir: relative(packageRoot, srcDir),
       exclude: excludeFiles
     });
+    packageConfig?.jsr?.finalizeDenoJson?.(hookContext, denoJson);
     await fsp.writeFile(join(packageOutRoot, "deno.json"), JSON.stringify(denoJson, null, 4));
     for (const file of mergeArrays(rootConfig?.copyRootFiles, packageConfig?.jsr?.copyRootFiles, ["LICENSE"])) {
       await tryCopy(join(workspaceRoot, file), join(packageOutRoot, file), { recursive: true });
@@ -159,8 +169,17 @@ async function generateDenoWorkspace(params) {
     for (const file of mergeArrays(rootConfig?.copyPackageFiles, packageConfig?.jsr?.copyPackageFiles, ["README.md"])) {
       await tryCopy(join(packageRoot, file), join(packageOutRoot, file), { recursive: true });
     }
+    await packageConfig?.jsr?.finalize?.(hookContext);
   }
   await fsp.writeFile(join(outDir, "deno.json"), JSON.stringify(rootDenoJson, null, 4));
+  await rootConfig?.finalize?.({
+    outDir,
+    packageDir: outDir,
+    packageName: "<jsr-root>",
+    packageJson: {},
+    jsr: true,
+    typedoc: false
+  });
   if (rootConfig?.dryRun !== false || withDryRun) {
     await exec(["deno", "publish", "--dry-run", "-q", "--allow-dirty"], {
       cwd: outDir,

package/jsr/index.d.ts

@@ -1,4 +1,3 @@
-export * from './build-jsr.js';
 export * from './config.js';
 export * from './deno-json.js';
 export * from './populate.js';

package/jsr.js

@@ -1,4 +1,3 @@
-import { runJsrBuild } from "./jsr/build-jsr.js";
 import { packageJsonToDeno } from "./jsr/deno-json.js";
 import { populateFromUpstream } from "./jsr/populate.js";
 import { getModuleCacheDirectory, parseImportSpecifier, splitImportRequest } from "./jsr/utils/external-libs.js";
@@ -18,6 +17,5 @@ export {
   parseImportSpecifier,
   parseJsrJson,
   populateFromUpstream,
-  runJsrBuild,
   splitImportRequest
 };

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "@fuman/build",
     "type": "module",
-    "version": "0.0.6",
+    "version": "0.0.8",
     "description": "utils for building packages and managing monorepos",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
         "@drizzle-team/brocli": "^0.10.2",
-        "@fuman/fetch": "^0.0.6",
-        "@fuman/io": "^0.0.4",
-        "@fuman/node": "^0.0.4",
+        "@fuman/fetch": "^0.0.8",
+        "@fuman/io": "^0.0.8",
+        "@fuman/node": "^0.0.8",
         "@fuman/utils": "^0.0.4",
         "cross-spawn": "^7.0.5",
         "detect-indent": "^7.0.1",

package/versioning/bump-version.d.ts

@@ -47,4 +47,6 @@ export declare function bumpVersion(params: {
     params?: VersioningOptions;
     /** whether to not actually write the files */
     dryRun?: boolean;
+    /** whether to also bump version of the root package.json */
+    withRoot?: boolean;
 }): Promise<BumpVersionResult>;

package/versioning/bump-version.js

@@ -5,7 +5,7 @@ import { asNonNull } from "@fuman/utils";
 import detectIndent from "detect-indent";
 import { parse, inc, satisfies, gt } from "semver";
 import { getCommitsBetween, parseConventionalCommit } from "../git/utils.js";
-import { collectVersions } from "../package-json/utils.js";
+import { collectVersions, findRootPackage } from "../package-json/utils.js";
 import { findProjectChangedPackages } from "./collect-files.js";
 async function bumpVersion(params) {
   const {
@@ -13,10 +13,13 @@ async function bumpVersion(params) {
     all,
     cwd = process.cwd(),
     since,
-    dryRun = false
+    dryRun = false,
+    withRoot = false
   } = params;
+  const workspaceWithoutRoot = workspace.filter((pkg) => !pkg.root);
   let maxVersion = null;
-  for (const pkg of workspace) {
+  for (const pkg of workspaceWithoutRoot) {
+    if (pkg.root) continue;
     const version = asNonNull(pkg.json.version);
     if (pkg.json.fuman?.ownVersioning) {
       continue;
@@ -28,7 +31,8 @@ async function bumpVersion(params) {
   if (maxVersion == null) {
     throw new Error("No packages found with fuman-managed versioning");
   }
-  const changedPackages = all ? workspace : await findProjectChangedPackages({
+  const changedPackages = all ? workspaceWithoutRoot : await findProjectChangedPackages({
+    workspace: workspaceWithoutRoot,
     root: cwd,
     since,
     params: params.params
@@ -71,7 +75,6 @@ async function bumpVersion(params) {
   const workspaceVersions = collectVersions(workspace);
   const result = [];
   for (const pkg of changedPackages) {
-    if (pkg.json.fuman?.ownVersioning) continue;
     result.push({
       package: pkg,
       prevVersion: asNonNull(pkg.json.version)
@@ -108,7 +111,12 @@ async function bumpVersion(params) {
       }
     }
   }
-  for (const { package: pkg } of result) {
+  const packagesToBump = [...result.map((it) => it.package)];
+  if (withRoot) {
+    packagesToBump.push(findRootPackage(workspace));
+  }
+  for (const pkg of packagesToBump) {
+    if (pkg.json.fuman?.ownVersioning) continue;
     if (!dryRun) {
       const pkgJsonPath = join(pkg.path, "package.json");
       const pkgJsonText = await fsp.readFile(pkgJsonPath, "utf8");

package/jsr/build-jsr.d.ts

@@ -1,7 +0,0 @@
-import { WorkspacePackage } from '../package-json/collect-package-jsons.js';
-import { JsrConfig } from './config.js';
-export declare function runJsrBuild(params: {
-    packageName: string;
-    workspacePackages: WorkspacePackage[];
-    rootConfig?: JsrConfig;
-}): Promise<void>;

package/jsr/build-jsr.js

@@ -1,146 +0,0 @@
-import * as fsp from "node:fs/promises";
-import { join, relative } from "node:path";
-import { asyncPool, asNonNull } from "@fuman/utils";
-import { glob } from "tinyglobby";
-import ts from "typescript";
-import { loadBuildConfig } from "../misc/_config.js";
-import { exec } from "../misc/exec.js";
-import { tryCopy } from "../misc/fs.js";
-import { normalizeFilePath } from "../misc/path.js";
-import { processPackageJson } from "../package-json/process-package-json.js";
-import { findPackageByName, findRootPackage, collectVersions } from "../package-json/utils.js";
-import { packageJsonToDeno } from "./deno-json.js";
-function mergeArrays(a, b, defaultValue = []) {
-  if (!a) return b ?? defaultValue;
-  if (!b) return a;
-  return [...a, ...b];
-}
-async function runJsrBuild(params) {
-  const {
-    packageName,
-    workspacePackages,
-    rootConfig
-  } = params;
-  const ourPackage = findPackageByName(workspacePackages, packageName);
-  const rootPackage = findRootPackage(workspacePackages);
-  const packageRoot = ourPackage.path;
-  const workspaceRoot = rootPackage.path;
-  const outDir = join(packageRoot, normalizeFilePath(rootConfig?.outputDir ?? "dist"));
-  const packageConfig = await loadBuildConfig(packageRoot);
-  const srcDir = join(packageRoot, normalizeFilePath(packageConfig?.jsr?.sourceDir ?? rootConfig?.sourceDir ?? ""));
-  const excludeFiles = mergeArrays(rootConfig?.exclude, packageConfig?.jsr?.exclude);
-  await fsp.rm(outDir, { recursive: true, force: true });
-  await fsp.mkdir(outDir, { recursive: true });
-  await asyncPool(await fsp.readdir(srcDir), async (file) => {
-    const src = join(srcDir, file);
-    if (src === outDir) return;
-    await fsp.cp(src, join(outDir, file), { recursive: true });
-  });
-  const printer = ts.createPrinter();
-  const tsFiles = await glob("**/*.ts", {
-    cwd: outDir,
-    ignore: excludeFiles
-  });
-  const badImports = [];
-  await asyncPool(tsFiles, async (filename) => {
-    const fullFilePath = join(outDir, filename);
-    let fileContent = await fsp.readFile(fullFilePath, "utf8");
-    let changed = false;
-    const file = ts.createSourceFile(filename, fileContent, ts.ScriptTarget.ESNext, true);
-    let changedTs = false;
-    for (const imp of file.statements) {
-      if (!ts.isImportDeclaration(imp) && !ts.isExportDeclaration(imp)) {
-        continue;
-      }
-      if (!imp.moduleSpecifier || !ts.isStringLiteral(imp.moduleSpecifier)) {
-        continue;
-      }
-      const mod = imp.moduleSpecifier.text;
-      if (mod[0] !== ".") {
-        continue;
-      }
-      if (mod.endsWith(".js")) {
-        changedTs = true;
-        imp.moduleSpecifier = ts.factory.createStringLiteral(
-          mod.replace(/\.js$/, ".ts")
-        );
-      } else {
-        badImports.push(`  from ${mod} at ${join(srcDir, filename)}`);
-      }
-    }
-    if (rootConfig?.transformAst?.(file)) {
-      changedTs = true;
-    }
-    if (packageConfig?.jsr?.transformAst?.(file)) {
-      changedTs = true;
-    }
-    if (changedTs) {
-      fileContent = printer.printFile(file);
-      changed = true;
-    }
-    if (rootConfig?.transformCode || packageConfig?.jsr?.transformCode) {
-      const origFileContent = fileContent;
-      if (rootConfig?.transformCode) {
-        fileContent = rootConfig.transformCode(filename, fileContent);
-      }
-      if (packageConfig?.jsr?.transformCode) {
-        fileContent = packageConfig.jsr.transformCode(filename, fileContent);
-      }
-      if (fileContent !== origFileContent) {
-        changed = true;
-      }
-    }
-    if (changed) {
-      await fsp.writeFile(fullFilePath, fileContent);
-    }
-  });
-  if (badImports.length > 0) {
-    throw new Error(`Found ${badImports.length} invalid imports (you must specify .js extension):
-${badImports.join("\n")}`);
-  }
-  const hookContext = {
-    outDir: "",
-    packageDir: ourPackage.path,
-    packageName: asNonNull(ourPackage.json.name),
-    packageJson: ourPackage.json,
-    jsr: true,
-    typedoc: false
-  };
-  packageConfig?.preparePackageJson?.(hookContext);
-  const workspaceVersions = collectVersions(workspacePackages);
-  const { packageJson, packageJsonOrig } = processPackageJson({
-    packageJson: ourPackage.json,
-    rootPackageJson: rootPackage.json,
-    workspaceVersions,
-    // since there's no bundling, we can't drop any deps.
-    // we *could* copy them from node_modules and add to the import map,
-    // but maybe sometime later
-    bundledWorkspaceDeps: [],
-    rootFieldsToCopy: ["license"]
-  });
-  const denoJson = packageJsonToDeno({
-    packageJson,
-    packageJsonOrig,
-    workspaceVersions,
-    buildDirName: relative(packageRoot, outDir),
-    baseDir: relative(packageRoot, srcDir),
-    exclude: excludeFiles
-  });
-  await fsp.writeFile(join(outDir, "deno.json"), JSON.stringify(denoJson, null, 4));
-  for (const file of mergeArrays(rootConfig?.copyRootFiles, packageConfig?.jsr?.copyRootFiles, ["LICENSE"])) {
-    await tryCopy(join(workspaceRoot, file), join(outDir, file), { recursive: true });
-  }
-  for (const file of mergeArrays(rootConfig?.copyPackageFiles, packageConfig?.jsr?.copyPackageFiles, ["README.md"])) {
-    await tryCopy(join(packageRoot, file), join(outDir, file), { recursive: true });
-  }
-  if (!packageConfig?.jsr?.dryRun && !rootConfig?.dryRun) {
-    await exec(["deno", "publish", "--dry-run", "-q", "--allow-dirty"], {
-      cwd: outDir,
-      stdio: "inherit",
-      throwOnError: true
-    });
-  }
-}
-export {
-  runJsrBuild
-};