Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion scripts/validate-cli-package.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { tmpdir } from "node:os";
import { join } from "node:path";
import { create } from "tar";
import { describe, expect, it } from "vitest";
import { validateCliPackageArchive } from "./validate-cli-package.js";
import {
parseValidateCliPackageArguments,
validateCliPackageArchive,
} from "./validate-cli-package.js";

interface PackageFixtureOptions {
binContent?: string;
Expand Down Expand Up @@ -43,6 +46,21 @@ const validPackedManifest = {
};

describe("validate-cli-package", () => {
it("accepts pnpm's forwarded argument separator", () => {
expect(
parseValidateCliPackageArguments([
"--",
"--tarball",
"release/cli.tgz",
"--source-package-json",
"packages/cli/package.json",
])
).toEqual({
sourcePackageJsonPath: "packages/cli/package.json",
tarballPath: "release/cli.tgz",
});
});

it("accepts package entry fields that resolve to real archive files", async () => {
const fixture = await createPackageFixture();

Expand Down
7 changes: 5 additions & 2 deletions scripts/validate-cli-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,15 @@ function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
}

function parseArguments(argv: string[]): ValidateCliPackageInput {
export function parseValidateCliPackageArguments(argv: string[]): ValidateCliPackageInput {
let tarballPath: string | undefined;
let sourcePackageJsonPath: string | undefined;

for (let index = 0; index < argv.length; index++) {
const argument = argv[index];
if (argument === "--") {
continue;
}
if (argument === "--tarball") {
tarballPath = argv[++index];
} else if (argument === "--source-package-json") {
Expand All @@ -291,7 +294,7 @@ function parseArguments(argv: string[]): ValidateCliPackageInput {
}

if (isDirectExecution(import.meta.url)) {
validateCliPackageArchive(parseArguments(process.argv.slice(2)))
validateCliPackageArchive(parseValidateCliPackageArguments(process.argv.slice(2)))
.then((result) => {
success(
`Validated ${result.name}@${result.version} package entry files: ${result.entryTargets.join(", ")}`
Expand Down
Loading