@doist/todoist-cli 1.59.0 → 1.60.1
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 +12 -0
- package/dist/commands/comment/add.d.ts.map +1 -1
- package/dist/commands/comment/add.js +7 -4
- package/dist/commands/comment/add.js.map +1 -1
- package/dist/commands/stats/helpers.d.ts +3 -1
- package/dist/commands/stats/helpers.d.ts.map +1 -1
- package/dist/commands/stats/helpers.js +2 -1
- package/dist/commands/stats/helpers.js.map +1 -1
- package/dist/commands/view.d.ts.map +1 -1
- package/dist/commands/view.js +12 -7
- package/dist/commands/view.js.map +1 -1
- package/dist/index.js +13 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/api/core.d.ts.map +1 -1
- package/dist/lib/api/core.js +4 -1
- package/dist/lib/api/core.js.map +1 -1
- package/dist/lib/api/stats.d.ts +1 -32
- package/dist/lib/api/stats.d.ts.map +1 -1
- package/dist/lib/api/stats.js +2 -54
- package/dist/lib/api/stats.js.map +1 -1
- package/dist/lib/migrate-auth.d.ts.map +1 -1
- package/dist/lib/migrate-auth.js +3 -2
- package/dist/lib/migrate-auth.js.map +1 -1
- package/dist/lib/oauth.d.ts.map +1 -1
- package/dist/lib/oauth.js +2 -1
- package/dist/lib/oauth.js.map +1 -1
- package/dist/lib/permissions.d.ts.map +1 -1
- package/dist/lib/permissions.js +2 -0
- package/dist/lib/permissions.js.map +1 -1
- package/dist/lib/usage-tracking.d.ts +9 -0
- package/dist/lib/usage-tracking.d.ts.map +1 -0
- package/dist/lib/usage-tracking.js +113 -0
- package/dist/lib/usage-tracking.js.map +1 -0
- package/package.json +2 -2
- package/dist/lib/api/uploads.d.ts +0 -10
- package/dist/lib/api/uploads.d.ts.map +0 -1
- package/dist/lib/api/uploads.js +0 -34
- package/dist/lib/api/uploads.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [1.60.1](https://github.com/Doist/todoist-cli/compare/v1.60.0...v1.60.1) (2026-05-01)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* honour HTTP_PROXY on the customFetch path ([#305](https://github.com/Doist/todoist-cli/issues/305)) ([e1fc71a](https://github.com/Doist/todoist-cli/commit/e1fc71abfc3c3ad16f1311363368adb06b06c8d7))
|
|
6
|
+
|
|
7
|
+
## [1.60.0](https://github.com/Doist/todoist-cli/compare/v1.59.0...v1.60.0) (2026-04-30)
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* track cli usage in request headers ([#302](https://github.com/Doist/todoist-cli/issues/302)) ([5c692f8](https://github.com/Doist/todoist-cli/commit/5c692f864c1bb680d171aa30a63db2cbf117f575))
|
|
12
|
+
|
|
1
13
|
## [1.59.0](https://github.com/Doist/todoist-cli/compare/v1.58.0...v1.59.0) (2026-04-28)
|
|
2
14
|
|
|
3
15
|
### Features
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/comment/add.ts"],"names":[],"mappings":"AASA,UAAU,UAAU;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/comment/add.ts"],"names":[],"mappings":"AASA,UAAU,UAAU;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFhF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { basename } from 'node:path';
|
|
1
2
|
import chalk from 'chalk';
|
|
2
3
|
import { getApi } from '../../lib/api/core.js';
|
|
3
|
-
import { uploadFile } from '../../lib/api/uploads.js';
|
|
4
4
|
import { CliError } from '../../lib/errors.js';
|
|
5
5
|
import { isQuiet } from '../../lib/global-args.js';
|
|
6
6
|
import { formatJson, printDryRun } from '../../lib/output.js';
|
|
@@ -47,11 +47,14 @@ export async function addComment(ref, options) {
|
|
|
47
47
|
}
|
|
48
48
|
let attachment;
|
|
49
49
|
if (options.file) {
|
|
50
|
-
const uploadResult = await uploadFile(options.file);
|
|
50
|
+
const uploadResult = await api.uploadFile({ file: options.file });
|
|
51
|
+
if (!uploadResult.fileUrl) {
|
|
52
|
+
throw new CliError('UPLOAD_FAILED', 'Upload succeeded but no file URL was returned');
|
|
53
|
+
}
|
|
51
54
|
attachment = {
|
|
52
55
|
fileUrl: uploadResult.fileUrl,
|
|
53
|
-
fileName: uploadResult.fileName,
|
|
54
|
-
fileType: uploadResult.fileType,
|
|
56
|
+
fileName: uploadResult.fileName ?? basename(options.file),
|
|
57
|
+
fileType: uploadResult.fileType ?? undefined,
|
|
55
58
|
resourceType: uploadResult.resourceType,
|
|
56
59
|
};
|
|
57
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/comment/add.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/comment/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ProductivityStats } from '@doist/todoist-sdk';
|
|
2
|
+
type Streak = ProductivityStats['goals']['currentDailyStreak'];
|
|
2
3
|
export declare function formatTrend(trend: string): string;
|
|
3
4
|
export declare function formatStreak(current: Streak, max: Streak): string;
|
|
4
5
|
export declare function formatGoalProgress(completed: number, goal: number, label: string): string;
|
|
@@ -6,4 +7,5 @@ export declare function getTodayCompleted(stats: ProductivityStats): number;
|
|
|
6
7
|
export declare function getThisWeekCompleted(stats: ProductivityStats): number;
|
|
7
8
|
export declare function formatStatsView(stats: ProductivityStats): string;
|
|
8
9
|
export declare function formatStatsJson(stats: ProductivityStats, full: boolean): object;
|
|
10
|
+
export {};
|
|
9
11
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/commands/stats/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/commands/stats/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG/E,KAAK,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAA;AAE9D,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CASjD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMzF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAIlE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAGrE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAgChE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CA6B/E"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DAY_OF_WEEK_TO_API } from '@doist/todoist-sdk';
|
|
1
2
|
import chalk from 'chalk';
|
|
2
3
|
export function formatTrend(trend) {
|
|
3
4
|
switch (trend) {
|
|
@@ -78,7 +79,7 @@ export function formatStatsJson(stats, full) {
|
|
|
78
79
|
goals: {
|
|
79
80
|
...base.goals,
|
|
80
81
|
karmaDisabled: stats.goals.karmaDisabled,
|
|
81
|
-
ignoreDays: stats.goals.ignoreDays,
|
|
82
|
+
ignoreDays: stats.goals.ignoreDays.map((d) => DAY_OF_WEEK_TO_API[d]),
|
|
82
83
|
},
|
|
83
84
|
daysItems: stats.daysItems,
|
|
84
85
|
weekItems: stats.weekItems,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stats/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/commands/stats/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/commands/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/commands/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAoDnC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyE1D"}
|
package/dist/commands/view.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { CliError } from '../lib/errors.js';
|
|
3
3
|
import { classifyTodoistUrl } from '../lib/refs.js';
|
|
4
|
+
import { setActiveCommandPath } from '../lib/usage-tracking.js';
|
|
4
5
|
function looksLikeTodoistAppUrl(token) {
|
|
5
6
|
return /^https?:\/\/app\.todoist\.com\/app\/\S+/.test(token);
|
|
6
7
|
}
|
|
@@ -24,11 +25,15 @@ function extractViewInvocation(command, parsedUrl, parsedArgs) {
|
|
|
24
25
|
],
|
|
25
26
|
};
|
|
26
27
|
}
|
|
27
|
-
async function runRoutedCommand(loadRegister, argv) {
|
|
28
|
+
async function runRoutedCommand(loadRegister, argv, commandPath) {
|
|
28
29
|
const proxy = new Command();
|
|
29
30
|
proxy.exitOverride();
|
|
30
31
|
const register = await loadRegister();
|
|
31
32
|
register(proxy);
|
|
33
|
+
// `src/index.ts` already recorded the top-level `view` command on the main
|
|
34
|
+
// program. Override it here so downstream API requests are attributed to
|
|
35
|
+
// the routed target command (`task:view`, `today`, etc.) instead.
|
|
36
|
+
setActiveCommandPath(commandPath);
|
|
32
37
|
await proxy.parseAsync(['node', 'td', ...argv]);
|
|
33
38
|
}
|
|
34
39
|
export function registerViewCommand(program) {
|
|
@@ -58,21 +63,21 @@ Examples:
|
|
|
58
63
|
if (route.kind === 'view') {
|
|
59
64
|
switch (route.view) {
|
|
60
65
|
case 'today':
|
|
61
|
-
return runRoutedCommand(async () => (await import('./today.js')).registerTodayCommand, ['today', ...invocation.passthroughArgs]);
|
|
66
|
+
return runRoutedCommand(async () => (await import('./today.js')).registerTodayCommand, ['today', ...invocation.passthroughArgs], 'today');
|
|
62
67
|
case 'upcoming':
|
|
63
|
-
return runRoutedCommand(async () => (await import('./upcoming.js')).registerUpcomingCommand, ['upcoming', ...invocation.passthroughArgs]);
|
|
68
|
+
return runRoutedCommand(async () => (await import('./upcoming.js')).registerUpcomingCommand, ['upcoming', ...invocation.passthroughArgs], 'upcoming');
|
|
64
69
|
}
|
|
65
70
|
}
|
|
66
71
|
const ref = `id:${route.id}`;
|
|
67
72
|
switch (route.entityType) {
|
|
68
73
|
case 'task':
|
|
69
|
-
return runRoutedCommand(async () => (await import('./task/index.js')).registerTaskCommand, ['task', 'view', ref, ...invocation.passthroughArgs]);
|
|
74
|
+
return runRoutedCommand(async () => (await import('./task/index.js')).registerTaskCommand, ['task', 'view', ref, ...invocation.passthroughArgs], 'task:view');
|
|
70
75
|
case 'project':
|
|
71
|
-
return runRoutedCommand(async () => (await import('./project/index.js')).registerProjectCommand, ['project', 'view', ref, ...invocation.passthroughArgs]);
|
|
76
|
+
return runRoutedCommand(async () => (await import('./project/index.js')).registerProjectCommand, ['project', 'view', ref, ...invocation.passthroughArgs], 'project:view');
|
|
72
77
|
case 'label':
|
|
73
|
-
return runRoutedCommand(async () => (await import('./label/index.js')).registerLabelCommand, ['label', 'view', ref, ...invocation.passthroughArgs]);
|
|
78
|
+
return runRoutedCommand(async () => (await import('./label/index.js')).registerLabelCommand, ['label', 'view', ref, ...invocation.passthroughArgs], 'label:view');
|
|
74
79
|
case 'filter':
|
|
75
|
-
return runRoutedCommand(async () => (await import('./filter/index.js')).registerFilterCommand, ['filter', 'show', ref, ...invocation.passthroughArgs]);
|
|
80
|
+
return runRoutedCommand(async () => (await import('./filter/index.js')).registerFilterCommand, ['filter', 'show', ref, ...invocation.passthroughArgs], 'filter:show');
|
|
76
81
|
}
|
|
77
82
|
});
|
|
78
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/commands/view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/commands/view.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -7,6 +7,16 @@ import { initializeLogger } from './lib/logger.js';
|
|
|
7
7
|
import { preloadMarkdown } from './lib/markdown.js';
|
|
8
8
|
import { formatError, formatErrorJson } from './lib/output.js';
|
|
9
9
|
import { startEarlySpinner, stopEarlySpinner } from './lib/spinner.js';
|
|
10
|
+
import { setActiveCommandPath } from './lib/usage-tracking.js';
|
|
11
|
+
function getActionCommandPath(command) {
|
|
12
|
+
const segments = [];
|
|
13
|
+
let current = command;
|
|
14
|
+
while (current?.parent) {
|
|
15
|
+
segments.push(current.name());
|
|
16
|
+
current = current.parent;
|
|
17
|
+
}
|
|
18
|
+
return `td ${segments.reverse().join(' ')}`;
|
|
19
|
+
}
|
|
10
20
|
program
|
|
11
21
|
.name('td')
|
|
12
22
|
.description('Todoist CLI')
|
|
@@ -159,6 +169,9 @@ const commands = {
|
|
|
159
169
|
for (const [name, [description]] of Object.entries(commands)) {
|
|
160
170
|
program.command(name).description(description);
|
|
161
171
|
}
|
|
172
|
+
program.hook('preAction', (_thisCommand, actionCommand) => {
|
|
173
|
+
setActiveCommandPath(getActionCommandPath(actionCommand));
|
|
174
|
+
});
|
|
162
175
|
// Validate `--user` and strip it from argv before commander parses.
|
|
163
176
|
//
|
|
164
177
|
// Commander has no global-option attachment, so leaving `--user` in argv
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAgB,OAAO,EAAE,MAAM,WAAW,CAAA;AACjD,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EACH,mBAAmB,EACnB,UAAU,EACV,YAAY,EACZ,SAAS,EACT,aAAa,GAChB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/lib/api/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,eAAe,EACf,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,IAAI,EACJ,gBAAgB,EAChB,KAAK,OAAO,EACf,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/lib/api/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,eAAe,EACf,OAAO,EACP,IAAI,EACJ,UAAU,EAEV,IAAI,EACJ,gBAAgB,EAChB,KAAK,OAAO,EACf,MAAM,oBAAoB,CAAA;AA2N3B,wBAAsB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAyBtF;AAqCD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAG3D;AAED,wBAAsB,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,CAWlD;AAED,MAAM,MAAM,OAAO,GAAG,eAAe,GAAG,gBAAgB,CAAA;AAIxD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAMxD;AAED,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvE;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAOnF;AAED,wBAAsB,cAAc,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEjF;AAED,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
package/dist/lib/api/core.js
CHANGED
|
@@ -6,6 +6,7 @@ import { oauthScopeFor } from '../oauth-scopes.js';
|
|
|
6
6
|
import { ensureWriteAllowed, isMutatingApiMethod, isMutatingSyncPayload } from '../permissions.js';
|
|
7
7
|
import { getProgressTracker } from '../progress.js';
|
|
8
8
|
import { withSpinner } from '../spinner.js';
|
|
9
|
+
import { createTrackedFetch } from '../usage-tracking.js';
|
|
9
10
|
let apiClient = null;
|
|
10
11
|
// Mapping of API method names to user-friendly spinner messages
|
|
11
12
|
const API_SPINNER_MESSAGES = {
|
|
@@ -47,7 +48,9 @@ const API_SPINNER_MESSAGES = {
|
|
|
47
48
|
archiveSection: { text: 'Archiving section...', color: 'yellow' },
|
|
48
49
|
unarchiveSection: { text: 'Unarchiving section...', color: 'yellow' },
|
|
49
50
|
sync: { text: 'Syncing...', color: 'blue' },
|
|
51
|
+
uploadFile: { text: 'Uploading file...', color: 'blue' },
|
|
50
52
|
viewAttachment: { text: 'Fetching attachment...', color: 'blue' },
|
|
53
|
+
getProductivityStats: { text: 'Loading stats...', color: 'blue' },
|
|
51
54
|
getWorkspace: { text: 'Loading workspace...', color: 'blue' },
|
|
52
55
|
getWorkspaceActiveProjects: { text: 'Loading workspace projects...', color: 'blue' },
|
|
53
56
|
getWorkspaceArchivedProjects: { text: 'Loading archived projects...', color: 'blue' },
|
|
@@ -240,7 +243,7 @@ function analyzeAndEmitApiResponse(progressTracker, response) {
|
|
|
240
243
|
progressTracker.emitApiResponse(1, false, null);
|
|
241
244
|
}
|
|
242
245
|
export function createApiForToken(token) {
|
|
243
|
-
const rawApi = new TodoistApi(token);
|
|
246
|
+
const rawApi = new TodoistApi(token, { customFetch: createTrackedFetch() });
|
|
244
247
|
return createSpinnerWrappedApi(rawApi);
|
|
245
248
|
}
|
|
246
249
|
export async function getApi() {
|
package/dist/lib/api/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/lib/api/core.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/lib/api/core.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/api/stats.d.ts
CHANGED
|
@@ -1,41 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
count: number;
|
|
3
|
-
start: string;
|
|
4
|
-
end: string;
|
|
5
|
-
}
|
|
6
|
-
export interface ProductivityStats {
|
|
7
|
-
karma: number;
|
|
8
|
-
karmaTrend: string;
|
|
9
|
-
karmaLastUpdate: number;
|
|
10
|
-
completedCount: number;
|
|
11
|
-
daysItems: Array<{
|
|
12
|
-
date: string;
|
|
13
|
-
totalCompleted: number;
|
|
14
|
-
}>;
|
|
15
|
-
weekItems: Array<{
|
|
16
|
-
from: string;
|
|
17
|
-
to: string;
|
|
18
|
-
totalCompleted: number;
|
|
19
|
-
}>;
|
|
20
|
-
goals: {
|
|
21
|
-
dailyGoal: number;
|
|
22
|
-
weeklyGoal: number;
|
|
23
|
-
currentDailyStreak: Streak;
|
|
24
|
-
currentWeeklyStreak: Streak;
|
|
25
|
-
maxDailyStreak: Streak;
|
|
26
|
-
maxWeeklyStreak: Streak;
|
|
27
|
-
vacationMode: boolean;
|
|
28
|
-
karmaDisabled: boolean;
|
|
29
|
-
ignoreDays: number[];
|
|
30
|
-
};
|
|
31
|
-
}
|
|
1
|
+
import { type ProductivityStats } from '@doist/todoist-sdk';
|
|
32
2
|
export declare function fetchProductivityStats(): Promise<ProductivityStats>;
|
|
33
3
|
export interface UpdateGoalsArgs {
|
|
34
4
|
dailyGoal?: number;
|
|
35
5
|
weeklyGoal?: number;
|
|
36
6
|
vacationMode?: boolean;
|
|
37
7
|
karmaDisabled?: boolean;
|
|
38
|
-
ignoreDays?: number[];
|
|
39
8
|
}
|
|
40
9
|
export declare function updateGoals(args: UpdateGoalsArgs): Promise<void>;
|
|
41
10
|
//# sourceMappingURL=stats.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/lib/api/stats.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/lib/api/stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAI1E,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAGzE;AAED,MAAM,WAAW,eAAe;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBtE"}
|
package/dist/lib/api/stats.js
CHANGED
|
@@ -1,60 +1,9 @@
|
|
|
1
1
|
import { createCommand } from '@doist/todoist-sdk';
|
|
2
|
-
import { getApiToken } from '../auth.js';
|
|
3
2
|
import { CliError } from '../errors.js';
|
|
4
3
|
import { getApi, pickDefined } from './core.js';
|
|
5
|
-
const defaultStreak = { count: 0, start: '', end: '' };
|
|
6
|
-
function parseStreak(s) {
|
|
7
|
-
if (!s || typeof s !== 'object')
|
|
8
|
-
return defaultStreak;
|
|
9
|
-
const obj = s;
|
|
10
|
-
return {
|
|
11
|
-
count: Number(obj.count ?? 0),
|
|
12
|
-
start: String(obj.start ?? ''),
|
|
13
|
-
end: String(obj.end ?? ''),
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
4
|
export async function fetchProductivityStats() {
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
method: 'GET',
|
|
20
|
-
headers: {
|
|
21
|
-
Authorization: `Bearer ${token}`,
|
|
22
|
-
},
|
|
23
|
-
});
|
|
24
|
-
if (!response.ok) {
|
|
25
|
-
throw new CliError('API_ERROR', `Failed to fetch productivity stats: ${response.status}`);
|
|
26
|
-
}
|
|
27
|
-
const data = await response.json();
|
|
28
|
-
if (data.error) {
|
|
29
|
-
throw new CliError('API_ERROR', `Productivity stats API error: ${data.error}`);
|
|
30
|
-
}
|
|
31
|
-
const goals = data.goals ?? {};
|
|
32
|
-
return {
|
|
33
|
-
karma: Number(data.karma ?? 0),
|
|
34
|
-
karmaTrend: String(data.karma_trend ?? 'none'),
|
|
35
|
-
karmaLastUpdate: Number(data.karma_last_update ?? 0),
|
|
36
|
-
completedCount: Number(data.completed_count ?? 0),
|
|
37
|
-
daysItems: (data.days_items ?? []).map((d) => ({
|
|
38
|
-
date: d.date,
|
|
39
|
-
totalCompleted: d.total_completed,
|
|
40
|
-
})),
|
|
41
|
-
weekItems: (data.week_items ?? []).map((w) => ({
|
|
42
|
-
from: w.from,
|
|
43
|
-
to: w.to,
|
|
44
|
-
totalCompleted: w.total_completed,
|
|
45
|
-
})),
|
|
46
|
-
goals: {
|
|
47
|
-
dailyGoal: Number(goals.daily_goal ?? 0),
|
|
48
|
-
weeklyGoal: Number(goals.weekly_goal ?? 0),
|
|
49
|
-
currentDailyStreak: parseStreak(goals.current_daily_streak),
|
|
50
|
-
currentWeeklyStreak: parseStreak(goals.current_weekly_streak),
|
|
51
|
-
maxDailyStreak: parseStreak(goals.max_daily_streak),
|
|
52
|
-
maxWeeklyStreak: parseStreak(goals.max_weekly_streak),
|
|
53
|
-
vacationMode: Boolean(goals.vacation_mode),
|
|
54
|
-
karmaDisabled: Boolean(goals.karma_disabled),
|
|
55
|
-
ignoreDays: (goals.ignore_days ?? []),
|
|
56
|
-
},
|
|
57
|
-
};
|
|
5
|
+
const api = await getApi();
|
|
6
|
+
return api.getProductivityStats();
|
|
58
7
|
}
|
|
59
8
|
export async function updateGoals(args) {
|
|
60
9
|
const goalsArgs = pickDefined({
|
|
@@ -62,7 +11,6 @@ export async function updateGoals(args) {
|
|
|
62
11
|
weeklyGoal: args.weeklyGoal,
|
|
63
12
|
vacationMode: args.vacationMode,
|
|
64
13
|
karmaDisabled: args.karmaDisabled,
|
|
65
|
-
ignoreDays: args.ignoreDays,
|
|
66
14
|
});
|
|
67
15
|
if (Object.keys(goalsArgs).length === 0) {
|
|
68
16
|
throw new CliError('NO_CHANGES', 'No goals to update');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/lib/api/stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/lib/api/stats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAE/C,MAAM,CAAC,KAAK,UAAU,sBAAsB;IACxC,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAA;IAC1B,OAAO,GAAG,CAAC,oBAAoB,EAAE,CAAA;AACrC,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAqB;IACnD,MAAM,SAAS,GAAG,WAAW,CAAC;QAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;KACpC,CAAC,CAAA;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAA;IAC1B,MAAM,GAAG,CAAC,IAAI,CAAC;QACX,QAAQ,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC,CAAA;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-auth.d.ts","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"migrate-auth.d.ts","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAWH,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAA;IACvE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,UAAU,cAAc;IACpB,sFAAsF;IACtF,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;CAC3B;AASD,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyF7F"}
|
package/dist/lib/migrate-auth.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { CONFIG_VERSION, readConfig, writeConfig } from './config.js';
|
|
10
10
|
import { accountForUser, createSecureStore, LEGACY_ACCOUNT_NAME, SecureStoreUnavailableError, } from './secure-store.js';
|
|
11
|
+
import { fetchTodoist } from './usage-tracking.js';
|
|
11
12
|
const USER_ENDPOINT = 'https://api.todoist.com/api/v1/user';
|
|
12
13
|
export async function migrateLegacyAuth(opts = {}) {
|
|
13
14
|
const fetchImpl = opts.fetchImpl ?? fetch;
|
|
@@ -107,9 +108,9 @@ async function loadLegacyToken(config) {
|
|
|
107
108
|
return null;
|
|
108
109
|
}
|
|
109
110
|
async function fetchUser(token, fetchImpl) {
|
|
110
|
-
const response = await
|
|
111
|
+
const response = await fetchTodoist(USER_ENDPOINT, {
|
|
111
112
|
headers: { Authorization: `Bearer ${token}` },
|
|
112
|
-
});
|
|
113
|
+
}, fetchImpl, 'postinstall:auth-migrate');
|
|
113
114
|
if (!response.ok) {
|
|
114
115
|
throw new Error(`HTTP ${response.status} ${response.statusText}`);
|
|
115
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-auth.js","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAe,cAAc,EAAE,UAAU,EAAmB,WAAW,EAAE,MAAM,aAAa,CAAA;AACnG,OAAO,EACH,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,2BAA2B,GAC9B,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"migrate-auth.js","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/oauth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/lib/oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAiB,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/lib/oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAiB,MAAM,mBAAmB,CAAA;AAO3E,eAAO,MAAM,iBAAiB,+CAA+C,CAAA;AAC7E,eAAO,MAAM,gBAAgB,cAAc,CAAA;AAE3C,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,CAAC,EAAE,SAAS,mBAAmB,EAAE,CAAA;CACpD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAMlE;AAED,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,gBAAgB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GACnD,MAAM,CAYR;AAOD,wBAAsB,oBAAoB,CACtC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAuBjB"}
|
package/dist/lib/oauth.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CliError } from './errors.js';
|
|
2
2
|
import { oauthScopeFor } from './oauth-scopes.js';
|
|
3
3
|
import { DEFAULT_PORT, getRedirectUri } from './oauth-server.js';
|
|
4
|
+
import { fetchTodoist } from './usage-tracking.js';
|
|
4
5
|
const TODOIST_CLIENT_ID = '04863cc1e3584830a578622f50224d5b';
|
|
5
6
|
const OAUTH_AUTHORIZE_URL = 'https://todoist.com/oauth/authorize';
|
|
6
7
|
const OAUTH_TOKEN_URL = 'https://todoist.com/oauth/access_token';
|
|
@@ -33,7 +34,7 @@ export async function exchangeCodeForToken(code, codeVerifier, port) {
|
|
|
33
34
|
code_verifier: codeVerifier,
|
|
34
35
|
redirect_uri: getRedirectUri(port),
|
|
35
36
|
});
|
|
36
|
-
const response = await
|
|
37
|
+
const response = await fetchTodoist(OAUTH_TOKEN_URL, {
|
|
37
38
|
method: 'POST',
|
|
38
39
|
headers: {
|
|
39
40
|
'Content-Type': 'application/x-www-form-urlencoded',
|
package/dist/lib/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/lib/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAA4B,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/lib/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAA4B,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,MAAM,iBAAiB,GAAG,kCAAkC,CAAA;AAC5D,MAAM,mBAAmB,GAAG,qCAAqC,CAAA;AACjE,MAAM,eAAe,GAAG,wCAAwC,CAAA;AAChE,MAAM,CAAC,MAAM,iBAAiB,GAAG,4CAA4C,CAAA;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAA;AAO3C,MAAM,UAAU,gBAAgB,CAAC,OAAyB;IACtD,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAA;IACvE,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACjC,aAAqB,EACrB,KAAa,EACb,UAAgD,EAAE;IAElD,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACvC,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,IAAI,YAAY,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QAC/B,SAAS,EAAE,iBAAiB;QAC5B,KAAK;QACL,KAAK,EAAE,KAAK;QACZ,YAAY,EAAE,WAAW;QACzB,cAAc,EAAE,aAAa;QAC7B,qBAAqB,EAAE,MAAM;KAChC,CAAC,CAAA;IACF,OAAO,GAAG,mBAAmB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;AACxD,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,IAAY,EACZ,YAAoB,EACpB,IAAY;IAEZ,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;QAC7B,SAAS,EAAE,iBAAiB;QAC5B,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,YAAY;QAC3B,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC;KACrC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE;QACjD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACL,cAAc,EAAE,mCAAmC;SACtD;QACD,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;KACxB,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,0BAA0B,QAAQ,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;IAC1F,CAAC;IAED,MAAM,IAAI,GAAkB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IACjD,OAAO,IAAI,CAAC,YAAY,CAAA;AAC5B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/lib/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,gJAC6G,CAAA;
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/lib/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB,gJAC6G,CAAA;AA+EjJ,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAG/D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAM9D;AAID,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAOxD;AAED,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
|
package/dist/lib/permissions.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/lib/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAChC,6IAA6I,CAAA;AAEjJ,iFAAiF;AACjF,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACnC,OAAO;IACP,SAAS;IACT,QAAQ;IACR,UAAU;IACV,SAAS;IACT,kBAAkB;IAClB,mCAAmC;IACnC,sBAAsB;IACtB,WAAW;IACX,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,qBAAqB;IACrB,0BAA0B;IAC1B,uBAAuB;IACvB,yBAAyB;IACzB,SAAS;IACT,WAAW;IACX,UAAU;IACV,iBAAiB;IACjB,cAAc;IACd,WAAW;IACX,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,WAAW;IACX,aAAa;IACb,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,cAAc;IACd,mBAAmB;IACnB,4BAA4B;IAC5B,8BAA8B;IAC9B,uBAAuB;IACvB,6BAA6B;IAC7B,mBAAmB;IACnB,yBAAyB;IACzB,kBAAkB;IAClB,yBAAyB;IACzB,oBAAoB;IACpB,sBAAsB;IACtB,kCAAkC;IAClC,sBAAsB;IACtB,qBAAqB;IACrB,wBAAwB;IACxB,cAAc;IACd,aAAa;IACb,sBAAsB;IACtB,qBAAqB;IACrB,UAAU;IACV,YAAY;IACZ,gBAAgB;IAChB,mEAAmE;IACnE,SAAS;IACT,QAAQ;IACR,eAAe;IACf,yBAAyB;IACzB,iBAAiB;IACjB,yBAAyB;IACzB,eAAe;IACf,UAAU;IACV,YAAY;IACZ,WAAW;IACX,oDAAoD;IACpD,MAAM;CACT,CAAC,CAAA;AAEF,MAAM,UAAU,mBAAmB,CAAC,UAAkB;IAClD,IAAI,UAAU,IAAI,MAAM,CAAC,SAAS;QAAE,OAAO,KAAK,CAAA;IAChD,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAe;IACjD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACnC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IACzD,MAAM,QAAQ,GAAI,OAAkC,CAAC,QAAQ,CAAA;IAC7D,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;AACzD,CAAC;AAED,IAAI,cAAc,GAAwB,IAAI,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACpC,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,cAAc,GAAG,MAAM,eAAe,EAAE,CAAA;IAC5C,CAAC;IACD,IAAI,cAAc,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAA;IAC5D,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB;IACjC,cAAc,GAAG,IAAI,CAAA;AACzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/lib/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAC,MAAM,uBAAuB,GAChC,6IAA6I,CAAA;AAEjJ,iFAAiF;AACjF,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACnC,OAAO;IACP,SAAS;IACT,QAAQ;IACR,UAAU;IACV,SAAS;IACT,kBAAkB;IAClB,mCAAmC;IACnC,sBAAsB;IACtB,WAAW;IACX,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,qBAAqB;IACrB,0BAA0B;IAC1B,uBAAuB;IACvB,yBAAyB;IACzB,SAAS;IACT,WAAW;IACX,UAAU;IACV,iBAAiB;IACjB,cAAc;IACd,WAAW;IACX,aAAa;IACb,YAAY;IACZ,gBAAgB;IAChB,WAAW;IACX,aAAa;IACb,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,cAAc;IACd,mBAAmB;IACnB,4BAA4B;IAC5B,8BAA8B;IAC9B,uBAAuB;IACvB,6BAA6B;IAC7B,eAAe;IACf,sBAAsB;IACtB,mBAAmB;IACnB,yBAAyB;IACzB,kBAAkB;IAClB,yBAAyB;IACzB,oBAAoB;IACpB,sBAAsB;IACtB,kCAAkC;IAClC,sBAAsB;IACtB,qBAAqB;IACrB,wBAAwB;IACxB,cAAc;IACd,aAAa;IACb,sBAAsB;IACtB,qBAAqB;IACrB,UAAU;IACV,YAAY;IACZ,gBAAgB;IAChB,mEAAmE;IACnE,SAAS;IACT,QAAQ;IACR,eAAe;IACf,yBAAyB;IACzB,iBAAiB;IACjB,yBAAyB;IACzB,eAAe;IACf,UAAU;IACV,YAAY;IACZ,WAAW;IACX,oDAAoD;IACpD,MAAM;CACT,CAAC,CAAA;AAEF,MAAM,UAAU,mBAAmB,CAAC,UAAkB;IAClD,IAAI,UAAU,IAAI,MAAM,CAAC,SAAS;QAAE,OAAO,KAAK,CAAA;IAChD,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAe;IACjD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACnC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IACzD,MAAM,QAAQ,GAAI,OAAkC,CAAC,QAAQ,CAAA;IAC7D,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;AACzD,CAAC;AAED,IAAI,cAAc,GAAwB,IAAI,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACpC,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,cAAc,GAAG,MAAM,eAAe,EAAE,CAAA;IAC5C,CAAC;IACD,IAAI,cAAc,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAA;IAC5D,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB;IACjC,cAAc,GAAG,IAAI,CAAA;AACzB,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type CustomFetch } from '@doist/todoist-sdk';
|
|
2
|
+
export declare function normalizeCommandPath(commandPath: string): string;
|
|
3
|
+
export declare function setActiveCommandPath(commandPath: string | undefined): void;
|
|
4
|
+
export declare function getActiveCommandPath(): string | undefined;
|
|
5
|
+
export declare function buildUsageTrackingHeaders(commandPath?: string): Record<string, string>;
|
|
6
|
+
export declare function createTrackedFetch(baseFetch?: typeof fetch): CustomFetch;
|
|
7
|
+
export declare function fetchTodoist(url: string | URL, options?: RequestInit, fetchImpl?: typeof fetch, commandPath?: string): Promise<Response>;
|
|
8
|
+
export declare function resetUsageTrackingForTests(): void;
|
|
9
|
+
//# sourceMappingURL=usage-tracking.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-tracking.d.ts","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"AACA,OAAO,EACH,KAAK,WAAW,EAGnB,MAAM,oBAAoB,CAAA;AA4B3B,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE1E;AAED,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAEzD;AAED,wBAAgB,yBAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBtF;AAyCD,wBAAgB,kBAAkB,CAAC,SAAS,GAAE,OAAO,KAAwB,GAAG,WAAW,CAoB1F;AAED,wBAAsB,YAAY,CAC9B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,OAAO,GAAE,WAAgB,EACzB,SAAS,GAAE,OAAO,KAAwB,EAC1C,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAQnB;AAED,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { getDefaultDispatcher, } from '@doist/todoist-sdk';
|
|
3
|
+
import packageJson from '../../package.json' with { type: 'json' };
|
|
4
|
+
const CLI_NAME = 'todoist-cli';
|
|
5
|
+
const CLI_VERSION = packageJson.version;
|
|
6
|
+
const SESSION_ID = randomUUID();
|
|
7
|
+
let activeCommandPath;
|
|
8
|
+
function getUserAgent() {
|
|
9
|
+
return `${CLI_NAME}/${CLI_VERSION}`;
|
|
10
|
+
}
|
|
11
|
+
function getDoistOs(platform = process.platform) {
|
|
12
|
+
switch (platform) {
|
|
13
|
+
case 'darwin':
|
|
14
|
+
return 'macos';
|
|
15
|
+
case 'linux':
|
|
16
|
+
return 'linux';
|
|
17
|
+
case 'win32':
|
|
18
|
+
return 'windows';
|
|
19
|
+
default:
|
|
20
|
+
return 'unknown';
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
export function normalizeCommandPath(commandPath) {
|
|
24
|
+
return commandPath
|
|
25
|
+
.replace(/^td\s+/, '')
|
|
26
|
+
.trim()
|
|
27
|
+
.toLowerCase()
|
|
28
|
+
.replace(/\s+/g, ':');
|
|
29
|
+
}
|
|
30
|
+
export function setActiveCommandPath(commandPath) {
|
|
31
|
+
activeCommandPath = commandPath ? normalizeCommandPath(commandPath) : undefined;
|
|
32
|
+
}
|
|
33
|
+
export function getActiveCommandPath() {
|
|
34
|
+
return activeCommandPath;
|
|
35
|
+
}
|
|
36
|
+
export function buildUsageTrackingHeaders(commandPath) {
|
|
37
|
+
const normalizedCommandPath = commandPath
|
|
38
|
+
? normalizeCommandPath(commandPath)
|
|
39
|
+
: activeCommandPath;
|
|
40
|
+
const headers = {
|
|
41
|
+
'User-Agent': getUserAgent(),
|
|
42
|
+
'doist-platform': 'cli',
|
|
43
|
+
'doist-version': CLI_VERSION,
|
|
44
|
+
'doist-os': getDoistOs(),
|
|
45
|
+
'X-TD-Request-Id': randomUUID(),
|
|
46
|
+
'X-TD-Session-Id': SESSION_ID,
|
|
47
|
+
'X-TD-CLI-Command': normalizedCommandPath ?? 'unknown',
|
|
48
|
+
};
|
|
49
|
+
return headers;
|
|
50
|
+
}
|
|
51
|
+
function mergeTodoistHeaders(headersInit, commandPath) {
|
|
52
|
+
const mergedHeaders = new Headers(headersInit);
|
|
53
|
+
for (const [key, value] of Object.entries(buildUsageTrackingHeaders(commandPath))) {
|
|
54
|
+
mergedHeaders.set(key, value);
|
|
55
|
+
}
|
|
56
|
+
return Object.fromEntries(mergedHeaders.entries());
|
|
57
|
+
}
|
|
58
|
+
async function attachDispatcherIfNative(fetchImpl, options) {
|
|
59
|
+
// Test stubs pass their own `fetchImpl`; they don't need (or understand)
|
|
60
|
+
// the dispatcher option. Only the real native fetch path needs it for
|
|
61
|
+
// HTTP_PROXY / HTTPS_PROXY / NO_PROXY support.
|
|
62
|
+
if (fetchImpl !== globalThis.fetch)
|
|
63
|
+
return;
|
|
64
|
+
// Don't clobber a dispatcher the caller already chose.
|
|
65
|
+
if ('dispatcher' in options)
|
|
66
|
+
return;
|
|
67
|
+
const dispatcher = await getDefaultDispatcher();
|
|
68
|
+
if (dispatcher !== undefined) {
|
|
69
|
+
// @ts-expect-error - dispatcher is a valid option for Node's fetch but not in the TS types
|
|
70
|
+
options.dispatcher = dispatcher;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function toCustomFetchResponse(response) {
|
|
74
|
+
return {
|
|
75
|
+
ok: response.ok,
|
|
76
|
+
status: response.status,
|
|
77
|
+
statusText: response.statusText,
|
|
78
|
+
headers: Object.fromEntries(response.headers.entries()),
|
|
79
|
+
text: () => response.text(),
|
|
80
|
+
json: () => response.json(),
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
export function createTrackedFetch(baseFetch = globalThis.fetch) {
|
|
84
|
+
return async (url, options = {}) => {
|
|
85
|
+
const { timeout: timeoutMs, headers, signal, ...rest } = options;
|
|
86
|
+
let abortSignal = signal;
|
|
87
|
+
if (timeoutMs) {
|
|
88
|
+
const timeoutSignal = AbortSignal.timeout(timeoutMs);
|
|
89
|
+
abortSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
|
|
90
|
+
}
|
|
91
|
+
const fetchOptions = {
|
|
92
|
+
...rest,
|
|
93
|
+
signal: abortSignal,
|
|
94
|
+
headers: mergeTodoistHeaders(headers),
|
|
95
|
+
};
|
|
96
|
+
await attachDispatcherIfNative(baseFetch, fetchOptions);
|
|
97
|
+
const response = await baseFetch(url, fetchOptions);
|
|
98
|
+
return toCustomFetchResponse(response);
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
export async function fetchTodoist(url, options = {}, fetchImpl = globalThis.fetch, commandPath) {
|
|
102
|
+
const { headers, ...rest } = options;
|
|
103
|
+
const fetchOptions = {
|
|
104
|
+
...rest,
|
|
105
|
+
headers: mergeTodoistHeaders(headers, commandPath),
|
|
106
|
+
};
|
|
107
|
+
await attachDispatcherIfNative(fetchImpl, fetchOptions);
|
|
108
|
+
return fetchImpl(url, fetchOptions);
|
|
109
|
+
}
|
|
110
|
+
export function resetUsageTrackingForTests() {
|
|
111
|
+
activeCommandPath = undefined;
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=usage-tracking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@doist/todoist-cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.60.1",
|
|
4
4
|
"description": "TypeScript CLI for Todoist",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"CHANGELOG.md"
|
|
52
52
|
],
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@doist/todoist-sdk": "
|
|
54
|
+
"@doist/todoist-sdk": "10.1.0",
|
|
55
55
|
"@napi-rs/keyring": "1.2.0",
|
|
56
56
|
"@pnpm/tabtab": "0.5.4",
|
|
57
57
|
"chalk": "5.6.2",
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
export interface UploadResult {
|
|
2
|
-
fileName: string;
|
|
3
|
-
fileSize: number;
|
|
4
|
-
fileType: string;
|
|
5
|
-
fileUrl: string;
|
|
6
|
-
resourceType: string;
|
|
7
|
-
uploadState: string;
|
|
8
|
-
}
|
|
9
|
-
export declare function uploadFile(filePath: string): Promise<UploadResult>;
|
|
10
|
-
//# sourceMappingURL=uploads.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../../src/lib/api/uploads.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACtB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAsCxE"}
|
package/dist/lib/api/uploads.js
DELETED
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { getApiToken } from '../auth.js';
|
|
2
|
-
import { CliError } from '../errors.js';
|
|
3
|
-
import { ensureWriteAllowed } from '../permissions.js';
|
|
4
|
-
export async function uploadFile(filePath) {
|
|
5
|
-
await ensureWriteAllowed();
|
|
6
|
-
const fs = await import('node:fs');
|
|
7
|
-
const path = await import('node:path');
|
|
8
|
-
const token = await getApiToken();
|
|
9
|
-
const fileName = path.basename(filePath);
|
|
10
|
-
const fileBuffer = fs.readFileSync(filePath);
|
|
11
|
-
const formData = new FormData();
|
|
12
|
-
formData.append('file_name', fileName);
|
|
13
|
-
formData.append('file', new Blob([fileBuffer]), fileName);
|
|
14
|
-
const response = await fetch('https://api.todoist.com/api/v1/uploads', {
|
|
15
|
-
method: 'POST',
|
|
16
|
-
headers: {
|
|
17
|
-
Authorization: `Bearer ${token}`,
|
|
18
|
-
},
|
|
19
|
-
body: formData,
|
|
20
|
-
});
|
|
21
|
-
if (!response.ok) {
|
|
22
|
-
throw new CliError('UPLOAD_FAILED', `Upload failed: ${response.status} ${response.statusText}`);
|
|
23
|
-
}
|
|
24
|
-
const data = await response.json();
|
|
25
|
-
return {
|
|
26
|
-
fileName: data.file_name,
|
|
27
|
-
fileSize: data.file_size,
|
|
28
|
-
fileType: data.file_type,
|
|
29
|
-
fileUrl: data.file_url,
|
|
30
|
-
resourceType: data.resource_type,
|
|
31
|
-
uploadState: data.upload_state,
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
//# sourceMappingURL=uploads.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../../src/lib/api/uploads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAWtD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAgB;IAC7C,MAAM,kBAAkB,EAAE,CAAA;IAE1B,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;IAEtC,MAAM,KAAK,GAAG,MAAM,WAAW,EAAE,CAAA;IACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACxC,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IAE5C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC/B,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IACtC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IAEzD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,wCAAwC,EAAE;QACnE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACL,aAAa,EAAE,UAAU,KAAK,EAAE;SACnC;QACD,IAAI,EAAE,QAAQ;KACjB,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,IAAI,QAAQ,CACd,eAAe,EACf,kBAAkB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAA;IACL,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAClC,OAAO;QACH,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,OAAO,EAAE,IAAI,CAAC,QAAQ;QACtB,YAAY,EAAE,IAAI,CAAC,aAAa;QAChC,WAAW,EAAE,IAAI,CAAC,YAAY;KACjC,CAAA;AACL,CAAC"}
|