@supersdk/supercli 0.3.2-staging.44 → 0.3.2
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/dist/cli.js +11 -22
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +31 -79
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +9 -15
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/db.js +19 -24
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +751 -434
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env.js +8 -8
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/image.js +20 -31
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +37 -68
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +7 -16
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +943 -28
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +30 -51
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +6 -10
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +36 -40
- package/dist/config/appConfig.js.map +1 -1
- package/dist/docker/dockerCli.js +1 -63
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +1 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +0 -3
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/publish/responseClassifier.js +4 -4
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/runClient.js +11 -11
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteConfig.js +649 -0
- package/dist/publish/siteConfig.js.map +1 -0
- package/dist/publish/siteZip.js +5 -4
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +227 -64
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -6
- package/dist/template/android/supersdk-default.config.json +2 -3
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/scripts/build_android.sh +10 -26
- package/dist/template/scripts/build_ios.sh +9 -41
- package/dist/template/scripts/build_site.sh +26 -40
- package/dist/template/scripts/lib/workspace.sh +4 -4
- package/dist/template/scripts/serve_web.py +4 -2
- package/dist/template/scripts/super_build_orchestrator.py +355 -278
- package/dist/template/scripts/supersdk_template.py +181 -414
- package/dist/template/scripts/web_package.py +8 -9
- package/dist/template/super_build.sh +113 -39
- package/dist/template/{super.json → supersdk.json} +1 -20
- package/dist/template/template_manifest.json +4 -5
- package/dist/workspace/config.js +119 -81
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +14 -15
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/inspect.js +0 -1
- package/dist/workspace/inspect.js.map +1 -1
- package/dist/workspace/projectIdentity.js +96 -53
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +8 -5
- package/dist/workspace/template.js.map +1 -1
- package/package.json +2 -2
- package/dist/build/artifactIntegrity.js +0 -119
- package/dist/build/artifactIntegrity.js.map +0 -1
- package/dist/commands/build.js +0 -231
- package/dist/commands/build.js.map +0 -1
- package/dist/commands/config.js +0 -170
- package/dist/commands/config.js.map +0 -1
- package/dist/config/superConfig.js +0 -429
- package/dist/config/superConfig.js.map +0 -1
- package/dist/deploy/adapterTypes.js +0 -3
- package/dist/deploy/adapterTypes.js.map +0 -1
- package/dist/deploy/manifest.js +0 -381
- package/dist/deploy/manifest.js.map +0 -1
- package/dist/deploy/preflight.js +0 -202
- package/dist/deploy/preflight.js.map +0 -1
- package/dist/deploy/resultWriter.js +0 -178
- package/dist/deploy/resultWriter.js.map +0 -1
- package/dist/deploy/runAdapter.js +0 -299
- package/dist/deploy/runAdapter.js.map +0 -1
- package/dist/deploy/siteAdapter.js +0 -182
- package/dist/deploy/siteAdapter.js.map +0 -1
- package/dist/template/scripts/build_service.sh +0 -89
- package/dist/template/service/Dockerfile +0 -2
- package/dist/workspace/projectContext.js +0 -93
- package/dist/workspace/projectContext.js.map +0 -1
package/dist/cli.js
CHANGED
|
@@ -6,8 +6,6 @@ const commander_1 = require("commander");
|
|
|
6
6
|
const accounts_1 = require("./commands/accounts");
|
|
7
7
|
const analytics_1 = require("./commands/analytics");
|
|
8
8
|
const add_1 = require("./commands/add");
|
|
9
|
-
const build_1 = require("./commands/build");
|
|
10
|
-
const config_1 = require("./commands/config");
|
|
11
9
|
const deploy_1 = require("./commands/deploy");
|
|
12
10
|
const db_1 = require("./commands/db");
|
|
13
11
|
const init_1 = require("./commands/init");
|
|
@@ -54,9 +52,13 @@ function buildProgram() {
|
|
|
54
52
|
const program = new commander_1.Command();
|
|
55
53
|
program
|
|
56
54
|
.name('supercli')
|
|
57
|
-
.description('SuperSDK official
|
|
58
|
-
//
|
|
59
|
-
//
|
|
55
|
+
.description('SuperSDK official command-line tool: browser-authorized login and multi-account context.')
|
|
56
|
+
// 🔴 必须开:commander 默认把 program 级选项当全局选项,任何位置都能命中。而
|
|
57
|
+
// `publish-site` 自己有一个同名的 `--version <离线包版本>`,于是
|
|
58
|
+
// `publish-site ./dist --version 1.0.0` 会被 program 的 --version 抢走 ——
|
|
59
|
+
// 打印 CLI 版本号、退出码 0、**什么都没发布**(静默 no-op 比报错危险得多)。
|
|
60
|
+
// enablePositionalOptions 把 program 级选项限制在子命令名之前,子命令名之后
|
|
61
|
+
// 的选项一律归子命令,两个 --version 从此互不干扰。
|
|
60
62
|
.enablePositionalOptions()
|
|
61
63
|
.version(pkg.version, '--version', 'output the version number')
|
|
62
64
|
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
@@ -67,11 +69,9 @@ function buildProgram() {
|
|
|
67
69
|
(0, logout_1.registerLogoutCommand)(program);
|
|
68
70
|
(0, update_1.registerUpdateCommand)(program);
|
|
69
71
|
(0, init_1.registerInitCommand)(program);
|
|
70
|
-
(0, config_1.registerConfigCommand)(program);
|
|
71
72
|
(0, image_1.registerImageCommand)(program);
|
|
72
73
|
(0, add_1.registerAddCommand)(program);
|
|
73
74
|
(0, register_1.registerRegisterCommand)(program);
|
|
74
|
-
(0, build_1.registerBuildCommands)(program);
|
|
75
75
|
(0, publishSite_1.registerPublishSiteCommand)(program);
|
|
76
76
|
(0, deploy_1.registerDeployCommand)(program);
|
|
77
77
|
(0, logs_1.registerLogsCommand)(program);
|
|
@@ -101,21 +101,10 @@ function buildProgram() {
|
|
|
101
101
|
// command just added) so `--output json` is accepted AFTER the subcommand name too
|
|
102
102
|
// (enablePositionalOptions confines program-level options to before the subcommand).
|
|
103
103
|
// Read via optsWithGlobals() in commands.
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (!cmd.options.some((option) => option.long === '--output')) {
|
|
109
|
-
cmd.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout');
|
|
110
|
-
}
|
|
111
|
-
if (!cmd.options.some((option) => option.long === '--no-input')) {
|
|
112
|
-
cmd.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
113
|
-
}
|
|
114
|
-
for (const child of cmd.commands)
|
|
115
|
-
ensureAgentOptions(child);
|
|
116
|
-
};
|
|
117
|
-
for (const cmd of program.commands)
|
|
118
|
-
ensureAgentOptions(cmd);
|
|
104
|
+
for (const cmd of program.commands) {
|
|
105
|
+
cmd.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout');
|
|
106
|
+
cmd.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
107
|
+
}
|
|
119
108
|
return program;
|
|
120
109
|
}
|
|
121
110
|
async function run() {
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/add.js
CHANGED
|
@@ -37,7 +37,7 @@ exports.runAdd = runAdd;
|
|
|
37
37
|
exports.registerAddCommand = registerAddCommand;
|
|
38
38
|
const fs = __importStar(require("node:fs"));
|
|
39
39
|
const path = __importStar(require("node:path"));
|
|
40
|
-
const
|
|
40
|
+
const log_1 = require("../util/log");
|
|
41
41
|
const prompt_1 = require("../util/prompt");
|
|
42
42
|
const shell_1 = require("../util/shell");
|
|
43
43
|
const config_1 = require("../workspace/config");
|
|
@@ -74,6 +74,7 @@ function adoptExistingHint(type, dirArg, projectDir, opts) {
|
|
|
74
74
|
package: (0, interactive_1.trimFlag)(opts.package),
|
|
75
75
|
slug: (0, interactive_1.trimFlag)(opts.slug),
|
|
76
76
|
env: (0, interactive_1.trimFlag)(opts.env),
|
|
77
|
+
deployDir: (0, interactive_1.trimFlag)(opts.deployDir),
|
|
77
78
|
};
|
|
78
79
|
return [
|
|
79
80
|
'Already have a project there? `supercli add` scaffolds a NEW one; taking over an existing tree is ' +
|
|
@@ -124,27 +125,27 @@ function summary(type, target, entry, fileCount, workspace, sharedKept, sharedCr
|
|
|
124
125
|
`dir: ${entry.dir}`,
|
|
125
126
|
`files: ${fileCount}`,
|
|
126
127
|
`registered in: ${workspace.configPath}`,
|
|
127
|
-
`SPID: ${workspace.spid}`,
|
|
128
|
-
`projectId: ${String(entry.projectId)}`,
|
|
129
128
|
];
|
|
130
129
|
if (type === 'android')
|
|
131
130
|
lines.push(`name: ${String(entry.name)}`, `package: ${String(entry.package)}`);
|
|
132
131
|
if (type === 'ios')
|
|
133
132
|
lines.push(`name: ${String(entry.name)}`, `bundleId: ${String(entry.bundleId)}`, `spmMode: ${String(entry.spmMode)}`);
|
|
134
133
|
if (type === 'site') {
|
|
135
|
-
const deploy = entry.deploy
|
|
134
|
+
const deploy = entry.deploy[0];
|
|
135
|
+
// 「没写 name」必须说出来,并说清它意味着什么 —— 静默留空会让人以为 CLI 忘了记。
|
|
136
136
|
lines.push(entry.name === undefined
|
|
137
|
-
?
|
|
138
|
-
: `name: ${String(entry.name)}`, deploy
|
|
139
|
-
|
|
140
|
-
|
|
137
|
+
? `name: (unset) — resolves to the slug "${deploy.slug}"; pass --name here, or --name to \`supercli publish-site\`, to set a different one`
|
|
138
|
+
: `name: ${String(entry.name)}`, `deploy[0]: slug=${deploy.slug} env=${deploy.env} dir=${deploy.dir}`);
|
|
139
|
+
// 🔴 显式打印,不静默:没有 offline.host 就没有离线包。域名是服务端签发的,CLI 绝不自己拼。
|
|
140
|
+
lines.push('offline.host: (unset) — offline packaging is skipped until the first successful ' +
|
|
141
|
+
'`supercli publish-site`, which records the domain the server issued. supercli never composes a domain itself.');
|
|
141
142
|
}
|
|
142
143
|
if (sharedCreated.length > 0)
|
|
143
144
|
lines.push(`shared files written: ${sharedCreated.join(', ')}`);
|
|
144
145
|
// 「已存在所以没动」必须说出来 —— 这正是「第二次 add 不覆盖第一次」的可见证据。
|
|
145
146
|
if (sharedKept.length > 0)
|
|
146
147
|
lines.push(`shared files kept (already present, not overwritten): ${sharedKept.join(', ')}`);
|
|
147
|
-
lines.push('', `next: cd ${(0, shell_1.shellQuote)(workspace.root)} &&
|
|
148
|
+
lines.push('', `next: cd ${(0, shell_1.shellQuote)(workspace.root)} && ./super_build.sh --plan`);
|
|
148
149
|
return lines.join('\n');
|
|
149
150
|
}
|
|
150
151
|
/**
|
|
@@ -157,7 +158,7 @@ async function runAdd(typeArg, dirArg, opts, deps = {}) {
|
|
|
157
158
|
}
|
|
158
159
|
const type = typeArg;
|
|
159
160
|
const cwd = path.resolve(deps.cwd ?? process.cwd());
|
|
160
|
-
const loaded = (0, config_1.loadWorkspace)(cwd
|
|
161
|
+
const loaded = (0, config_1.loadWorkspace)(cwd);
|
|
161
162
|
if (loaded.kind !== 'ok')
|
|
162
163
|
return { ok: false, message: loaded.message };
|
|
163
164
|
const workspace = loaded.workspace;
|
|
@@ -241,29 +242,7 @@ async function runAdd(typeArg, dirArg, opts, deps = {}) {
|
|
|
241
242
|
}),
|
|
242
243
|
};
|
|
243
244
|
}
|
|
244
|
-
|
|
245
|
-
// Catch this before copying a template so a rejected add never leaves a half-created tree.
|
|
246
|
-
if (type === 'site' && identity.resolved.slug !== undefined && identity.resolved.env !== undefined) {
|
|
247
|
-
const slug = identity.resolved.slug;
|
|
248
|
-
const env = identity.resolved.env;
|
|
249
|
-
const taken = workspace.config.projects
|
|
250
|
-
.filter((project) => project.type === 'site' || project.type === 'service')
|
|
251
|
-
.map((project) => ({ project, entry: project.deploy?.find((target) => target.slug === slug && target.env === env) }))
|
|
252
|
-
.find((candidate) => candidate.entry !== undefined);
|
|
253
|
-
if (taken) {
|
|
254
|
-
const next = `supercli deploy --project ${taken.project.projectId} --env-target ${taken.entry.envTarget}`;
|
|
255
|
-
return {
|
|
256
|
-
ok: false,
|
|
257
|
-
message: `refusing to add "${projectDir}": the ${taken.project.type} project at "${taken.project.dir}" already deploys ` +
|
|
258
|
-
`slug=${slug} env=${env}; choose a different --slug/--env or use the existing project: ${next}`,
|
|
259
|
-
};
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
const projectId = opts.project?.trim();
|
|
263
|
-
if (!projectId || !/^[a-z][a-z0-9-]{0,63}$/.test(projectId) || workspace.projects.some((project) => project.projectId === projectId)) {
|
|
264
|
-
return { ok: false, message: '--project is required and must be a unique stable projectId' };
|
|
265
|
-
}
|
|
266
|
-
const entry = (0, projectIdentity_1.buildEntry)(type, projectDir, identity.resolved, projectId);
|
|
245
|
+
const entry = (0, projectIdentity_1.buildEntry)(type, projectDir, identity.resolved);
|
|
267
246
|
// ---- 拷贝到进程私有的临时目录,全部就绪后再原子搬进目标位置 ----
|
|
268
247
|
const tempDir = `${target}.tmp-${process.pid}`;
|
|
269
248
|
try {
|
|
@@ -338,71 +317,44 @@ async function runAdd(typeArg, dirArg, opts, deps = {}) {
|
|
|
338
317
|
entry,
|
|
339
318
|
fileCount,
|
|
340
319
|
sharedKept: shared.kept,
|
|
341
|
-
configPath: workspace.configPath,
|
|
342
|
-
spid: workspace.spid,
|
|
343
320
|
};
|
|
344
321
|
}
|
|
345
|
-
function outputModeOf(command) {
|
|
346
|
-
return command.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
|
|
347
|
-
}
|
|
348
322
|
function applyCommonAction(type) {
|
|
349
|
-
return async (dirArg, opts
|
|
323
|
+
return async (dirArg, opts) => {
|
|
350
324
|
const result = await runAdd(type, dirArg, opts);
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
configPath: result.configPath,
|
|
358
|
-
spid: result.spid,
|
|
359
|
-
projectId: result.entry?.projectId,
|
|
360
|
-
projectDir: result.projectDir,
|
|
361
|
-
entry: result.entry,
|
|
362
|
-
fileCount: result.fileCount,
|
|
363
|
-
}, { humanMessage: result.message });
|
|
325
|
+
if (!result.ok) {
|
|
326
|
+
log_1.log.error(result.message);
|
|
327
|
+
process.exitCode = 1;
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
log_1.log.info(result.message);
|
|
364
331
|
};
|
|
365
332
|
}
|
|
366
|
-
function withGlobalOptions(command) {
|
|
367
|
-
return command
|
|
368
|
-
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
369
|
-
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
370
|
-
}
|
|
371
333
|
function registerAddCommand(program) {
|
|
372
334
|
const add = program
|
|
373
335
|
.command('add')
|
|
374
336
|
.description(`Register a project directory in the current workspace (${template_1.PROJECT_TYPE_NAMES.join(' | ')}).`);
|
|
375
|
-
|
|
337
|
+
add
|
|
376
338
|
.command('android <dir>')
|
|
377
|
-
.description('Copy the Android project template into <dir> and register it in
|
|
378
|
-
.requiredOption('--project <id>', 'stable projectId')
|
|
379
|
-
.option('--config <path>', 'explicit super.json path')
|
|
339
|
+
.description('Copy the Android project template into <dir> and register it in supersdk.json.')
|
|
380
340
|
.option('--name <name>', 'Android app label (required; never derived from the workspace name)')
|
|
381
|
-
.option('--package <package>', 'Java package / applicationId, e.g. com.acme.myapp (required)')
|
|
341
|
+
.option('--package <package>', 'Java package / applicationId, e.g. com.acme.myapp (required)')
|
|
382
342
|
.action(applyCommonAction('android'));
|
|
383
|
-
|
|
343
|
+
add
|
|
384
344
|
.command('ios <dir>')
|
|
385
|
-
.description('Copy the iOS project template into <dir> and register it in
|
|
386
|
-
.requiredOption('--project <id>', 'stable projectId')
|
|
387
|
-
.option('--config <path>', 'explicit super.json path')
|
|
345
|
+
.description('Copy the iOS project template into <dir> and register it in supersdk.json.')
|
|
388
346
|
.option('--name <name>', 'iOS display name (required; never derived from the workspace name)')
|
|
389
347
|
.option('--bundle-id <bundleId>', 'bundle identifier, e.g. com.acme.myapp (required)')
|
|
390
|
-
.option('--spm-mode <mode>', `SuperSDK Swift package mode: ${identity_1.SPM_MODES.join('|')} (default: ${identity_1.SPM_MODES[0]})`)
|
|
348
|
+
.option('--spm-mode <mode>', `SuperSDK Swift package mode: ${identity_1.SPM_MODES.join('|')} (default: ${identity_1.SPM_MODES[0]})`)
|
|
391
349
|
.action(applyCommonAction('ios'));
|
|
392
|
-
|
|
350
|
+
add
|
|
393
351
|
.command('site <dir>')
|
|
394
|
-
.description('Copy the site (web) project template into <dir> and register it in
|
|
395
|
-
.
|
|
396
|
-
.option('--config <path>', 'explicit super.json path')
|
|
397
|
-
.option('--env-target <name>', 'named deployment target; requires --slug and --env')
|
|
398
|
-
.option('--slug <slug>', 'site slug; requires --env-target and --env')
|
|
352
|
+
.description('Copy the site (web) project template into <dir> and register it in supersdk.json.')
|
|
353
|
+
.option('--slug <slug>', 'site slug, 1-32 lowercase letters/digits (required)')
|
|
399
354
|
.option('--name <name>', 'site name; omitted, nothing is recorded and it resolves to the slug')
|
|
400
|
-
.option('--env <env>',
|
|
355
|
+
.option('--env <env>', `project environment this site deploys to (default: ${projectIdentity_1.DEFAULT_SITE_ENV})`)
|
|
356
|
+
.option('--deploy-dir <dir>', `directory published by publish-site, relative to the workspace root (not to <dir>) and inside <dir> ` +
|
|
357
|
+
`(default: <dir>/${projectIdentity_1.SITE_DIST_DIRNAME})`)
|
|
401
358
|
.action(applyCommonAction('site'));
|
|
402
|
-
withGlobalOptions(add.command('service <dir>')
|
|
403
|
-
.description('Not supported: register an existing service with `supercli register service <dir> --project <id>`.')).action((_dir, _opts, command) => {
|
|
404
|
-
new resultPrinter_1.ResultPrinter(outputModeOf(command))
|
|
405
|
-
.failure('business_error', '`supercli add service` is unsupported; use `supercli register service <dir> --project <id>` for an existing service.');
|
|
406
|
-
});
|
|
407
359
|
}
|
|
408
360
|
//# sourceMappingURL=add.js.map
|
package/dist/commands/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0MA,wBA4KC;AAcD,gDAgCC;AA/YD,4CAA8B;AAC9B,gDAAkC;AAElC,qCAAkC;AAClC,2CAA+E;AAC/E,yCAA2C;AAC3C,gDAS6B;AAC7B,oDAAqE;AACrE,0DAAmE;AACnE,kEAQsC;AACtC,oDAW+B;AA0B/B,SAAS,YAAY,CAAC,IAAiB;IACrC,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,iBAAiB,CAAC,IAAiB,EAAE,MAAc,EAAE,UAAkB,EAAE,IAAgB;IAChG,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,OAAO;YACL,6GAA6G;gBAC3G,yGAAyG;gBACzG,yEAAyE;SAC5E,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAuC;QACnD,IAAI,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;QACzB,OAAO,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;QACzB,GAAG,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,GAAG,CAAC;QACvB,SAAS,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC;KACpC,CAAC;IACF,OAAO;QACL,oGAAoG;YAClG,sBAAsB;QACxB,EAAE;QACF,KAAK,IAAA,kCAAgB,EAAC,qBAAqB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE;QAC9F,EAAE;QACF,8CAA8C,wBAAe,4CAA4C;YACvG,yBAAyB;KAC5B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAAC,IAAiB;IAC7C,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,EAAE,CAAC;IAC/B,OAAO;QACL,0EAA0E;YACxE,UAAU,4BAAiB,CAAC,IAAI,sBAAsB,4BAAiB,CAAC,cAAc,IAAI;YAC1F,gBAAgB,4BAAiB,CAAC,WAAW,4CAA4C;YACzF,mCAAmC;KACtC,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,IAAI,IAAc,CAAC;IACnB,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACvE,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,OAAO,iBAAiB,CAAC;IAClD,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CACd,IAAiB,EACjB,MAAc,EACd,KAAmB,EACnB,SAAiB,EACjB,SAAoB,EACpB,UAAoB,EACpB,aAAuB;IAEvB,MAAM,KAAK,GAAG;QACZ,SAAS,IAAI,eAAe,MAAM,EAAE;QACpC,QAAQ,KAAK,CAAC,GAAG,EAAE;QACnB,UAAU,SAAS,EAAE;QACrB,kBAAkB,SAAS,CAAC,UAAU,EAAE;KACzC,CAAC;IACF,IAAI,IAAI,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvG,IAAI,IAAI,KAAK,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1I,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,MAAM,GAAI,KAAK,CAAC,MAAwC,CAAC,CAAC,CAAC,CAAC;QAClE,iDAAiD;QACjD,KAAK,CAAC,IAAI,CACR,KAAK,CAAC,IAAI,KAAK,SAAS;YACtB,CAAC,CAAC,yCAAyC,MAAM,CAAC,IAAI,qFAAqF;YAC3I,CAAC,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EACjC,mBAAmB,MAAM,CAAC,IAAI,QAAQ,MAAM,CAAC,GAAG,QAAQ,MAAM,CAAC,GAAG,EAAE,CACrE,CAAC;QACF,0DAA0D;QAC1D,KAAK,CAAC,IAAI,CACR,kFAAkF;YAChF,+GAA+G,CAClH,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,yBAAyB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9F,8CAA8C;IAC9C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,yDAAyD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxH,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,IAAA,kBAAU,EAAC,SAAS,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACpF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,MAAM,CAAC,OAAe,EAAE,MAAc,EAAE,IAAgB,EAAE,OAAgB,EAAE;IAChG,IAAI,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,yBAAyB,OAAO,eAAe,6BAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;IAC/G,CAAC;IACD,MAAM,IAAI,GAAgB,OAAO,CAAC;IAElC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAA,sBAAa,EAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACxE,MAAM,SAAS,GAAc,MAAM,CAAC,SAAS,CAAC;IAE9C,wCAAwC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,uBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,IAAA,wBAAe,EAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC1B,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,UAAU,MAAM,iBAAiB,MAAM,yCAAyC,SAAS,CAAC,IAAI,IAAI;gBAClG,GAAG,UAAU,CAAC,KAAK,oEAAoE;SAC1F,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC;IAElC,sDAAsD;IACtD,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACjE,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,oBAAoB,UAAU,MAAM,wBAAe,0BAA0B,QAAQ,CAAC,IAAI,cAAc;gBACxG,IAAI,QAAQ,CAAC,GAAG,8EAA8E;gBAC9F,6EAA6E;SAChF,CAAC;IACJ,CAAC;IAED,IAAI,YAAoB,CAAC;IACzB,IAAI,QAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAA,oCAAyB,GAAE,CAAC;QAChE,QAAQ,GAAG,IAAA,+BAAoB,EAAC,YAAY,CAAC,CAAC,QAAQ,CAAC;IACzD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAA,yBAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACjF,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,gCAAgC,IAAI,gBAAgB,cAAc,qBAAqB;SACjG,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;QAChC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,MAAM,yCAAyC,EAAE,CAAC;IACjG,CAAC;IACD,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,0BAA0B,MAAM,GAAG,EAAE,CAAC;IACrE,CAAC;IACD,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;QAC9B,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE;gBACP,qBAAqB,MAAM,wEAAwE;oBACjG,oFAAoF;gBACtF,EAAE;gBACF,+CAA+C;gBAC/C,+CAA+C;gBAC/C,GAAG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC;aACrD,CAAC,IAAI,CAAC,IAAI,CAAC;SACb,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,6DAA6D;IAC7D,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,2BAAkB,CAAC,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,kCAAyB,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC9E,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,IAAA,wCAAsB,EAAC;gBAC9B,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC;gBAChC,IAAI;gBACJ,MAAM;gBACN,UAAU;gBACV,IAAI;gBACJ,WAAW;gBACX,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,aAAa,EAAE,SAAS,CAAC,IAAI;gBAC7B,KAAK,EAAE,oBAAoB,CAAC,IAAI,CAAC;aAClC,CAAC;SACH,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,4BAAU,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE9D,wCAAwC;IACxC,MAAM,OAAO,GAAG,GAAG,MAAM,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/C,IAAI,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,uDAAuD;IAC/G,CAAC;IAAC,MAAM,CAAC;QACP,cAAc;IAChB,CAAC;IAED,IAAI,SAAiB,CAAC;IACtB,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,SAAS,GAAG,IAAA,sBAAW,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAA,4CAAiC,EAAC,OAAO,EAAE;gBACzC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAc;gBAC1B,OAAO,EAAE,KAAK,CAAC,OAAiB;gBAChC,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7F,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClF,CAAC,CAAC;QACL,CAAC;QACD,wCAAwC;QACxC,MAAM,GAAG,IAAA,gCAAqB,EAAC,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,6BAA6B,IAAI,aAAc,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC;IACxG,CAAC;IAED,IAAI,CAAC;QACH,IAAI,KAAK,KAAK,WAAW;YAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChD,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,OAAO,IAAI,2DAA2D,MAAM,MAAO,GAAa,CAAC,OAAO,IAAI;gBAC5G,6BAA6B,wBAAe,2CAA2C,OAAO,MAAM;gBACpG,wCAAwC,IAAA,kBAAU,EAAC,OAAO,CAAC,IAAI,IAAA,kBAAU,EAAC,MAAM,CAAC,2BAA2B;SAC/G,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,gDAAgD;IAChD,2CAA2C;IAC3C,IAAI,CAAC;QACH,IAAA,sBAAa,EAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,QAAQ,GAAG,0CAA0C,MAAM,GAAG,CAAC;QACnE,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,QAAQ,GAAG,qCAAqC,MAAM,+BAAgC,KAAe,CAAC,OAAO,yBAAyB,CAAC;QACzI,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,qCAAqC,SAAS,CAAC,UAAU,KAAM,GAAa,CAAC,OAAO,KAAK,QAAQ,GAAG;SAC9G,CAAC;IACJ,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QACxF,UAAU,EAAE,MAAM;QAClB,KAAK;QACL,SAAS;QACT,UAAU,EAAE,MAAM,CAAC,IAAI;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAiB;IAC1C,OAAO,KAAK,EAAE,MAAc,EAAE,IAAgB,EAAiB,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB;IACjD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,0DAA0D,6BAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7G,GAAG;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,gFAAgF,CAAC;SAC7F,MAAM,CAAC,eAAe,EAAE,qEAAqE,CAAC;SAC9F,MAAM,CAAC,qBAAqB,EAAE,8DAA8D,CAAC;SAC7F,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;IAExC,GAAG;SACA,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,4EAA4E,CAAC;SACzF,MAAM,CAAC,eAAe,EAAE,oEAAoE,CAAC;SAC7F,MAAM,CAAC,wBAAwB,EAAE,mDAAmD,CAAC;SACrF,MAAM,CAAC,mBAAmB,EAAE,gCAAgC,oBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,oBAAS,CAAC,CAAC,CAAC,GAAG,CAAC;SAC7G,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpC,GAAG;SACA,OAAO,CAAC,YAAY,CAAC;SACrB,WAAW,CAAC,mFAAmF,CAAC;SAChG,MAAM,CAAC,eAAe,EAAE,qDAAqD,CAAC;SAC9E,MAAM,CAAC,eAAe,EAAE,qEAAqE,CAAC;SAC9F,MAAM,CAAC,aAAa,EAAE,sDAAsD,kCAAgB,GAAG,CAAC;SAChG,MAAM,CACL,oBAAoB,EACpB,sGAAsG;QACpG,mBAAmB,mCAAiB,GAAG,CAC1C;SACA,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -52,7 +52,6 @@ const credentialStore_1 = require("../store/credentialStore");
|
|
|
52
52
|
const log_1 = require("../util/log");
|
|
53
53
|
const prompt_1 = require("../util/prompt");
|
|
54
54
|
const sqlInput_1 = require("./sqlInput");
|
|
55
|
-
const projectContext_1 = require("../workspace/projectContext");
|
|
56
55
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
57
56
|
const pkg = require('../../package.json');
|
|
58
57
|
function storedToken(account) {
|
|
@@ -97,14 +96,11 @@ function resolveAuth(deps) {
|
|
|
97
96
|
return { token, apiOrigin: account.apiOrigin, accountKey: account.accountKey };
|
|
98
97
|
}
|
|
99
98
|
function validScope(opts) {
|
|
100
|
-
const
|
|
101
|
-
if ('ok' in config)
|
|
102
|
-
return config;
|
|
103
|
-
const spid = config.spid;
|
|
99
|
+
const spid = value(opts.spid);
|
|
104
100
|
const env = value(opts.env);
|
|
105
101
|
if (!spid || !env)
|
|
106
|
-
return { ok: false, kind: 'usage_error', message: '--
|
|
107
|
-
return {
|
|
102
|
+
return { ok: false, kind: 'usage_error', message: '--spid and --env are both required' };
|
|
103
|
+
return { spid, env };
|
|
108
104
|
}
|
|
109
105
|
function isOutcome(valueToCheck) {
|
|
110
106
|
return valueToCheck !== null && typeof valueToCheck === 'object' && 'ok' in valueToCheck;
|
|
@@ -182,8 +178,7 @@ async function runAnalyticsQuery(opts, requestId, deps = exports.defaultAnalytic
|
|
|
182
178
|
catch {
|
|
183
179
|
return { ok: false, kind: 'infra_error', message: 'analytics result was withheld because it contained credential-shaped data' };
|
|
184
180
|
}
|
|
185
|
-
|
|
186
|
-
return { ok: true, result, humanMessage: humanQueryOutput(result) };
|
|
181
|
+
return { ok: true, result: outcome.data, humanMessage: humanQueryOutput(outcome.data) };
|
|
187
182
|
}
|
|
188
183
|
async function runMetadata(opts, deps, call, humanMessage) {
|
|
189
184
|
const scope = validScope(opts);
|
|
@@ -195,8 +190,7 @@ async function runMetadata(opts, deps, call, humanMessage) {
|
|
|
195
190
|
const outcome = await call(deps.createClient(auth.apiOrigin), auth, scope);
|
|
196
191
|
if (outcome.kind !== 'success')
|
|
197
192
|
return analyticsFailure(outcome);
|
|
198
|
-
|
|
199
|
-
return { ok: true, result, humanMessage: humanMessage(result) };
|
|
193
|
+
return { ok: true, result: outcome.data, humanMessage: humanMessage(outcome.data) };
|
|
200
194
|
}
|
|
201
195
|
function runAnalyticsTables(opts, deps = exports.defaultAnalyticsDeps) {
|
|
202
196
|
return runMetadata(opts, deps, (client, auth, scope) => client.tables({ token: auth.token }, scope), humanMetadataOutput);
|
|
@@ -228,7 +222,7 @@ function registerAnalyticsCommand(program) {
|
|
|
228
222
|
const analytics = program.command('analytics').description('Query scoped event analytics through the Console API.');
|
|
229
223
|
addLeafOutputOptions(analytics.command('query')
|
|
230
224
|
.description('Run one scoped read-only events SQL query. --sql may be saved by shell history; use --file or stdin for sensitive/complex SQL.')
|
|
231
|
-
.
|
|
225
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
232
226
|
.requiredOption('--env <env>', 'project environment')
|
|
233
227
|
.requiredOption('--from <date>', 'inclusive Asia/Shanghai date (YYYY-MM-DD)')
|
|
234
228
|
.requiredOption('--to <date>', 'inclusive Asia/Shanghai date (YYYY-MM-DD)')
|
|
@@ -244,12 +238,12 @@ function registerAnalyticsCommand(program) {
|
|
|
244
238
|
}));
|
|
245
239
|
addLeafOutputOptions(analytics.command('tables')
|
|
246
240
|
.description('List logical analytics tables in one project environment.')
|
|
247
|
-
.
|
|
241
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
248
242
|
.requiredOption('--env <env>', 'project environment')
|
|
249
243
|
.action(async (opts, cmd) => emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runAnalyticsTables(opts))));
|
|
250
244
|
addLeafOutputOptions(analytics.command('table <table>')
|
|
251
245
|
.description('Show metadata for a logical analytics table (currently events).')
|
|
252
|
-
.
|
|
246
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
253
247
|
.requiredOption('--env <env>', 'project environment')
|
|
254
248
|
.action(async (table, opts, cmd) => {
|
|
255
249
|
const printer = new resultPrinter_1.ResultPrinter(outputModeOf(cmd));
|
|
@@ -259,7 +253,7 @@ function registerAnalyticsCommand(program) {
|
|
|
259
253
|
}));
|
|
260
254
|
addLeafOutputOptions(analytics.command('columns <table>')
|
|
261
255
|
.description('Show columns for a logical analytics table (currently events).')
|
|
262
|
-
.
|
|
256
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
263
257
|
.requiredOption('--env <env>', 'project environment')
|
|
264
258
|
.action(async (table, opts, cmd) => {
|
|
265
259
|
const printer = new resultPrinter_1.ResultPrinter(outputModeOf(cmd));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/commands/analytics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/commands/analytics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqIA,4CAoBC;AAUD,0CAGC;AAED,8CA4BC;AAiBD,gDAEC;AAED,8CAEC;AAED,kDAEC;AAwBD,4DAqDC;AA5SD,4CAA8B;AAE9B,4DAAwH;AAExH,iDAAoD;AACpD,yDAA0D;AAC1D,2DAA8F;AAC9F,iDAA8D;AAC9D,wDAAqG;AACrG,8DAA6D;AAC7D,qCAAkC;AAClC,2CAAkD;AAClD,yCAA0C;AAE1C,8DAA8D;AAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAwB,CAAC;AA2CjE,SAAS,WAAW,CAAC,OAAsB;IACzC,OAAO,IAAA,mCAAiB,EAAC,OAAO,CAAC,OAAO,EAAE;QACxC,kBAAkB,EAAE,OAAO,CAAC,OAAO,KAAK,gBAAgB;YACtD,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,yBAAgB,EAAC,6BAA6B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;YAC9F,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC;AAC5C,CAAC;AAEY,QAAA,oBAAoB,GAAkB;IACjD,iBAAiB,EAAjB,gCAAiB;IACjB,cAAc,EAAE,WAAW;IAC3B,cAAc,EAAE,oCAAqB;IACrC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,iCAAe,CAAC,SAAS,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC;IACjD,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IAC3C,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;CACtC,CAAC;AAEF,SAAS,KAAK,CAAC,IAAwB;IACrC,MAAM,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED,SAAS,WAAW,CAAC,IAAmB;IACtC,MAAM,QAAQ,GAAG,IAAA,2BAAe,GAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAA,+BAAgB,GAAE,CAAC,SAAS,EAAE,CAAC;IAElF,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,4EAA4E,EAAE,CAAC;IACnI,CAAC;IACD,IAAI,KAAoB,CAAC;IACzB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,uFAAuF,EAAE,CAAC;IAC9I,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,sFAAsF,EAAE,CAAC;IAC7I,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;AACjF,CAAC;AAED,SAAS,UAAU,CAAC,IAA2B;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC5G,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,SAAS,CAAC,YAAqB;IACtC,OAAO,YAAY,KAAK,IAAI,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,IAAI,YAAY,CAAC;AAC3F,CAAC;AAED,MAAM,iBAAiB,GAAqC;IAC1D,aAAa,EAAE,4DAA4D;IAC3E,iBAAiB,EAAE,qFAAqF;IACxG,mBAAmB,EAAE,gFAAgF;IACrG,cAAc,EAAE,mEAAmE;IACnF,yBAAyB,EAAE,8EAA8E;IACzG,qBAAqB,EAAE,mEAAmE;IAC1F,0BAA0B,EAAE,2DAA2D;IACvF,sBAAsB,EAAE,2GAA2G;IACnI,wBAAwB,EAAE,gDAAgD;CAC3E,CAAC;AAEF,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,uBAAuB;IACvB,wBAAwB;IACxB,2BAA2B;IAC3B,0BAA0B;CAC3B,CAAC,CAAC;AAEH,sFAAsF;AACtF,SAAgB,gBAAgB,CAAI,OAAyB;IAC3D,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gBAAgB;YACnB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB;gBAChF,UAAU,EAAE,OAAO,CAAC,IAAI;gBACxB,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,mCAAmC,OAAO,CAAC,IAAI,GAAG;aAC/F,CAAC;QACJ,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,wFAAwF,EAAE,CAAC;QAChJ,KAAK,WAAW;YACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,2GAA2G,EAAE,CAAC;QAChK,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,kDAAkD,EAAE,CAAC;QAC1G,KAAK,aAAa;YAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,gFAAgF,EAAE,CAAC;QACvI,KAAK,SAAS;YACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,qCAAqC,EAAE,CAAC;IAC9F,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAa,EAAE,SAAiB;IAC7D,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAK,IAAiC,CAAC,UAAU,KAAK,SAAS,CAAC;AAClH,CAAC;AAED;;;GAGG;AACH,SAAgB,eAAe,CAAC,IAA2B,EAAE,IAAkE;IAC7H,MAAM,MAAM,GAAG,IAAA,uBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;AAC9F,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,IAA2B,EAC3B,SAAiB,EACjB,OAAsB,4BAAoB;IAE1C,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,IAAI,SAAS,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,SAAS,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,SAAS,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAC3D,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,EAChC,KAAK,EACL,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,OAAO,EAAE,CAC1F,CAAC;IACF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;QACpD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,sFAAsF,EAAE,CAAC;IAC7I,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC,IAA0C,CAAC;QACxG,IAAA,mCAAwB,EAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,2EAA2E,EAAE,CAAC;IAClI,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;AAC1F,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,IAA2B,EAC3B,IAAmB,EACnB,IAAiI,EACjI,YAAuC;IAEvC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,SAAS,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,SAAS,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3E,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACjE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;AACtF,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAA2B,EAAE,OAAsB,4BAAoB;IACxG,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAC5H,CAAC;AAED,SAAgB,iBAAiB,CAAC,IAA2B,EAAE,OAAsB,4BAAoB;IACvG,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACrI,CAAC;AAED,SAAgB,mBAAmB,CAAC,IAA2B,EAAE,OAAsB,4BAAoB;IACzG,OAAO,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACvI,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAsB;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAa;IACxC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,OAAQ,GAAG,CAAC,eAAe,EAAE,EAA0B,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAChG,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,OAAO,OAAO;SACX,MAAM,CAAC,iBAAiB,EAAE,wEAAwE,CAAC;SACnG,MAAM,CAAC,YAAY,EAAE,0EAA0E,CAAC,CAAC;AACtG,CAAC;AAED,SAAS,IAAI,CAAC,OAAsB,EAAE,OAAuB;IAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC;AAED,SAAgB,wBAAwB,CAAC,OAAgB;IACvD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,uDAAuD,CAAC,CAAC;IAEpH,oBAAoB,CAClB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;SACvB,WAAW,CAAC,gIAAgI,CAAC;SAC7I,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,cAAc,CAAC,eAAe,EAAE,2CAA2C,CAAC;SAC5E,cAAc,CAAC,aAAa,EAAE,2CAA2C,CAAC;SAC1E,MAAM,CAAC,aAAa,EAAE,oDAAoD,CAAC;SAC3E,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAA2B,EAAE,GAAY,EAAE,EAAE;QAC1D,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC/C,SAAG,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;QAC3H,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CACL,CAAC;IAEF,oBAAoB,CAClB,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;SACxB,WAAW,CAAC,2DAA2D,CAAC;SACxE,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,IAA2B,EAAE,GAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAC3I,CAAC;IAEF,oBAAoB,CAClB,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC;SAC/B,WAAW,CAAC,iEAAiE,CAAC;SAC9E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAA2B,EAAE,GAAY,EAAE,EAAE;QACzE,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC;QAC1I,IAAI,CAAC,OAAO,EAAE,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CACL,CAAC;IAEF,oBAAoB,CAClB,SAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACjC,WAAW,CAAC,gEAAgE,CAAC;SAC7E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAA2B,EAAE,GAAY,EAAE,EAAE;QACzE,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC;QAC1I,IAAI,CAAC,OAAO,EAAE,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}
|