Skip to content

Commit 5290202

Browse files
committed
🔨 I forgot I had to build this
1 parent 06242fc commit 5290202

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

dist/index.js

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,10 +2155,10 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
21552155
error(message);
21562156
}
21572157
exports.setFailed = setFailed2;
2158-
function isDebug2() {
2158+
function isDebug() {
21592159
return process.env["RUNNER_DEBUG"] === "1";
21602160
}
2161-
exports.isDebug = isDebug2;
2161+
exports.isDebug = isDebug;
21622162
function debug2(message) {
21632163
command_1.issueCommand("debug", {}, message);
21642164
}
@@ -3088,11 +3088,10 @@ var require_dist2 = __commonJS({
30883088
});
30893089

30903090
// src/index.ts
3091-
var import_core2 = __toESM(require_core(), 1);
3091+
var import_core = __toESM(require_core(), 1);
30923092
var import_console_table_printer = __toESM(require_dist2(), 1);
30933093

30943094
// src/get-package-licenses.ts
3095-
var import_core = __toESM(require_core(), 1);
30963095
import { spawn } from "node:child_process";
30973096
import { resolve } from "node:path";
30983097
import { cwd } from "node:process";
@@ -3106,10 +3105,6 @@ async function getLicenses(directory) {
31063105
proc.on("close", resolve2);
31073106
proc.on("error", reject);
31083107
});
3109-
if ((0, import_core.isDebug)()) {
3110-
(0, import_core.debug)("Licenses JSON");
3111-
(0, import_core.debug)(stdout);
3112-
}
31133108
return stdout.startsWith("{") ? JSON.parse(stdout) : {};
31143109
}
31153110

@@ -3167,19 +3162,22 @@ async function action(directory, allowedLicenses, ignoredPackages) {
31673162

31683163
// src/index.ts
31693164
try {
3170-
const directory = ((0, import_core2.getInput)("directory", { required: false, trimWhitespace: true }) || ".").replaceAll("'", "");
3171-
const allowed_licenses = new Set((0, import_core2.getMultilineInput)("allowed", { required: false }) ?? []);
3172-
const ignored_packages = new Set((0, import_core2.getMultilineInput)("ignored", { required: false }).map((pkg) => {
3165+
const directory = ((0, import_core.getInput)("directory", { required: false, trimWhitespace: true }) || ".").replaceAll("'", "");
3166+
const allowedLicenses = new Set((0, import_core.getMultilineInput)("allowed", { required: false, trimWhitespace: true }));
3167+
const ignoredPackages = new Set((0, import_core.getMultilineInput)("ignored", { required: false, trimWhitespace: true }).map((pkg) => pkg.replace(/#.*/, "").trim()).map((pkg) => {
31733168
if (pkg.startsWith("@")) {
31743169
const [_, name2 = "", version3 = ""] = pkg.split("@");
31753170
return { name: `@${name2}`, version: version3 };
31763171
}
31773172
const [name = "", version2 = ""] = pkg.split("@");
31783173
return { name, version: version2 };
31793174
}));
3180-
const result = await action(directory, allowed_licenses, ignored_packages);
3175+
(0, import_core.debug)(`directory: ${directory}`);
3176+
(0, import_core.debug)(`allowed: ${[...allowedLicenses].join(", ")}`);
3177+
(0, import_core.debug)(`ignored: ${[...ignoredPackages].map((pkg) => `${pkg.name}@${pkg.version}`).join(", ")}`);
3178+
const result = await action(directory, allowedLicenses, ignoredPackages);
31813179
if (result.success) {
3182-
(0, import_core2.info)("All licenses are valid");
3180+
(0, import_core.info)("All licenses are valid");
31833181
const table = new import_console_table_printer.Table({
31843182
columns: [
31853183
{ alignment: "left", name: "license", title: "License" },
@@ -3190,11 +3188,11 @@ try {
31903188
license: pkg[0],
31913189
count: pkg[1].size
31923190
})));
3193-
(0, import_core2.info)(table.render());
3191+
(0, import_core.info)(table.render());
31943192
} else {
3195-
(0, import_core2.setFailed)("Invalid licenses found");
3193+
(0, import_core.setFailed)("Invalid licenses found");
31963194
for (const license of result.invalidLicenses) {
3197-
(0, import_core2.warning)(`Invalid license ${license}`);
3195+
(0, import_core.warning)(`Invalid license ${license}`);
31983196
const table = new import_console_table_printer.Table({
31993197
columns: [
32003198
{ alignment: "left", name: "name", title: "Name" },
@@ -3214,13 +3212,13 @@ try {
32143212
homepage: pkg.homepage
32153213
// todo include chain `pnpm why <package> --json`
32163214
})));
3217-
(0, import_core2.info)(table.render());
3215+
(0, import_core.info)(table.render());
32183216
}
32193217
}
32203218
} catch (error) {
32213219
if (error instanceof Error) {
3222-
(0, import_core2.setFailed)(error.message);
3220+
(0, import_core.setFailed)(error.message);
32233221
} else {
3224-
(0, import_core2.setFailed)(error ? error.toString() : "Unknown error");
3222+
(0, import_core.setFailed)(error ? error.toString() : "Unknown error");
32253223
}
32263224
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pnpm-license-summary",
3-
"version": "1.2.3",
3+
"version": "1.2.4",
44
"description": "",
55
"type": "module",
66
"main": "index.js",

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ try {
77
const directory = (getInput('directory', { required: false, trimWhitespace: true }) || '.').replaceAll('\'', '')
88
const allowedLicenses = new Set(getMultilineInput('allowed', { required: false, trimWhitespace: true }))
99
const ignoredPackages = new Set(getMultilineInput('ignored', { required: false, trimWhitespace: true })
10-
.map(pkg => pkg.replace(/#.*/, ''))
10+
.map(pkg => pkg.replace(/#.*/, '').trim())
1111
.map(pkg => {
1212
if (pkg.startsWith('@')) {
1313
const [ _, name = '', version = '' ] = pkg.split('@')

0 commit comments

Comments
 (0)