groovectl 0.1.1 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +39 -0
- package/README.md +203 -45
- package/dist/app/collection-service.d.ts +7 -1
- package/dist/app/collection-service.d.ts.map +1 -1
- package/dist/app/collection-service.js +64 -14
- package/dist/app/collection-service.js.map +1 -1
- package/dist/app/database-service.d.ts +12 -7
- package/dist/app/database-service.d.ts.map +1 -1
- package/dist/app/database-service.js +90 -12
- package/dist/app/database-service.js.map +1 -1
- package/dist/app/marketplace-offers.d.ts +25 -0
- package/dist/app/marketplace-offers.d.ts.map +1 -0
- package/dist/app/marketplace-offers.js +237 -0
- package/dist/app/marketplace-offers.js.map +1 -0
- package/dist/app/marketplace-service.d.ts +29 -2
- package/dist/app/marketplace-service.d.ts.map +1 -1
- package/dist/app/marketplace-service.js +220 -3
- package/dist/app/marketplace-service.js.map +1 -1
- package/dist/app/user-service.d.ts +11 -0
- package/dist/app/user-service.d.ts.map +1 -0
- package/dist/app/user-service.js +73 -0
- package/dist/app/user-service.js.map +1 -0
- package/dist/cli/commands/artist.d.ts.map +1 -1
- package/dist/cli/commands/artist.js +29 -8
- package/dist/cli/commands/artist.js.map +1 -1
- package/dist/cli/commands/collection.d.ts.map +1 -1
- package/dist/cli/commands/collection.js +201 -10
- package/dist/cli/commands/collection.js.map +1 -1
- package/dist/cli/commands/config.d.ts.map +1 -1
- package/dist/cli/commands/config.js +15 -1
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/database-common.d.ts +4 -3
- package/dist/cli/commands/database-common.d.ts.map +1 -1
- package/dist/cli/commands/database-common.js +9 -5
- package/dist/cli/commands/database-common.js.map +1 -1
- package/dist/cli/commands/label.d.ts.map +1 -1
- package/dist/cli/commands/label.js +11 -4
- package/dist/cli/commands/label.js.map +1 -1
- package/dist/cli/commands/list.d.ts +5 -0
- package/dist/cli/commands/list.d.ts.map +1 -0
- package/dist/cli/commands/list.js +58 -0
- package/dist/cli/commands/list.js.map +1 -0
- package/dist/cli/commands/marketplace.d.ts.map +1 -1
- package/dist/cli/commands/marketplace.js +613 -28
- package/dist/cli/commands/marketplace.js.map +1 -1
- package/dist/cli/commands/master.d.ts.map +1 -1
- package/dist/cli/commands/master.js +53 -11
- package/dist/cli/commands/master.js.map +1 -1
- package/dist/cli/commands/release.d.ts.map +1 -1
- package/dist/cli/commands/release.js +135 -23
- package/dist/cli/commands/release.js.map +1 -1
- package/dist/cli/commands/schema.d.ts +38 -0
- package/dist/cli/commands/schema.d.ts.map +1 -0
- package/dist/cli/commands/schema.js +125 -0
- package/dist/cli/commands/schema.js.map +1 -0
- package/dist/cli/commands/search.d.ts.map +1 -1
- package/dist/cli/commands/search.js +36 -17
- package/dist/cli/commands/search.js.map +1 -1
- package/dist/cli/commands/user.d.ts +5 -0
- package/dist/cli/commands/user.d.ts.map +1 -0
- package/dist/cli/commands/user.js +43 -0
- package/dist/cli/commands/user.js.map +1 -0
- package/dist/cli/commands/wantlist.d.ts.map +1 -1
- package/dist/cli/commands/wantlist.js +44 -8
- package/dist/cli/commands/wantlist.js.map +1 -1
- package/dist/cli/create-program.d.ts +3 -1
- package/dist/cli/create-program.d.ts.map +1 -1
- package/dist/cli/create-program.js +42 -10
- package/dist/cli/create-program.js.map +1 -1
- package/dist/cli/global-options.d.ts +4 -0
- package/dist/cli/global-options.d.ts.map +1 -1
- package/dist/cli/global-options.js +3 -0
- package/dist/cli/global-options.js.map +1 -1
- package/dist/cli/run-cli.d.ts.map +1 -1
- package/dist/cli/run-cli.js +63 -6
- package/dist/cli/run-cli.js.map +1 -1
- package/dist/cli/runtime.d.ts +7 -2
- package/dist/cli/runtime.d.ts.map +1 -1
- package/dist/cli/runtime.js +15 -11
- package/dist/cli/runtime.js.map +1 -1
- package/dist/config/schema.d.ts +1 -1
- package/dist/config/store.d.ts.map +1 -1
- package/dist/config/store.js +15 -1
- package/dist/config/store.js.map +1 -1
- package/dist/discogs/client.d.ts +126 -8
- package/dist/discogs/client.d.ts.map +1 -1
- package/dist/discogs/client.js +117 -19
- package/dist/discogs/client.js.map +1 -1
- package/dist/discogs/database-schemas.d.ts +24 -12
- package/dist/discogs/database-schemas.d.ts.map +1 -1
- package/dist/discogs/database-schemas.js +10 -0
- package/dist/discogs/database-schemas.js.map +1 -1
- package/dist/discogs/marketplace-page.d.ts +10 -0
- package/dist/discogs/marketplace-page.d.ts.map +1 -0
- package/dist/discogs/marketplace-page.js +140 -0
- package/dist/discogs/marketplace-page.js.map +1 -0
- package/dist/discogs/marketplace-schemas.d.ts +332 -1
- package/dist/discogs/marketplace-schemas.d.ts.map +1 -1
- package/dist/discogs/marketplace-schemas.js +137 -1
- package/dist/discogs/marketplace-schemas.js.map +1 -1
- package/dist/discogs/schemas.d.ts +66 -8
- package/dist/discogs/schemas.d.ts.map +1 -1
- package/dist/discogs/schemas.js +62 -4
- package/dist/discogs/schemas.js.map +1 -1
- package/dist/discogs/user-schemas.d.ts +117 -8
- package/dist/discogs/user-schemas.d.ts.map +1 -1
- package/dist/discogs/user-schemas.js +64 -0
- package/dist/discogs/user-schemas.js.map +1 -1
- package/dist/domain/database-resource.d.ts +2 -0
- package/dist/domain/database-resource.d.ts.map +1 -1
- package/dist/domain/marketplace.d.ts +124 -0
- package/dist/domain/marketplace.d.ts.map +1 -1
- package/dist/domain/marketplace.js +76 -0
- package/dist/domain/marketplace.js.map +1 -1
- package/dist/domain/release.d.ts +48 -0
- package/dist/domain/release.d.ts.map +1 -1
- package/dist/domain/search-result.d.ts +2 -0
- package/dist/domain/search-result.d.ts.map +1 -1
- package/dist/domain/user-resource.d.ts +57 -1
- package/dist/domain/user-resource.d.ts.map +1 -1
- package/dist/http/marketplace-request.d.ts +3 -0
- package/dist/http/marketplace-request.d.ts.map +1 -0
- package/dist/http/marketplace-request.js +67 -0
- package/dist/http/marketplace-request.js.map +1 -0
- package/dist/output/records.d.ts +4 -2
- package/dist/output/records.d.ts.map +1 -1
- package/dist/output/records.js +20 -4
- package/dist/output/records.js.map +1 -1
- package/package.json +2 -1
- package/dist/output/renderer.d.ts +0 -8
- package/dist/output/renderer.d.ts.map +0 -1
- package/dist/output/renderer.js +0 -54
- package/dist/output/renderer.js.map +0 -1
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { Command, Option } from "commander";
|
|
2
2
|
import { DatabaseService } from "../../app/database-service.js";
|
|
3
|
+
import { AppError } from "../../errors/app-error.js";
|
|
4
|
+
import { renderRecords, validateOutputFields, } from "../../output/records.js";
|
|
3
5
|
import { positiveInteger } from "../create-program.js";
|
|
4
6
|
import { fieldsFor, tokenRequestFor } from "../global-options.js";
|
|
5
|
-
import {
|
|
6
|
-
const formats = ["table", "json", "jsonl", "tsv"];
|
|
7
|
+
import { asAsync, outputFormats } from "./database-common.js";
|
|
7
8
|
const searchColumns = [
|
|
8
9
|
{ key: "type", value: (item) => item.type },
|
|
9
10
|
{ key: "id", value: (item) => item.id },
|
|
11
|
+
{ key: "masterId", value: (item) => item.masterId },
|
|
10
12
|
{ key: "title", value: (item) => item.title },
|
|
11
13
|
{ key: "year", value: (item) => item.year },
|
|
12
14
|
{ key: "country", value: (item) => item.country },
|
|
13
15
|
{ key: "formats", value: (item) => item.formats },
|
|
14
16
|
{ key: "labels", value: (item) => item.labels },
|
|
15
17
|
{ key: "catalogNumber", value: (item) => item.catalogNumber },
|
|
18
|
+
{ key: "barcodes", value: (item) => item.barcodes },
|
|
16
19
|
{ key: "url", value: (item) => item.url },
|
|
17
20
|
];
|
|
18
21
|
export function createSearchCommand(io, runtime) {
|
|
@@ -44,12 +47,16 @@ export function createSearchCommand(io, runtime) {
|
|
|
44
47
|
.option("--page <page>", "Page number", positiveInteger)
|
|
45
48
|
.option("--per-page <count>", "Results per page (max 100)", positiveInteger, 50)
|
|
46
49
|
.option("--all", "Read every result page serially.")
|
|
50
|
+
.option("--limit <count>", "Maximum records to output.", positiveInteger)
|
|
47
51
|
.addOption(new Option("--output <format>", "Output format")
|
|
48
|
-
.choices([...
|
|
52
|
+
.choices([...outputFormats])
|
|
49
53
|
.default("table"))
|
|
50
54
|
.option("--json", "Shortcut for --output json.")
|
|
51
55
|
.action(async (query, options, command) => {
|
|
52
56
|
validateOptions(query, options, command);
|
|
57
|
+
const fields = fieldsFor(command);
|
|
58
|
+
validateOutputFields(searchColumns, fields);
|
|
59
|
+
const format = await runtime.formatFor(command, options.output, options.json, "output");
|
|
53
60
|
const parameters = compact({
|
|
54
61
|
q: query,
|
|
55
62
|
type: options.type,
|
|
@@ -74,22 +81,35 @@ export function createSearchCommand(io, runtime) {
|
|
|
74
81
|
});
|
|
75
82
|
const resolved = await runtime.tokens.resolve(tokenRequestFor(command, "token_required"));
|
|
76
83
|
const client = await runtime.clientFor(command, resolved?.token);
|
|
77
|
-
await client.getIdentity();
|
|
78
84
|
const service = new DatabaseService(client);
|
|
79
85
|
const results = options.all === true
|
|
80
86
|
? service.searchAll(parameters)
|
|
81
87
|
: asAsync(await service.search(parameters));
|
|
82
|
-
await renderRecords(results,
|
|
88
|
+
await renderRecords(results, format, searchColumns, io.stdout, fields, options.limit);
|
|
83
89
|
});
|
|
84
90
|
}
|
|
85
91
|
function validateOptions(query, options, command) {
|
|
86
|
-
if (options.perPage > 100)
|
|
87
|
-
|
|
92
|
+
if (options.perPage > 100) {
|
|
93
|
+
throw new AppError({
|
|
94
|
+
kind: "usage",
|
|
95
|
+
code: "GROOVECTL_INVALID_PAGE_SIZE",
|
|
96
|
+
message: "--per-page cannot exceed 100.",
|
|
97
|
+
});
|
|
98
|
+
}
|
|
88
99
|
if (options.all === true && options.page !== undefined) {
|
|
89
|
-
|
|
100
|
+
throw new AppError({
|
|
101
|
+
kind: "usage",
|
|
102
|
+
code: "GROOVECTL_PAGINATION_CONFLICT",
|
|
103
|
+
message: "--all cannot be combined with --page.",
|
|
104
|
+
});
|
|
90
105
|
}
|
|
91
|
-
if (options.json === true &&
|
|
92
|
-
command.
|
|
106
|
+
if (options.json === true &&
|
|
107
|
+
command.getOptionValueSource("output") !== "default") {
|
|
108
|
+
throw new AppError({
|
|
109
|
+
kind: "usage",
|
|
110
|
+
code: "GROOVECTL_OUTPUT_CONFLICT",
|
|
111
|
+
message: "--json cannot be combined with --output.",
|
|
112
|
+
});
|
|
93
113
|
}
|
|
94
114
|
const criteria = [
|
|
95
115
|
query,
|
|
@@ -110,16 +130,15 @@ function validateOptions(query, options, command) {
|
|
|
110
130
|
options.submitter,
|
|
111
131
|
options.contributor,
|
|
112
132
|
];
|
|
113
|
-
if (!criteria.some((value) => value !== undefined)) {
|
|
114
|
-
|
|
133
|
+
if (!criteria.some((value) => value !== undefined && value.trim().length > 0)) {
|
|
134
|
+
throw new AppError({
|
|
135
|
+
kind: "usage",
|
|
136
|
+
code: "GROOVECTL_USAGE",
|
|
137
|
+
message: "Provide a query or at least one search filter.",
|
|
138
|
+
});
|
|
115
139
|
}
|
|
116
140
|
}
|
|
117
141
|
function compact(parameters) {
|
|
118
142
|
return Object.fromEntries(Object.entries(parameters).filter(([, value]) => value !== undefined));
|
|
119
143
|
}
|
|
120
|
-
async function* asAsync(values) {
|
|
121
|
-
for (const value of values) {
|
|
122
|
-
yield await Promise.resolve(value);
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
144
|
//# sourceMappingURL=search.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/cli/commands/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/cli/commands/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAyBhD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAqCzE"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { Command } from "commander";
|
|
2
|
+
import { UserService } from "../../app/user-service.js";
|
|
3
|
+
import { renderRecord, validateOutputFields } from "../../output/records.js";
|
|
4
|
+
import { nonEmptyText } from "../create-program.js";
|
|
5
|
+
import { fieldsFor, tokenRequestFor } from "../global-options.js";
|
|
6
|
+
import { addOutputOptions, outputFormat, } from "./database-common.js";
|
|
7
|
+
const profileColumns = [
|
|
8
|
+
{ key: "id", value: (item) => item.id },
|
|
9
|
+
{ key: "username", value: (item) => item.username },
|
|
10
|
+
{ key: "name", value: (item) => item.name },
|
|
11
|
+
{ key: "location", value: (item) => item.location },
|
|
12
|
+
{ key: "currency", value: (item) => item.currency },
|
|
13
|
+
{ key: "numCollection", value: (item) => item.numCollection },
|
|
14
|
+
{ key: "numWantlist", value: (item) => item.numWantlist },
|
|
15
|
+
{ key: "numForSale", value: (item) => item.numForSale },
|
|
16
|
+
{ key: "numLists", value: (item) => item.numLists },
|
|
17
|
+
{ key: "buyerRating", value: (item) => item.buyerRating },
|
|
18
|
+
{ key: "sellerRating", value: (item) => item.sellerRating },
|
|
19
|
+
{ key: "registered", value: (item) => item.registered },
|
|
20
|
+
{ key: "profile", value: (item) => item.profile },
|
|
21
|
+
{ key: "homePage", value: (item) => item.homePage },
|
|
22
|
+
{ key: "url", value: (item) => item.url },
|
|
23
|
+
];
|
|
24
|
+
export function createUserCommand(io, runtime) {
|
|
25
|
+
const user = new Command("user").description("Read Discogs user profiles.");
|
|
26
|
+
addOutputOptions(user
|
|
27
|
+
.command("profile")
|
|
28
|
+
.description("Get a Discogs user profile (defaults to the authenticated user when username is omitted).")
|
|
29
|
+
.argument("[username]", "Discogs username", nonEmptyText)).action(async (username, options, command) => {
|
|
30
|
+
const requestedFormat = outputFormat(options, command);
|
|
31
|
+
const fields = fieldsFor(command);
|
|
32
|
+
validateOutputFields(profileColumns, fields);
|
|
33
|
+
const format = await runtime.formatFor(command, requestedFormat, options.json);
|
|
34
|
+
const policy = username === undefined ? "token_required" : "token_optional";
|
|
35
|
+
const resolved = await runtime.tokens.resolve(tokenRequestFor(command, policy));
|
|
36
|
+
const client = await runtime.clientFor(command, resolved?.token);
|
|
37
|
+
const targetUsername = username ?? (await client.getIdentity()).username;
|
|
38
|
+
const result = await new UserService(client).getProfile(targetUsername);
|
|
39
|
+
renderRecord(result, format, profileColumns, io.stdout, fields);
|
|
40
|
+
});
|
|
41
|
+
return user;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=user.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/cli/commands/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wantlist.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wantlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"wantlist.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wantlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAgB1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAkC3C,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAkM7E"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Command } from "commander";
|
|
1
|
+
import { Command, InvalidArgumentError } from "commander";
|
|
2
2
|
import { WantlistService } from "../../app/wantlist-service.js";
|
|
3
3
|
import { AppError } from "../../errors/app-error.js";
|
|
4
4
|
import { renderRecord, renderRecords, validateOutputFields, } from "../../output/records.js";
|
|
@@ -12,6 +12,11 @@ const itemColumns = [
|
|
|
12
12
|
{ key: "artists", value: (item) => item.artists },
|
|
13
13
|
{ key: "year", value: (item) => item.year },
|
|
14
14
|
{ key: "formats", value: (item) => item.formats },
|
|
15
|
+
{ key: "labels", value: (item) => item.labels },
|
|
16
|
+
{
|
|
17
|
+
key: "catalogNumbers",
|
|
18
|
+
value: (item) => item.catalogNumbers,
|
|
19
|
+
},
|
|
15
20
|
{ key: "rating", value: (item) => item.rating },
|
|
16
21
|
{ key: "notes", value: (item) => item.notes },
|
|
17
22
|
];
|
|
@@ -25,16 +30,24 @@ const mutationColumns = [
|
|
|
25
30
|
];
|
|
26
31
|
export function createWantlistCommand(io, runtime) {
|
|
27
32
|
const wantlist = new Command("wantlist").description("Read and manage the authenticated user's Discogs wantlist.");
|
|
28
|
-
addListOptions(wantlist.command("list").description("List wantlist releases."))
|
|
29
|
-
|
|
33
|
+
addListOptions(wantlist.command("list").description("List wantlist releases."))
|
|
34
|
+
.option("--query <text>", "Filter read items locally by title, artist, label, catalog number, or notes.", nonEmptyQuery)
|
|
35
|
+
.action(async (options, command) => {
|
|
36
|
+
validateListOptions(options, command);
|
|
37
|
+
const fields = fieldsFor(command);
|
|
38
|
+
validateOutputFields(itemColumns, fields);
|
|
39
|
+
const format = await runtime.formatFor(command, outputFormat(options, command), options.json);
|
|
30
40
|
const { service, username } = await context(runtime, command);
|
|
31
|
-
const
|
|
41
|
+
const rawValues = options.all === true
|
|
32
42
|
? service.listAll(username, { per_page: options.perPage })
|
|
33
43
|
: asAsync(await service.list(username, {
|
|
34
44
|
per_page: options.perPage,
|
|
35
45
|
...(options.page === undefined ? {} : { page: options.page }),
|
|
36
46
|
}));
|
|
37
|
-
|
|
47
|
+
const values = options.query === undefined
|
|
48
|
+
? rawValues
|
|
49
|
+
: filterWantlistItems(rawValues, options.query);
|
|
50
|
+
await renderRecords(values, format, itemColumns, io.stdout, fields, options.limit);
|
|
38
51
|
});
|
|
39
52
|
addOutputOptions(wantlist
|
|
40
53
|
.command("add")
|
|
@@ -44,7 +57,7 @@ export function createWantlistCommand(io, runtime) {
|
|
|
44
57
|
.option("--notes <text>", "Wantlist notes")
|
|
45
58
|
.option("--dry-run", "Show the intended change without writing.")
|
|
46
59
|
.action(async (releaseId, options, command) => {
|
|
47
|
-
const format = await runtime.formatFor(command, outputFormat(options), options.json);
|
|
60
|
+
const format = await runtime.formatFor(command, outputFormat(options, command), options.json);
|
|
48
61
|
const fields = fieldsFor(command);
|
|
49
62
|
validateOutputFields(options.dryRun === true ? mutationColumns : itemColumns, fields);
|
|
50
63
|
const { service, username } = await context(runtime, command);
|
|
@@ -68,7 +81,7 @@ export function createWantlistCommand(io, runtime) {
|
|
|
68
81
|
code: "GROOVECTL_USAGE",
|
|
69
82
|
message: "Provide --rating and/or --notes.",
|
|
70
83
|
});
|
|
71
|
-
const format = await runtime.formatFor(command, outputFormat(options), options.json);
|
|
84
|
+
const format = await runtime.formatFor(command, outputFormat(options, command), options.json);
|
|
72
85
|
const fields = fieldsFor(command);
|
|
73
86
|
validateOutputFields(options.dryRun === true ? mutationColumns : itemColumns, fields);
|
|
74
87
|
const { service, username } = await context(runtime, command);
|
|
@@ -85,7 +98,7 @@ export function createWantlistCommand(io, runtime) {
|
|
|
85
98
|
.option("--yes", "Skip the confirmation prompt.")
|
|
86
99
|
.option("--dry-run", "Show the intended change without writing.")
|
|
87
100
|
.action(async (releaseId, options, command) => {
|
|
88
|
-
const format = await runtime.formatFor(command, outputFormat(options), options.json);
|
|
101
|
+
const format = await runtime.formatFor(command, outputFormat(options, command), options.json);
|
|
89
102
|
const fields = fieldsFor(command);
|
|
90
103
|
validateOutputFields(mutationColumns, fields);
|
|
91
104
|
const { service, username } = await context(runtime, command);
|
|
@@ -119,4 +132,27 @@ function result(action, username, releaseId, options) {
|
|
|
119
132
|
dryRun: options.dryRun === true,
|
|
120
133
|
};
|
|
121
134
|
}
|
|
135
|
+
function nonEmptyQuery(value) {
|
|
136
|
+
const trimmed = value.trim();
|
|
137
|
+
if (trimmed.length === 0) {
|
|
138
|
+
throw new InvalidArgumentError("expected a non-empty query");
|
|
139
|
+
}
|
|
140
|
+
return trimmed;
|
|
141
|
+
}
|
|
142
|
+
async function* filterWantlistItems(items, query) {
|
|
143
|
+
const needle = query.toLowerCase();
|
|
144
|
+
for await (const item of items) {
|
|
145
|
+
const haystack = [
|
|
146
|
+
item.title,
|
|
147
|
+
...item.artists,
|
|
148
|
+
...item.labels,
|
|
149
|
+
...item.catalogNumbers,
|
|
150
|
+
item.notes ?? "",
|
|
151
|
+
]
|
|
152
|
+
.join(" ")
|
|
153
|
+
.toLowerCase();
|
|
154
|
+
if (haystack.includes(needle))
|
|
155
|
+
yield item;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
122
158
|
//# sourceMappingURL=wantlist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wantlist.js","sourceRoot":"","sources":["../../../src/cli/commands/wantlist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"wantlist.js","sourceRoot":"","sources":["../../../src/cli/commands/wantlist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
import type { CliIo } from "./run-cli.js";
|
|
3
|
+
import type { ErrorFormat } from "./global-options.js";
|
|
3
4
|
import { type RuntimeDependencies } from "./runtime.js";
|
|
4
|
-
export declare function createProgram(io: CliIo, dependencies?: RuntimeDependencies): Command;
|
|
5
|
+
export declare function createProgram(io: CliIo, dependencies?: RuntimeDependencies, errorFormat?: ErrorFormat): Command;
|
|
5
6
|
export declare function positiveInteger(value: string): number;
|
|
6
7
|
export declare function nonNegativeInteger(value: string): number;
|
|
7
8
|
export declare function rating(value: string): number;
|
|
9
|
+
export declare function nonEmptyText(value: string): string;
|
|
8
10
|
//# sourceMappingURL=create-program.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-program.d.ts","sourceRoot":"","sources":["../../src/cli/create-program.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"create-program.d.ts","sourceRoot":"","sources":["../../src/cli/create-program.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAcvD,OAAO,EAAc,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGpE,wBAAgB,aAAa,CAC3B,EAAE,EAAE,KAAK,EACT,YAAY,GAAE,mBAAwB,EACtC,WAAW,GAAE,WAAoB,GAChC,OAAO,CA8ET;AAgBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAUrD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK5C;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMlD"}
|
|
@@ -1,23 +1,38 @@
|
|
|
1
|
-
import { Command, InvalidArgumentError, } from "commander";
|
|
1
|
+
import { Command, InvalidArgumentError, Option, } from "commander";
|
|
2
2
|
import { createAuthCommand } from "./commands/auth.js";
|
|
3
3
|
import { createArtistCommand } from "./commands/artist.js";
|
|
4
4
|
import { createLabelCommand } from "./commands/label.js";
|
|
5
|
+
import { createListCommand } from "./commands/list.js";
|
|
5
6
|
import { createMasterCommand } from "./commands/master.js";
|
|
6
7
|
import { createReleaseCommand } from "./commands/release.js";
|
|
8
|
+
import { createSchemaCommand } from "./commands/schema.js";
|
|
7
9
|
import { createSearchCommand } from "./commands/search.js";
|
|
8
10
|
import { createConfigCommand } from "./commands/config.js";
|
|
9
11
|
import { createCollectionCommand } from "./commands/collection.js";
|
|
12
|
+
import { createUserCommand } from "./commands/user.js";
|
|
10
13
|
import { createWantlistCommand } from "./commands/wantlist.js";
|
|
11
14
|
import { createMarketplaceCommand } from "./commands/marketplace.js";
|
|
12
15
|
import { CliRuntime } from "./runtime.js";
|
|
13
16
|
import { buildInfo, packageVersion } from "../version.js";
|
|
14
|
-
export function createProgram(io, dependencies = {}) {
|
|
17
|
+
export function createProgram(io, dependencies = {}, errorFormat = "text") {
|
|
15
18
|
const program = new Command();
|
|
16
|
-
const runtime = new CliRuntime(
|
|
19
|
+
const runtime = new CliRuntime({
|
|
20
|
+
stderr: io.stderr,
|
|
21
|
+
errorFormat,
|
|
22
|
+
...dependencies,
|
|
23
|
+
});
|
|
17
24
|
const output = {
|
|
18
25
|
writeOut: (text) => io.stdout.write(text),
|
|
19
|
-
writeErr: (text) =>
|
|
20
|
-
|
|
26
|
+
writeErr: (text) => {
|
|
27
|
+
if (errorFormat === "json")
|
|
28
|
+
return;
|
|
29
|
+
io.stderr.write(text);
|
|
30
|
+
},
|
|
31
|
+
outputError: (text, write) => {
|
|
32
|
+
if (errorFormat === "json")
|
|
33
|
+
return;
|
|
34
|
+
write(text.replace(/^error:/u, "GROOVECTL_USAGE:"));
|
|
35
|
+
},
|
|
21
36
|
};
|
|
22
37
|
program
|
|
23
38
|
.name("groovectl")
|
|
@@ -29,7 +44,11 @@ export function createProgram(io, dependencies = {}) {
|
|
|
29
44
|
.option("--no-color", "Disable colored output.")
|
|
30
45
|
.option("--timeout <milliseconds>", "HTTP timeout per request attempt, in milliseconds.", positiveInteger)
|
|
31
46
|
.option("--verbose", "Write sanitized request diagnostics to stderr.")
|
|
32
|
-
.
|
|
47
|
+
.option("-q, --quiet", "Suppress informational notices on stderr.")
|
|
48
|
+
.addOption(new Option("--error-format <format>", "Error output format on stderr (also configurable via GROOVECTL_ERROR_FORMAT).")
|
|
49
|
+
.choices(["text", "json"])
|
|
50
|
+
.default("text"))
|
|
51
|
+
.showHelpAfterError(errorFormat !== "json")
|
|
33
52
|
.configureOutput(output);
|
|
34
53
|
program
|
|
35
54
|
.command("version")
|
|
@@ -52,16 +71,22 @@ export function createProgram(io, dependencies = {}) {
|
|
|
52
71
|
program.addCommand(createLabelCommand(io, runtime));
|
|
53
72
|
program.addCommand(createCollectionCommand(io, runtime));
|
|
54
73
|
program.addCommand(createWantlistCommand(io, runtime));
|
|
74
|
+
program.addCommand(createUserCommand(io, runtime));
|
|
75
|
+
program.addCommand(createListCommand(io, runtime));
|
|
55
76
|
program.addCommand(createMarketplaceCommand(io, runtime));
|
|
77
|
+
program.addCommand(createSchemaCommand(io, program));
|
|
56
78
|
for (const command of program.commands) {
|
|
57
|
-
configureCommandTree(command, output);
|
|
79
|
+
configureCommandTree(command, output, errorFormat !== "json");
|
|
58
80
|
}
|
|
59
81
|
return program;
|
|
60
82
|
}
|
|
61
|
-
function configureCommandTree(command, output) {
|
|
62
|
-
command
|
|
83
|
+
function configureCommandTree(command, output, showHelpAfterError) {
|
|
84
|
+
command
|
|
85
|
+
.exitOverride()
|
|
86
|
+
.showHelpAfterError(showHelpAfterError)
|
|
87
|
+
.configureOutput(output);
|
|
63
88
|
for (const child of command.commands) {
|
|
64
|
-
configureCommandTree(child, output);
|
|
89
|
+
configureCommandTree(child, output, showHelpAfterError);
|
|
65
90
|
}
|
|
66
91
|
}
|
|
67
92
|
export function positiveInteger(value) {
|
|
@@ -86,4 +111,11 @@ export function rating(value) {
|
|
|
86
111
|
throw new InvalidArgumentError("expected a rating from 0 to 5");
|
|
87
112
|
return parsed;
|
|
88
113
|
}
|
|
114
|
+
export function nonEmptyText(value) {
|
|
115
|
+
const trimmed = value.trim();
|
|
116
|
+
if (trimmed.length === 0) {
|
|
117
|
+
throw new InvalidArgumentError("expected a non-empty value");
|
|
118
|
+
}
|
|
119
|
+
return trimmed;
|
|
120
|
+
}
|
|
89
121
|
//# sourceMappingURL=create-program.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-program.js","sourceRoot":"","sources":["../../src/cli/create-program.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,oBAAoB,
|
|
1
|
+
{"version":3,"file":"create-program.js","sourceRoot":"","sources":["../../src/cli/create-program.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import type { Command } from "commander";
|
|
2
2
|
import type { AuthPolicy, TokenRequest } from "../auth/token-provider.js";
|
|
3
|
+
export type ErrorFormat = "text" | "json";
|
|
3
4
|
export interface GlobalOptions {
|
|
4
5
|
color?: boolean;
|
|
6
|
+
errorFormat?: ErrorFormat;
|
|
5
7
|
fields?: string;
|
|
8
|
+
quiet?: boolean;
|
|
6
9
|
token?: boolean;
|
|
7
10
|
tokenStdin?: boolean;
|
|
8
11
|
timeout?: number;
|
|
9
12
|
verbose?: boolean;
|
|
10
13
|
}
|
|
14
|
+
export declare function isQuiet(command: Command): boolean;
|
|
11
15
|
export declare function tokenRequestFor(command: Command, policy: AuthPolicy, forcePrompt?: boolean): TokenRequest;
|
|
12
16
|
export declare function timeoutFor(command: Command): number | undefined;
|
|
13
17
|
export declare function fieldsFor(command: Command): string[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-options.d.ts","sourceRoot":"","sources":["../../src/cli/global-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE1E,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,UAAU,EAClB,WAAW,UAAQ,GAClB,YAAY,CAOd;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAQhE"}
|
|
1
|
+
{"version":3,"file":"global-options.d.ts","sourceRoot":"","sources":["../../src/cli/global-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE1E,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;AAE1C,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEjD;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,UAAU,EAClB,WAAW,UAAQ,GAClB,YAAY,CAOd;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAQhE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-options.js","sourceRoot":"","sources":["../../src/cli/global-options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"global-options.js","sourceRoot":"","sources":["../../src/cli/global-options.ts"],"names":[],"mappings":"AAiBA,MAAM,UAAU,OAAO,CAAC,OAAgB;IACtC,OAAO,OAAO,CAAC,eAAe,EAAiB,CAAC,KAAK,KAAK,IAAI,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,OAAgB,EAChB,MAAkB,EAClB,WAAW,GAAG,KAAK;IAEnB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,EAAiB,CAAC;IACzD,OAAO;QACL,MAAM;QACN,UAAU,EAAE,OAAO,CAAC,UAAU,KAAK,IAAI;QACvC,WAAW,EAAE,WAAW,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI;KACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAgB;IACzC,OAAO,OAAO,CAAC,eAAe,EAAiB,CAAC,OAAO,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,EAAiB,CAAC,MAAM,CAAC;IAC9D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,MAAM,GAAG,KAAK;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC5B,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;AAClD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-cli.d.ts","sourceRoot":"","sources":["../../src/cli/run-cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-cli.d.ts","sourceRoot":"","sources":["../../src/cli/run-cli.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,MAAM,WAAW,KAAK;IACpB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CAC3C;AAOD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,GAAE,KAAiB,EACrB,YAAY,GAAE,mBAAwB,GACrC,OAAO,CAAC,MAAM,CAAC,CAiDjB"}
|
package/dist/cli/run-cli.js
CHANGED
|
@@ -6,7 +6,8 @@ const defaultIo = {
|
|
|
6
6
|
stderr: process.stderr,
|
|
7
7
|
};
|
|
8
8
|
export async function runCli(argv, io = defaultIo, dependencies = {}) {
|
|
9
|
-
const
|
|
9
|
+
const errorFormat = resolveErrorFormat(argv, dependencies.env ?? process.env);
|
|
10
|
+
const program = createProgram(io, dependencies, errorFormat);
|
|
10
11
|
program.exitOverride();
|
|
11
12
|
try {
|
|
12
13
|
await program.parseAsync([...argv], { from: "user" });
|
|
@@ -14,14 +15,70 @@ export async function runCli(argv, io = defaultIo, dependencies = {}) {
|
|
|
14
15
|
}
|
|
15
16
|
catch (error) {
|
|
16
17
|
if (error instanceof CommanderError) {
|
|
17
|
-
|
|
18
|
+
if (error.exitCode === 0)
|
|
19
|
+
return 0;
|
|
20
|
+
if (errorFormat === "json") {
|
|
21
|
+
const missingSubcommand = error.code === "commander.help";
|
|
22
|
+
const message = missingSubcommand
|
|
23
|
+
? "Missing or unknown subcommand."
|
|
24
|
+
: error.message.replace(/^error:\s*/u, "").trim();
|
|
25
|
+
writeJsonError(io.stderr, {
|
|
26
|
+
code: "GROOVECTL_USAGE",
|
|
27
|
+
kind: "usage",
|
|
28
|
+
message,
|
|
29
|
+
remediation: missingSubcommand
|
|
30
|
+
? "Run `groovectl schema --compact` or pass `--help` to see available commands."
|
|
31
|
+
: null,
|
|
32
|
+
httpStatus: null,
|
|
33
|
+
exitCode: 2,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
return 2;
|
|
18
37
|
}
|
|
19
38
|
const appError = asAppError(error);
|
|
20
|
-
|
|
21
|
-
if (
|
|
22
|
-
io.stderr
|
|
39
|
+
const exitCode = exitCodeForError(appError);
|
|
40
|
+
if (errorFormat === "json") {
|
|
41
|
+
writeJsonError(io.stderr, {
|
|
42
|
+
code: appError.code,
|
|
43
|
+
kind: appError.kind,
|
|
44
|
+
message: appError.message,
|
|
45
|
+
remediation: appError.remediation ?? null,
|
|
46
|
+
httpStatus: appError.httpStatus ?? null,
|
|
47
|
+
exitCode,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
io.stderr.write(`${appError.code}: ${appError.message}\n`);
|
|
52
|
+
if (appError.remediation !== undefined) {
|
|
53
|
+
io.stderr.write(`${appError.remediation}\n`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return exitCode;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
function resolveErrorFormat(argv, env) {
|
|
60
|
+
let detected;
|
|
61
|
+
for (let index = 0; index < argv.length; index += 1) {
|
|
62
|
+
const arg = argv[index];
|
|
63
|
+
if (arg === "--")
|
|
64
|
+
break;
|
|
65
|
+
if (arg === "--error-format") {
|
|
66
|
+
const next = argv[index + 1];
|
|
67
|
+
if (next === "json" || next === "text")
|
|
68
|
+
detected = next;
|
|
69
|
+
index += 1;
|
|
70
|
+
}
|
|
71
|
+
else if (arg?.startsWith("--error-format=")) {
|
|
72
|
+
const value = arg.slice("--error-format=".length);
|
|
73
|
+
if (value === "json" || value === "text")
|
|
74
|
+
detected = value;
|
|
23
75
|
}
|
|
24
|
-
return exitCodeForError(appError);
|
|
25
76
|
}
|
|
77
|
+
if (detected !== undefined)
|
|
78
|
+
return detected;
|
|
79
|
+
return env.GROOVECTL_ERROR_FORMAT === "json" ? "json" : "text";
|
|
80
|
+
}
|
|
81
|
+
function writeJsonError(stderr, payload) {
|
|
82
|
+
stderr.write(`${JSON.stringify({ error: payload })}\n`);
|
|
26
83
|
}
|
|
27
84
|
//# sourceMappingURL=run-cli.js.map
|