@detergent-software/atk 9.0.0 → 9.1.0-dev.10
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 +77 -0
- package/README.md +47 -42
- package/build/command-manifest.json +60 -2
- package/build/commands/audit.d.ts.map +1 -1
- package/build/commands/audit.js +21 -9
- package/build/commands/audit.js.map +1 -1
- package/build/commands/browse.d.ts.map +1 -1
- package/build/commands/browse.js +18 -14
- package/build/commands/browse.js.map +1 -1
- package/build/commands/deprecate.d.ts.map +1 -1
- package/build/commands/deprecate.js +2 -12
- package/build/commands/deprecate.js.map +1 -1
- package/build/commands/init.d.ts +3 -1
- package/build/commands/init.d.ts.map +1 -1
- package/build/commands/init.js +41 -4
- package/build/commands/init.js.map +1 -1
- package/build/commands/list.js +7 -5
- package/build/commands/list.js.map +1 -1
- package/build/commands/promote.d.ts +2 -1
- package/build/commands/promote.d.ts.map +1 -1
- package/build/commands/promote.js +35 -16
- package/build/commands/promote.js.map +1 -1
- package/build/commands/search.d.ts +8 -2
- package/build/commands/search.d.ts.map +1 -1
- package/build/commands/search.js +55 -9
- package/build/commands/search.js.map +1 -1
- package/build/commands/unpublish.d.ts +2 -1
- package/build/commands/unpublish.d.ts.map +1 -1
- package/build/commands/unpublish.js +35 -16
- package/build/commands/unpublish.js.map +1 -1
- package/build/commands/validate.d.ts +13 -0
- package/build/commands/validate.d.ts.map +1 -0
- package/build/commands/validate.js +55 -0
- package/build/commands/validate.js.map +1 -0
- package/build/components/AssetTable.d.ts +4 -0
- package/build/components/AssetTable.d.ts.map +1 -1
- package/build/components/AssetTable.js +1 -1
- package/build/components/AssetTable.js.map +1 -1
- package/build/components/ErrorView.d.ts +12 -1
- package/build/components/ErrorView.d.ts.map +1 -1
- package/build/components/ErrorView.js +15 -2
- package/build/components/ErrorView.js.map +1 -1
- package/build/components/InitSuccess.d.ts.map +1 -1
- package/build/components/InitSuccess.js +1 -1
- package/build/components/InitSuccess.js.map +1 -1
- package/build/components/InstallConfirmBar.d.ts.map +1 -1
- package/build/components/InstallConfirmBar.js +2 -1
- package/build/components/InstallConfirmBar.js.map +1 -1
- package/build/components/ListActionBar.d.ts.map +1 -1
- package/build/components/ListActionBar.js +2 -1
- package/build/components/ListActionBar.js.map +1 -1
- package/build/components/index.d.ts +1 -1
- package/build/components/index.d.ts.map +1 -1
- package/build/components/index.js +1 -1
- package/build/components/index.js.map +1 -1
- package/build/hooks/useBrowseState.d.ts +11 -5
- package/build/hooks/useBrowseState.d.ts.map +1 -1
- package/build/hooks/useBrowseState.js +6 -7
- package/build/hooks/useBrowseState.js.map +1 -1
- package/build/hooks/useInitState.d.ts +2 -0
- package/build/hooks/useInitState.d.ts.map +1 -1
- package/build/hooks/useInitState.js +56 -14
- package/build/hooks/useInitState.js.map +1 -1
- package/build/hooks/useListActions.d.ts +6 -2
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +11 -8
- package/build/hooks/useListActions.js.map +1 -1
- package/build/hooks/useListState.d.ts +10 -4
- package/build/hooks/useListState.d.ts.map +1 -1
- package/build/hooks/useListState.js +2 -0
- package/build/hooks/useListState.js.map +1 -1
- package/build/lib/adapter.d.ts +2 -0
- package/build/lib/adapter.d.ts.map +1 -1
- package/build/lib/adapter.js +11 -11
- package/build/lib/adapter.js.map +1 -1
- package/build/lib/config-entries.d.ts +12 -1
- package/build/lib/config-entries.d.ts.map +1 -1
- package/build/lib/config-entries.js +22 -1
- package/build/lib/config-entries.js.map +1 -1
- package/build/lib/config-file.d.ts +8 -5
- package/build/lib/config-file.d.ts.map +1 -1
- package/build/lib/config-file.js +28 -7
- package/build/lib/config-file.js.map +1 -1
- package/build/lib/init.d.ts +4 -0
- package/build/lib/init.d.ts.map +1 -1
- package/build/lib/init.js +5 -2
- package/build/lib/init.js.map +1 -1
- package/build/lib/installer.d.ts.map +1 -1
- package/build/lib/installer.js +92 -41
- package/build/lib/installer.js.map +1 -1
- package/build/lib/jsonc.d.ts +25 -0
- package/build/lib/jsonc.d.ts.map +1 -0
- package/build/lib/jsonc.js +204 -0
- package/build/lib/jsonc.js.map +1 -0
- package/build/lib/output.d.ts +13 -0
- package/build/lib/output.d.ts.map +1 -1
- package/build/lib/output.js +13 -3
- package/build/lib/output.js.map +1 -1
- package/build/lib/owned-paths.d.ts +9 -0
- package/build/lib/owned-paths.d.ts.map +1 -1
- package/build/lib/owned-paths.js +51 -3
- package/build/lib/owned-paths.js.map +1 -1
- package/build/lib/publish-flow.d.ts +2 -0
- package/build/lib/publish-flow.d.ts.map +1 -1
- package/build/lib/publish-flow.js +6 -2
- package/build/lib/publish-flow.js.map +1 -1
- package/build/lib/publisher.d.ts.map +1 -1
- package/build/lib/publisher.js +26 -1
- package/build/lib/publisher.js.map +1 -1
- package/build/lib/registry-change-json.d.ts +32 -0
- package/build/lib/registry-change-json.d.ts.map +1 -0
- package/build/lib/registry-change-json.js +32 -0
- package/build/lib/registry-change-json.js.map +1 -0
- package/build/lib/registry.d.ts +6 -1
- package/build/lib/registry.d.ts.map +1 -1
- package/build/lib/registry.js +8 -0
- package/build/lib/registry.js.map +1 -1
- package/build/lib/search.d.ts +36 -9
- package/build/lib/search.d.ts.map +1 -1
- package/build/lib/search.js +138 -68
- package/build/lib/search.js.map +1 -1
- package/build/lib/setup.d.ts +2 -1
- package/build/lib/setup.d.ts.map +1 -1
- package/build/lib/setup.js +3 -2
- package/build/lib/setup.js.map +1 -1
- package/build/lib/sync.d.ts.map +1 -1
- package/build/lib/sync.js +33 -6
- package/build/lib/sync.js.map +1 -1
- package/build/lib/tool-resolver.d.ts +1 -1
- package/build/lib/tool-resolver.d.ts.map +1 -1
- package/build/lib/tool-resolver.js +34 -13
- package/build/lib/tool-resolver.js.map +1 -1
- package/build/lib/touched-paths.d.ts +12 -0
- package/build/lib/touched-paths.d.ts.map +1 -0
- package/build/lib/touched-paths.js +38 -0
- package/build/lib/touched-paths.js.map +1 -0
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +5 -36
- package/build/lib/updater.js.map +1 -1
- package/build/lib/validate.d.ts +30 -0
- package/build/lib/validate.d.ts.map +1 -0
- package/build/lib/validate.js +111 -0
- package/build/lib/validate.js.map +1 -0
- package/build/lib/write-file.d.ts +6 -0
- package/build/lib/write-file.d.ts.map +1 -1
- package/build/lib/write-file.js +15 -15
- package/build/lib/write-file.js.map +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import { applyEdits, createScanner, findNodeAtLocation, format, modify, parse, parseTree, printParseErrorCode, } from 'jsonc-parser';
|
|
2
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
3
|
+
import { detectIndent } from './write-file.js';
|
|
4
|
+
const BOM = '';
|
|
5
|
+
/** The rest of a line that holds nothing more than a line comment. */
|
|
6
|
+
const LINE_END = /^[ \t]*(\/\/.*)?\r?$/;
|
|
7
|
+
/**
|
|
8
|
+
* The text of `text` changed to hold `after`, with only the `section.child` entries that differ
|
|
9
|
+
* edited (a whole section where either side isn't an object), or `undefined` when that can't be
|
|
10
|
+
* done: the text doesn't parse to an object, or the edit doesn't read back as `after`. The caller
|
|
11
|
+
* then rewrites the whole document.
|
|
12
|
+
*/
|
|
13
|
+
export function editJsonc(text, after) {
|
|
14
|
+
if (text.startsWith(BOM)) {
|
|
15
|
+
const edited = editJsonc(text.slice(BOM.length), after);
|
|
16
|
+
return edited === undefined ? undefined : BOM + edited;
|
|
17
|
+
}
|
|
18
|
+
let before;
|
|
19
|
+
try {
|
|
20
|
+
before = parseJsonc(text);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
if (!isObject(before))
|
|
26
|
+
return undefined;
|
|
27
|
+
const options = formatting(text);
|
|
28
|
+
let result = text;
|
|
29
|
+
for (const [path, value] of changes(before, after)) {
|
|
30
|
+
result = applyChange(result, path, value, options);
|
|
31
|
+
}
|
|
32
|
+
try {
|
|
33
|
+
// What ATK wants, as it reads back from disk (no `undefined` members).
|
|
34
|
+
return isDeepStrictEqual(parseJsonc(result), JSON.parse(JSON.stringify(after))) ? result : undefined;
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/** Whether `text` is strict JSON: no comments, no trailing commas. */
|
|
41
|
+
export function isStrictJson(text) {
|
|
42
|
+
try {
|
|
43
|
+
JSON.parse(text);
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Parse JSONC text, after a byte order mark (PowerShell 5 writes one; VS Code reads past it).
|
|
52
|
+
* Throws a `SyntaxError` naming the first problem and where it is, as `JSON.parse` would for the
|
|
53
|
+
* strict JSON it also reads.
|
|
54
|
+
*/
|
|
55
|
+
export function parseJsonc(text) {
|
|
56
|
+
if (text.startsWith(BOM))
|
|
57
|
+
return parseJsonc(text.slice(BOM.length));
|
|
58
|
+
const errors = [];
|
|
59
|
+
const value = parse(text, errors, { allowTrailingComma: true });
|
|
60
|
+
const [first] = errors;
|
|
61
|
+
if (first) {
|
|
62
|
+
throw new SyntaxError(`${printParseErrorCode(first.error)} at ${position(text, first.offset)}`);
|
|
63
|
+
}
|
|
64
|
+
return value;
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* `text` with a new member at `path` on a line of its own after the object's last member, or
|
|
68
|
+
* `undefined` when `path` is there already, the object has no members, or something other than a
|
|
69
|
+
* comment follows the last member on its line. jsonc-parser puts a new member right after the last
|
|
70
|
+
* value, so the comment at the end of that line would move to the new member.
|
|
71
|
+
*/
|
|
72
|
+
function appendMember(text, path, value, options) {
|
|
73
|
+
const root = parseTree(text, [], { allowTrailingComma: true });
|
|
74
|
+
const object = root && (path.length === 1 ? root : findNodeAtLocation(root, path.slice(0, -1)));
|
|
75
|
+
const last = object?.type === 'object' ? object.children?.at(-1) : undefined;
|
|
76
|
+
if (!root || !last || findNodeAtLocation(root, path) !== undefined)
|
|
77
|
+
return undefined;
|
|
78
|
+
const lastEnd = last.offset + last.length;
|
|
79
|
+
const after = nextToken(text, lastEnd);
|
|
80
|
+
const trailingComma = text[after] === ',';
|
|
81
|
+
const from = trailingComma ? after + 1 : lastEnd;
|
|
82
|
+
const newline = text.indexOf('\n', from);
|
|
83
|
+
if (newline === -1 || !LINE_END.test(text.slice(from, newline)))
|
|
84
|
+
return undefined;
|
|
85
|
+
const lineStart = text.lastIndexOf('\n', last.offset - 1) + 1;
|
|
86
|
+
const indent = /^[ \t]*/.exec(text.slice(lineStart))[0];
|
|
87
|
+
const member = `${JSON.stringify(path.at(-1))}: ${JSON.stringify(value)}${trailingComma ? ',' : ''}`;
|
|
88
|
+
const at = newline + 1;
|
|
89
|
+
let result = text.slice(0, at) + indent + member + (options.eol ?? '\n') + text.slice(at);
|
|
90
|
+
result = applyEdits(result, format(result, { length: member.length, offset: at + indent.length }, options));
|
|
91
|
+
// Without a trailing comma, the last member takes the comma that now separates them.
|
|
92
|
+
return trailingComma ? result : result.slice(0, lastEnd) + ',' + result.slice(lastEnd);
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Set `path` to `value` in `text` (`undefined` removes it), and lay out only what was inserted.
|
|
96
|
+
* jsonc-parser's own formatting takes in the whole line the insertion lands on, which would reflow
|
|
97
|
+
* the user's entry before it.
|
|
98
|
+
*/
|
|
99
|
+
function applyChange(text, path, value, options) {
|
|
100
|
+
if (value === undefined)
|
|
101
|
+
return removeMember(text, path);
|
|
102
|
+
const appended = appendMember(text, path, value, options);
|
|
103
|
+
if (appended !== undefined)
|
|
104
|
+
return appended;
|
|
105
|
+
let result = text;
|
|
106
|
+
// Last first, so the earlier edits' offsets still hold.
|
|
107
|
+
for (const edit of modify(text, path, value, {}).toReversed()) {
|
|
108
|
+
result = result.slice(0, edit.offset) + edit.content + result.slice(edit.offset + edit.length);
|
|
109
|
+
if (edit.content === '')
|
|
110
|
+
continue;
|
|
111
|
+
// The first member of an object also takes the brackets around it, so it gets lines of its own.
|
|
112
|
+
const first = edit.length === 0 && !edit.content.startsWith(',');
|
|
113
|
+
const begin = first ? edit.offset - 1 : edit.offset;
|
|
114
|
+
let end = edit.offset + edit.content.length;
|
|
115
|
+
if (first && result[end] === '}')
|
|
116
|
+
end++;
|
|
117
|
+
result = applyEdits(result, format(result, { length: end - begin, offset: begin }, options));
|
|
118
|
+
}
|
|
119
|
+
return result;
|
|
120
|
+
}
|
|
121
|
+
/** The edits that turn `before` into `after`: a key path and its new value (`undefined` removes it). */
|
|
122
|
+
function changes(before, after) {
|
|
123
|
+
const edits = [];
|
|
124
|
+
for (const section of new Set([...Object.keys(before), ...Object.keys(after)])) {
|
|
125
|
+
const was = before[section];
|
|
126
|
+
const is = after[section];
|
|
127
|
+
if (isDeepStrictEqual(was, is))
|
|
128
|
+
continue;
|
|
129
|
+
if (!isObject(was) || !isObject(is)) {
|
|
130
|
+
edits.push([[section], is]);
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
for (const child of new Set([...Object.keys(was), ...Object.keys(is)])) {
|
|
134
|
+
if (!isDeepStrictEqual(was[child], is[child]))
|
|
135
|
+
edits.push([[section, child], is[child]]);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return edits;
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* How new members are laid out: the file's own indentation, from its first indented member (a
|
|
142
|
+
* comment's lines are indented any way), and line ending.
|
|
143
|
+
*/
|
|
144
|
+
function formatting(text) {
|
|
145
|
+
const member = /^([ \t]+)"/m.exec(text)?.[1];
|
|
146
|
+
const indent = member === undefined ? detectIndent(text) : member.startsWith('\t') ? '\t' : member.length;
|
|
147
|
+
return {
|
|
148
|
+
eol: text.includes('\r\n') ? '\r\n' : '\n',
|
|
149
|
+
insertSpaces: indent !== '\t',
|
|
150
|
+
tabSize: typeof indent === 'number' ? indent : 1,
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
function isObject(value) {
|
|
154
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
155
|
+
}
|
|
156
|
+
/** The offset of the first token at or after `offset`, past whitespace and comments. */
|
|
157
|
+
function nextToken(text, offset) {
|
|
158
|
+
const scanner = createScanner(text, true);
|
|
159
|
+
scanner.setPosition(offset);
|
|
160
|
+
scanner.scan();
|
|
161
|
+
return scanner.getTokenOffset();
|
|
162
|
+
}
|
|
163
|
+
/** `line L, column C` of an offset into `text`, both from 1. */
|
|
164
|
+
function position(text, offset) {
|
|
165
|
+
const before = text.slice(0, offset).split(/\r?\n/);
|
|
166
|
+
return `line ${before.length}, column ${(before.at(-1) ?? '').length + 1}`;
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* `text` without the member at `path`, its comma, and its line when nothing but a comment is
|
|
170
|
+
* left on it. Unlike
|
|
171
|
+
* jsonc-parser's removal, which takes the text from the token before the member, the comments
|
|
172
|
+
* around it stay: the one above the next member, or the file's own at the top.
|
|
173
|
+
*/
|
|
174
|
+
function removeMember(text, path) {
|
|
175
|
+
const root = parseTree(text, [], { allowTrailingComma: true });
|
|
176
|
+
const member = root && findNodeAtLocation(root, path)?.parent;
|
|
177
|
+
const siblings = member?.parent?.children;
|
|
178
|
+
if (!member || !siblings)
|
|
179
|
+
return text;
|
|
180
|
+
let start = member.offset;
|
|
181
|
+
let end = member.offset + member.length;
|
|
182
|
+
let comma;
|
|
183
|
+
const after = nextToken(text, end);
|
|
184
|
+
if (text[after] === ',') {
|
|
185
|
+
end = after + 1;
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
// The last member: the comma before it goes too, so the one before it ends the object again.
|
|
189
|
+
const previous = siblings[siblings.indexOf(member) - 1];
|
|
190
|
+
if (previous)
|
|
191
|
+
comma = nextToken(text, previous.offset + previous.length);
|
|
192
|
+
}
|
|
193
|
+
// A comment after the member on its own line is about the member, so it goes with it.
|
|
194
|
+
const lineStart = text.lastIndexOf('\n', start - 1) + 1;
|
|
195
|
+
const newline = text.indexOf('\n', end);
|
|
196
|
+
const rest = text.slice(end, newline === -1 ? text.length : newline);
|
|
197
|
+
if (text.slice(lineStart, start).trim() === '' && LINE_END.test(rest)) {
|
|
198
|
+
start = lineStart;
|
|
199
|
+
end = newline === -1 ? text.length : newline + 1;
|
|
200
|
+
}
|
|
201
|
+
const result = text.slice(0, start) + text.slice(end);
|
|
202
|
+
return comma === undefined ? result : result.slice(0, comma) + result.slice(comma + 1);
|
|
203
|
+
}
|
|
204
|
+
//# sourceMappingURL=jsonc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonc.js","sourceRoot":"","sources":["../../src/lib/jsonc.ts"],"names":[],"mappings":"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"}
|
package/build/lib/output.d.ts
CHANGED
|
@@ -5,6 +5,19 @@ export interface NonInteractiveState {
|
|
|
5
5
|
}
|
|
6
6
|
/** Minimum width of the {@link renderJson} Box; wider when the JSON has longer lines. */
|
|
7
7
|
export declare const MIN_JSON_WIDTH = 9999;
|
|
8
|
+
/** The `--json` error payload for a command state that keeps its error as `error*` fields. */
|
|
9
|
+
export declare function errorStateJson(state: {
|
|
10
|
+
errorCode?: string;
|
|
11
|
+
errorCommand?: string;
|
|
12
|
+
errorHint?: string;
|
|
13
|
+
errorMessage: string;
|
|
14
|
+
}): {
|
|
15
|
+
message: string;
|
|
16
|
+
outcome: string;
|
|
17
|
+
hint?: string | undefined;
|
|
18
|
+
command?: string | undefined;
|
|
19
|
+
code?: string | undefined;
|
|
20
|
+
};
|
|
8
21
|
/**
|
|
9
22
|
* Renders an arbitrary value as pretty-printed JSON wrapped in a Box wide
|
|
10
23
|
* enough that Ink never soft-wraps a line (a wrap inside a string literal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAW1C,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf;AAMD,yFAAyF;AACzF,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CAQvD;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAW1C,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf;AAMD,yFAAyF;AACzF,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,8FAA8F;AAC9F,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;;;;;;EAQA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY,CAQvD;AAMD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,mBAAmB,CAMxE"}
|
package/build/lib/output.js
CHANGED
|
@@ -7,6 +7,16 @@ import { getNotices, toJsonNotice } from './notices.js';
|
|
|
7
7
|
// ---------------------------------------------------------------------------
|
|
8
8
|
/** Minimum width of the {@link renderJson} Box; wider when the JSON has longer lines. */
|
|
9
9
|
export const MIN_JSON_WIDTH = 9999;
|
|
10
|
+
/** The `--json` error payload for a command state that keeps its error as `error*` fields. */
|
|
11
|
+
export function errorStateJson(state) {
|
|
12
|
+
return {
|
|
13
|
+
...(state.errorCode ? { code: state.errorCode } : {}),
|
|
14
|
+
...(state.errorCommand ? { command: state.errorCommand } : {}),
|
|
15
|
+
...(state.errorHint ? { hint: state.errorHint } : {}),
|
|
16
|
+
message: state.errorMessage,
|
|
17
|
+
outcome: 'error',
|
|
18
|
+
};
|
|
19
|
+
}
|
|
10
20
|
/**
|
|
11
21
|
* Renders an arbitrary value as pretty-printed JSON wrapped in a Box wide
|
|
12
22
|
* enough that Ink never soft-wraps a line (a wrap inside a string literal
|
|
@@ -23,6 +33,9 @@ export function renderJson(value) {
|
|
|
23
33
|
const longest = text.split('\n').reduce((max, line) => Math.max(max, line.length), 0);
|
|
24
34
|
return (_jsx(Box, { width: Math.max(MIN_JSON_WIDTH, longest * 2 + 1), children: _jsx(Text, { children: text }) }));
|
|
25
35
|
}
|
|
36
|
+
// ---------------------------------------------------------------------------
|
|
37
|
+
// Render helpers
|
|
38
|
+
// ---------------------------------------------------------------------------
|
|
26
39
|
/**
|
|
27
40
|
* Returns the JSON / TTY decision shared across every command.
|
|
28
41
|
*
|
|
@@ -40,9 +53,6 @@ export function useNonInteractive(jsonFlag) {
|
|
|
40
53
|
json: jsonFlag || !isRawModeSupported,
|
|
41
54
|
};
|
|
42
55
|
}
|
|
43
|
-
// ---------------------------------------------------------------------------
|
|
44
|
-
// Render helpers
|
|
45
|
-
// ---------------------------------------------------------------------------
|
|
46
56
|
function withNotices(value) {
|
|
47
57
|
const notices = getNotices();
|
|
48
58
|
const plainObject = typeof value === 'object' && value !== null && Object.getPrototypeOf(value) === Object.prototype;
|
package/build/lib/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAWxD,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,yFAAyF;AACzF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AAEnC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC;IACnE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,OAAO,CACL,KAAC,GAAG,IAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,YACnD,KAAC,IAAI,cAAE,IAAI,GAAQ,GACf,CACP,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAiB;IACjD,MAAM,EAAE,kBAAkB,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC1C,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,kBAAkB;QAC3B,IAAI,EAAE,QAAQ,IAAI,CAAC,kBAAkB;KACtC,CAAC;AACJ,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/lib/output.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAWxD,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,yFAAyF;AACzF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AAEnC,8FAA8F;AAC9F,MAAM,UAAU,cAAc,CAAC,KAK9B;IACC,OAAO;QACL,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,KAAK,CAAC,YAAY;QAC3B,OAAO,EAAE,OAAO;KACjB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC;IACnE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,OAAO,CACL,KAAC,GAAG,IAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,YACnD,KAAC,IAAI,cAAE,IAAI,GAAQ,GACf,CACP,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;AAE9E;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAiB;IACjD,MAAM,EAAE,kBAAkB,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC1C,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,kBAAkB;QAC3B,IAAI,EAAE,QAAQ,IAAI,CAAC,kBAAkB;KACtC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC;IACrH,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACtG,CAAC"}
|
|
@@ -43,6 +43,15 @@ export declare function holdsAnotherOwnersValue(entry: PlacedConfigEntry, owners
|
|
|
43
43
|
* before installs refused that, or with `--force`), so removing one of them keeps these files.
|
|
44
44
|
*/
|
|
45
45
|
export declare function pathsOwnedByOthers(lockfile: Pick<Lockfile, 'assets'>, asset: Pick<InstalledAsset, 'name' | 'org' | 'type'>, adapter: Adapter, projectDir: string): Set<string>;
|
|
46
|
+
/**
|
|
47
|
+
* The files in `asset`'s own folder for the adapter's tool that no installed asset places there:
|
|
48
|
+
* ones an older version shipped and a later install left (ATK-370), or the user's own. Only a
|
|
49
|
+
* directory placement (one with an `entrypointName`) gives an asset a folder; for any other this is
|
|
50
|
+
* empty, as it is when the folder isn't there. A global and an org asset of one name share the
|
|
51
|
+
* folder, so the files of either are listed. What a run leaves in a folder (`node_modules`, an
|
|
52
|
+
* OS's `.DS_Store`) is not. Absolute paths, sorted.
|
|
53
|
+
*/
|
|
54
|
+
export declare function unlistedFiles(asset: InstalledAsset, lockfile: Pick<Lockfile, 'assets'>, adapter: Adapter, projectDir: string): Promise<string[]>;
|
|
46
55
|
/**
|
|
47
56
|
* Verify the config entries `asset` recorded for the adapter's tool, like {@link verifyConfigEntries},
|
|
48
57
|
* except that an entry holding the recorded value of another asset that owns it is not drift. Two
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owned-paths.d.ts","sourceRoot":"","sources":["../../src/lib/owned-paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"owned-paths.d.ts","sourceRoot":"","sources":["../../src/lib/owned-paths.ts"],"names":[],"mappings":"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"}
|
package/build/lib/owned-paths.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { readFile } from 'node:fs/promises';
|
|
2
|
-
import {
|
|
1
|
+
import { readdir, readFile } from 'node:fs/promises';
|
|
2
|
+
import { join, resolve } from 'node:path';
|
|
3
|
+
import { adapterAsPlaced, configEntryPath, getPlacement, resolveInstalledPaths, resolvePlacementPath, } from './adapter.js';
|
|
3
4
|
import { isExcludedForTool, supportsType } from './asset-tools.js';
|
|
4
5
|
import { matchesChecksum, verifyChecksums, verifyConfigEntries } from './checksum.js';
|
|
5
6
|
import { getConfigEntriesForTool } from './config-entries.js';
|
|
6
|
-
import { fromRoot } from './root-path.js';
|
|
7
|
+
import { fromRoot, realLocation } from './root-path.js';
|
|
7
8
|
/**
|
|
8
9
|
* The config entries, memory-template blocks and hook groups that installed assets other than
|
|
9
10
|
* `asset` placed for the adapter's tool. Like {@link pathsOwnedByOthers}, for the entries a global
|
|
@@ -66,6 +67,35 @@ export function pathsOwnedByOthers(lockfile, asset, adapter, projectDir) {
|
|
|
66
67
|
}
|
|
67
68
|
return paths;
|
|
68
69
|
}
|
|
70
|
+
/**
|
|
71
|
+
* The files in `asset`'s own folder for the adapter's tool that no installed asset places there:
|
|
72
|
+
* ones an older version shipped and a later install left (ATK-370), or the user's own. Only a
|
|
73
|
+
* directory placement (one with an `entrypointName`) gives an asset a folder; for any other this is
|
|
74
|
+
* empty, as it is when the folder isn't there. A global and an org asset of one name share the
|
|
75
|
+
* folder, so the files of either are listed. What a run leaves in a folder (`node_modules`, an
|
|
76
|
+
* OS's `.DS_Store`) is not. Absolute paths, sorted.
|
|
77
|
+
*/
|
|
78
|
+
export async function unlistedFiles(asset, lockfile, adapter, projectDir) {
|
|
79
|
+
const placedAdapter = adapterAsPlaced(adapter, asset);
|
|
80
|
+
const placement = getPlacement(placedAdapter, asset.type);
|
|
81
|
+
if (!placement?.entrypointName)
|
|
82
|
+
return [];
|
|
83
|
+
let files;
|
|
84
|
+
try {
|
|
85
|
+
files = await filesUnder(resolvePlacementPath(placement, asset.name, projectDir));
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
return [];
|
|
89
|
+
}
|
|
90
|
+
// Compared on disk, as uninstall removes them: another case on Windows or macOS, a symlink.
|
|
91
|
+
const own = new Set(resolveInstalledPaths(asset, placedAdapter, projectDir).files.map((file) => canonicalPath(fromRoot(projectDir, file.installedPath))));
|
|
92
|
+
const unlisted = files.filter((path) => !own.has(canonicalPath(path)));
|
|
93
|
+
// Most folders hold only the asset's own files, so the other owners are looked up only when not.
|
|
94
|
+
if (unlisted.length === 0)
|
|
95
|
+
return [];
|
|
96
|
+
const others = new Set([...pathsOwnedByOthers(lockfile, asset, adapter, projectDir)].map(canonicalPath));
|
|
97
|
+
return unlisted.filter((path) => !others.has(canonicalPath(path))).sort();
|
|
98
|
+
}
|
|
69
99
|
/**
|
|
70
100
|
* Verify the config entries `asset` recorded for the adapter's tool, like {@link verifyConfigEntries},
|
|
71
101
|
* except that an entry holding the recorded value of another asset that owns it is not drift. Two
|
|
@@ -120,6 +150,10 @@ export async function verifyOwnFiles(files, asset, lockfile, adapter, projectDir
|
|
|
120
150
|
}
|
|
121
151
|
return failures;
|
|
122
152
|
}
|
|
153
|
+
/** The file's canonical path (real case, links resolved), or the path itself when it can't be resolved. */
|
|
154
|
+
function canonicalPath(path) {
|
|
155
|
+
return realLocation(path) ?? resolve(path);
|
|
156
|
+
}
|
|
123
157
|
/**
|
|
124
158
|
* The {@link ConfigEntryOwners} key of an entry. The file is resolved against the project, so a
|
|
125
159
|
* recorded path and an adapter's `./`-prefixed one match.
|
|
@@ -170,6 +204,20 @@ function otherAssetsPlacedFor(lockfile, asset, adapter) {
|
|
|
170
204
|
!isExcludedForTool(other, adapter.tool) &&
|
|
171
205
|
supportsType(adapter, other.type));
|
|
172
206
|
}
|
|
207
|
+
/** Folders and files a run or an OS leaves in an asset's folder, which {@link unlistedFiles} skips. */
|
|
208
|
+
const RUNTIME_DIRS = new Set(['node_modules']);
|
|
209
|
+
const RUNTIME_FILES = new Set(['.DS_Store', 'desktop.ini', 'Thumbs.db']);
|
|
210
|
+
/** The files under `dir`, below its {@link RUNTIME_DIRS} and without its {@link RUNTIME_FILES}. */
|
|
211
|
+
async function filesUnder(dir) {
|
|
212
|
+
const entries = await readdir(dir, { withFileTypes: true });
|
|
213
|
+
const files = await Promise.all(entries.map(async (entry) => {
|
|
214
|
+
const path = join(dir, entry.name);
|
|
215
|
+
if (entry.isDirectory())
|
|
216
|
+
return RUNTIME_DIRS.has(entry.name) ? [] : filesUnder(path);
|
|
217
|
+
return entry.isFile() && !RUNTIME_FILES.has(entry.name) ? [path] : [];
|
|
218
|
+
}));
|
|
219
|
+
return files.flat();
|
|
220
|
+
}
|
|
173
221
|
/** The checksum `entry` recorded and its version, as a {@link ConfigEntryOwners} owner. */
|
|
174
222
|
function recordedChecksum(entry) {
|
|
175
223
|
return { checksum: entry.checksum, checksumVersion: entry.checksumVersion };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owned-paths.js","sourceRoot":"","sources":["../../src/lib/owned-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"owned-paths.js","sourceRoot":"","sources":["../../src/lib/owned-paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -225,5 +225,7 @@ export declare function publishCommand(flags: PublishFlags, ...extra: string[]):
|
|
|
225
225
|
export declare function runPublishStep(state: PublishState, ctx: PublishStepContext): Promise<void>;
|
|
226
226
|
/** The comma-separated values in a flag or prompt answer, trimmed, without empty ones. */
|
|
227
227
|
export declare function splitList(value: string | undefined): string[];
|
|
228
|
+
/** The tool ids in `--tools`: `splitList`, lowercased (tool ids are) and without repeats. */
|
|
229
|
+
export declare function splitTools(value: string | undefined): string[];
|
|
228
230
|
export declare function publishReducer(state: PublishState, action: PublishAction): PublishState;
|
|
229
231
|
//# sourceMappingURL=publish-flow.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-flow.d.ts","sourceRoot":"","sources":["../../src/lib/publish-flow.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publish-flow.d.ts","sourceRoot":"","sources":["../../src/lib/publish-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,6 +138,10 @@ export function splitList(value) {
|
|
|
138
138
|
.map((item) => item.trim())
|
|
139
139
|
.filter(Boolean);
|
|
140
140
|
}
|
|
141
|
+
/** The tool ids in `--tools`: `splitList`, lowercased (tool ids are) and without repeats. */
|
|
142
|
+
export function splitTools(value) {
|
|
143
|
+
return [...new Set(splitList(value).map((tool) => tool.toLowerCase()))];
|
|
144
|
+
}
|
|
141
145
|
/** Why the flags can't publish a batch: one installed asset, or one asset's metadata. Undefined otherwise. */
|
|
142
146
|
function batchFlagError(flags) {
|
|
143
147
|
if (!isBatch(flags))
|
|
@@ -200,7 +204,7 @@ async function firstFailure(edits) {
|
|
|
200
204
|
async function gatherRawMetadata(state, ctx, detection, source) {
|
|
201
205
|
const [signedIn, tools] = await Promise.all([
|
|
202
206
|
getSignedInUserName(),
|
|
203
|
-
state.flags.toolsFlag ?
|
|
207
|
+
state.flags.toolsFlag ? splitTools(state.flags.toolsFlag) : detectCompatibleTools(detection.assetType),
|
|
204
208
|
]);
|
|
205
209
|
if (ctx.cancelled())
|
|
206
210
|
return;
|
|
@@ -621,7 +625,7 @@ const loadingTools = {
|
|
|
621
625
|
return;
|
|
622
626
|
}
|
|
623
627
|
// Try --tools flag
|
|
624
|
-
let resolvedToolList =
|
|
628
|
+
let resolvedToolList = splitTools(state.flags.toolsFlag);
|
|
625
629
|
if (state.flags.toolsFlag) {
|
|
626
630
|
// Validation ran before these tools were filled in, so check them here.
|
|
627
631
|
const toolsError = await unknownToolsError(resolvedToolList);
|