Skip to content

armgit / hypit

Public Imported from GitHub
0

Clone any viral video with AI agents. Not just a script, the whole workflow: swap the face, the words, the B-roll, ship 100 variants in one command, and get your 100M views.

fix(packages): honor optional versions and preserve font resource errors

kashorin8f556e4d4ed8
diff --git a/packages/fonts-open/src/surface.ts b/packages/fonts-open/src/surface.ts
index 491a1e73..19a95c71 100644
--- a/packages/fonts-open/src/surface.ts
+++ b/packages/fonts-open/src/surface.ts
@@ -9,7 +9,7 @@ import {
} from "@hypit/media";
import type { FontArtifactRef, FontStackRef } from "@hypit/media";
import type { StructuredElement, StructuredSurfaceHandler } from "@hypit/markup";
-import { resolveNodePackageResource } from "@hypit/package-loader-node";
+import { NodePackageNotFoundError, resolveNodePackageResource } from "@hypit/package-loader-node";
import {
openFontFamilies,
@@ -21,11 +21,17 @@ import type {
OpenFontStyle,
} from "./catalog.js";
+const fontDependencies = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")) as {
+ readonly optionalDependencies: Readonly<Record<string, string>>;
+};
+
function resolveFontPackageFile(packageName: string, path: string): string {
try {
return resolveNodePackageResource(packageName, path, { from: import.meta.url });
} catch (error) {
- const version = packageName === "@infolektuell/noto-color-emoji" ? "0.2.0" : "5.3.0";
+ if (!(error instanceof NodePackageNotFoundError)) throw error;
+ const version = fontDependencies.optionalDependencies[packageName];
+ if (version === undefined) throw error;
throw new Error(
`${packageName} is needed by this authored font. Install it once with: hypit packages install ${packageName}@${version}`,
{ cause: error },
diff --git a/packages/fonts-open/test/fonts-open.test.ts b/packages/fonts-open/test/fonts-open.test.ts
index 6b13d0b3..40ad48e3 100644
--- a/packages/fonts-open/test/fonts-open.test.ts
+++ b/packages/fonts-open/test/fonts-open.test.ts
@@ -106,3 +106,42 @@ test("unavailable family, weight, style and emoji combinations fail before readi
children: [], range,
}), /emoji must be color or mono/u);
});
+
+test("font installation guidance applies only to absent packages and uses the owning manifest", async (t) => {
+ const { cp, mkdir, mkdtemp, readFile, rm, writeFile } = await import("node:fs/promises");
+ const { tmpdir } = await import("node:os");
+ const { join } = await import("node:path");
+ const { pathToFileURL } = await import("node:url");
+ const directory = await mkdtemp(join(tmpdir(), "hypit-font-installation-"));
+ t.after(() => rm(directory, { recursive: true, force: true }));
+ const installed = join(directory, "node_modules", "@hypit", "fonts-open");
+ await mkdir(join(installed, "src"), { recursive: true });
+ const manifest = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8"));
+ manifest.optionalDependencies["@fontsource-variable/inter"] = "9.8.7";
+ await writeFile(join(installed, "package.json"), JSON.stringify(manifest));
+ for (const name of ["surface.ts", "catalog.ts"]) {
+ await cp(new URL(`../src/${name}`, import.meta.url), join(installed, "src", name));
+ }
+ for (const name of ["media", "package-loader-node"]) {
+ const root = join(directory, "node_modules", "@hypit", name);
+ await mkdir(root, { recursive: true });
+ await writeFile(join(root, "package.json"), JSON.stringify({ name: `@hypit/${name}`, type: "module", exports: "./index.mjs" }));
+ await writeFile(join(root, "index.mjs"), `export * from ${JSON.stringify(import.meta.resolve(`@hypit/${name}`))};`);
+ }
+ const module = await import(pathToFileURL(join(installed, "src", "surface.ts")).href);
+ const face = () => decode(module.decodeOpenFontFaceSurface, {
+ kind: "element", name: "fonts:Face", attributes: { id: "selected", family: "inter", weight: "700", style: "normal" },
+ children: [], range,
+ });
+ await assert.rejects(face(), /hypit packages install @fontsource-variable\/inter@9\.8\.7/u);
+ const font = join(directory, "node_modules", "@fontsource-variable", "inter");
+ await mkdir(font, { recursive: true });
+ await writeFile(join(font, "package.json"), JSON.stringify({ name: "@fontsource-variable/inter", version: "9.8.7" }));
+ await assert.rejects(face(), error => {
+ assert.match(String(error), /does not contain files/u);
+ assert.doesNotMatch(String(error), /Install it once/u);
+ return true;
+ });
+ await writeFile(join(font, "package.json"), "broken manifest");
+ await assert.rejects(face(), SyntaxError);
+});
diff --git a/packages/package-loader-node/src/index.ts b/packages/package-loader-node/src/index.ts
index 7ad95818..9e2469ec 100644
--- a/packages/package-loader-node/src/index.ts
+++ b/packages/package-loader-node/src/index.ts
@@ -15,6 +15,7 @@ export {
} from "./distribution-resolution.js";
export {
locateNodePackage,
+ NodePackageNotFoundError,
externalPackageInstallRoot,
resolveNodePackageExecutable,
resolveNodePackageResource,
diff --git a/packages/package-loader-node/src/location.ts b/packages/package-loader-node/src/location.ts
index 7bd49951..b1afcbf9 100644
--- a/packages/package-loader-node/src/location.ts
+++ b/packages/package-loader-node/src/location.ts
@@ -2,6 +2,14 @@ import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "n
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
import { fileURLToPath } from "node:url";
+/** Only absence is repairable by installing a package; malformed manifests and I/O errors are not. */
+export class NodePackageNotFoundError extends Error {
+ constructor(name: string) {
+ super(`cannot locate installed package ${name}`);
+ this.name = "NodePackageNotFoundError";
+ }
+}
+
export type LocatedNodePackage = {
readonly root: string;
readonly manifest: {
@@ -88,7 +96,8 @@ export function declaredExternalPackageRoot(root: string, from: string | URL, na
// An upstream asset a package ships as optional is still selected by one exact version here.
// `hypit packages install` places it under the machine npm root named by this selection, so
// reading only the required map makes the documented repair unusable for every optional asset.
- const version = value.dependencies?.[name] ?? value.optionalDependencies?.[name];
+ // npm lets optionalDependencies override dependencies with the same name.
+ const version = value.optionalDependencies?.[name] ?? value.dependencies?.[name];
return version === undefined ? undefined : externalPackageInstallRoot(root, name, version);
}
const parent = dirname(cursor);
@@ -223,7 +232,7 @@ export function locateNodePackage(nameValue: string, options: LocateNodePackageO
if (found !== undefined) return found;
}
}
- throw new Error(`cannot locate installed package ${name}`);
+ throw new NodePackageNotFoundError(name);
}
function packageFile(
diff --git a/packages/package-loader-node/test/location.test.ts b/packages/package-loader-node/test/location.test.ts
index 767dd682..d2bc88fe 100644
--- a/packages/package-loader-node/test/location.test.ts
+++ b/packages/package-loader-node/test/location.test.ts
@@ -133,6 +133,7 @@ test("a machine npm fallback resolves an upstream asset the importer declares op
// `hypit packages install <name>@<version>` tells the author to install exactly this asset, so
// the version selection must read the same declaration the install was addressed to.
await writeFile(join(importer, "..", "package.json"), JSON.stringify({
+ dependencies: { "optional-only": "1.0.0" },
optionalDependencies: { "optional-only": "3.2.1" },
}));
const options = {