wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c
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/README.md +10 -4
- package/bin/wrangler.js +10 -2
- package/miniflare-dist/index.mjs +257 -132
- package/package.json +26 -19
- package/src/__tests__/api-dev.test.ts +65 -36
- package/src/__tests__/api-devregistry.test.ts +121 -0
- package/src/__tests__/api.test.ts +27 -5
- package/src/__tests__/configuration.test.ts +575 -39
- package/src/__tests__/constellation.test.ts +371 -0
- package/src/__tests__/d1/d1.test.ts +82 -0
- package/src/__tests__/d1/execute.test.ts +66 -0
- package/src/__tests__/d1/migrate.test.ts +257 -0
- package/src/__tests__/d1/splitter.test.ts +255 -0
- package/src/__tests__/delete.test.ts +11 -2
- package/src/__tests__/deployments.test.ts +330 -52
- package/src/__tests__/dev.test.tsx +146 -82
- package/src/__tests__/generate.test.ts +10 -8
- package/src/__tests__/guess-worker-format.test.ts +35 -0
- package/src/__tests__/helpers/end-event-loop.ts +6 -0
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-console.ts +6 -0
- package/src/__tests__/helpers/mock-dialogs.ts +71 -85
- package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -5
- package/src/__tests__/helpers/mock-known-routes.ts +7 -2
- package/src/__tests__/helpers/mock-kv.ts +29 -16
- package/src/__tests__/helpers/mock-oauth-flow.ts +99 -92
- package/src/__tests__/helpers/mock-process.ts +8 -13
- package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
- package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +127 -26
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +18 -41
- package/src/__tests__/helpers/msw/handlers/r2.ts +14 -34
- package/src/__tests__/helpers/msw/handlers/script.ts +9 -28
- package/src/__tests__/helpers/msw/handlers/user.ts +13 -24
- package/src/__tests__/helpers/msw/handlers/zones.ts +6 -8
- package/src/__tests__/helpers/msw/index.ts +32 -1
- package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
- package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +4 -1
- package/src/__tests__/index.test.ts +92 -74
- package/src/__tests__/init.test.ts +909 -628
- package/src/__tests__/jest.setup.ts +19 -42
- package/src/__tests__/kv.test.ts +355 -231
- package/src/__tests__/logger.test.ts +68 -2
- package/src/__tests__/logout.test.ts +1 -1
- package/src/__tests__/metrics.test.ts +93 -50
- package/src/__tests__/middleware.scheduled.test.ts +42 -32
- package/src/__tests__/middleware.test.ts +212 -122
- package/src/__tests__/mtls-certificates.test.ts +589 -0
- package/src/__tests__/pages/deployment-list.test.ts +80 -0
- package/src/__tests__/pages/functions-build.test.ts +528 -0
- package/src/__tests__/pages/pages.test.ts +81 -0
- package/src/__tests__/pages/project-create.test.ts +63 -0
- package/src/__tests__/pages/project-list.test.ts +110 -0
- package/src/__tests__/pages/project-upload.test.ts +500 -0
- package/src/__tests__/pages/publish.test.ts +2864 -0
- package/src/__tests__/pages-deployment-tail.test.ts +239 -102
- package/src/__tests__/parse.test.ts +106 -0
- package/src/__tests__/publish.test.ts +2218 -1002
- package/src/__tests__/pubsub.test.ts +226 -100
- package/src/__tests__/queues.test.ts +42 -32
- package/src/__tests__/r2.test.ts +37 -56
- package/src/__tests__/secret.test.ts +179 -130
- package/src/__tests__/tail.test.ts +113 -23
- package/src/__tests__/test-old-node-version.js +3 -3
- package/src/__tests__/traverse-module-graph.test.ts +220 -0
- package/src/__tests__/tsconfig-sanity.ts +12 -0
- package/src/__tests__/tsconfig.json +8 -0
- package/src/__tests__/tsconfig.tsbuildinfo +1 -0
- package/src/__tests__/type-generation.test.ts +8 -0
- package/src/__tests__/user.test.ts +7 -18
- package/src/__tests__/whoami.test.tsx +8 -114
- package/src/__tests__/worker-namespace.test.ts +83 -69
- package/src/api/dev.ts +172 -61
- package/src/api/index.ts +10 -1
- package/src/api/mtls-certificate.ts +148 -0
- package/src/api/pages/create-worker-bundle-contents.ts +77 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +371 -0
- package/src/bundle.ts +139 -33
- package/src/cfetch/index.ts +0 -2
- package/src/cfetch/internal.ts +16 -21
- package/src/cli.ts +4 -4
- package/src/config/config.ts +14 -7
- package/src/config/environment.ts +80 -16
- package/src/config/index.ts +99 -30
- package/src/config/validation-helpers.ts +1 -1
- package/src/config/validation.ts +275 -9
- package/src/constellation/createProject.tsx +51 -0
- package/src/constellation/deleteProject.ts +51 -0
- package/src/constellation/deleteProjectModel.ts +68 -0
- package/src/constellation/index.ts +75 -0
- package/src/constellation/listCatalog.tsx +35 -0
- package/src/constellation/listModel.tsx +41 -0
- package/src/constellation/listProject.tsx +28 -0
- package/src/constellation/listRuntime.tsx +28 -0
- package/src/constellation/options.ts +17 -0
- package/src/constellation/types.ts +17 -0
- package/src/constellation/uploadModel.tsx +64 -0
- package/src/constellation/utils.ts +90 -0
- package/src/create-worker-preview.ts +19 -8
- package/src/create-worker-upload-form.ts +52 -5
- package/src/d1/backups.tsx +40 -44
- package/src/d1/create.tsx +50 -43
- package/src/d1/{delete.tsx → delete.ts} +8 -11
- package/src/d1/execute.tsx +171 -166
- package/src/d1/index.ts +5 -6
- package/src/d1/list.tsx +27 -13
- package/src/d1/migrations/apply.tsx +92 -64
- package/src/d1/migrations/create.tsx +31 -29
- package/src/d1/migrations/helpers.ts +66 -44
- package/src/d1/migrations/list.tsx +47 -31
- package/src/d1/migrations/options.ts +7 -2
- package/src/d1/options.ts +3 -3
- package/src/d1/splitter.ts +161 -0
- package/src/d1/{types.tsx → types.ts} +1 -0
- package/src/d1/utils.ts +2 -1
- package/src/delete.ts +8 -16
- package/src/deployments.ts +333 -42
- package/src/deprecated/index.ts +8 -302
- package/src/dev/dev.tsx +13 -22
- package/src/dev/local.tsx +131 -69
- package/src/dev/remote.tsx +35 -3
- package/src/dev/start-server.ts +83 -77
- package/src/dev/use-esbuild.ts +63 -52
- package/src/dev/validate-dev-props.ts +9 -0
- package/src/{dev-registry.tsx → dev-registry.ts} +9 -8
- package/src/dev.tsx +131 -110
- package/src/dialogs.ts +136 -0
- package/src/dispatch-namespace.ts +21 -17
- package/src/docs/helpers.ts +50 -0
- package/src/docs/index.ts +54 -0
- package/src/entry.ts +26 -11
- package/src/environment-variables/factory.ts +89 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/generate/index.ts +298 -0
- package/src/{index.tsx → index.ts} +137 -56
- package/src/init.ts +254 -187
- package/src/inspect.ts +170 -9
- package/src/jest.d.ts +4 -0
- package/src/kv/helpers.ts +7 -4
- package/src/kv/index.ts +15 -17
- package/src/logger.ts +36 -5
- package/src/metrics/metrics-config.ts +1 -1
- package/src/metrics/send-event.ts +4 -1
- package/src/miniflare-cli/assets.ts +66 -31
- package/src/miniflare-cli/index.ts +5 -8
- package/src/miniflare-cli/tsconfig.json +9 -0
- package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
- package/src/miniflare-cli/types.ts +11 -0
- package/src/module-collection.ts +92 -26
- package/src/mtls-certificate/cli.ts +155 -0
- package/src/pages/build.ts +423 -0
- package/src/pages/buildFunctions.ts +140 -0
- package/src/pages/{deployment-tails.tsx → deployment-tails.ts} +7 -10
- package/src/pages/deployments.tsx +9 -9
- package/src/pages/{dev.tsx → dev.ts} +167 -139
- package/src/pages/errors.ts +1 -0
- package/src/pages/functions/buildPlugin.ts +61 -54
- package/src/pages/functions/buildWorker.ts +217 -33
- package/src/pages/functions/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/{functions.tsx → functions.ts} +8 -4
- package/src/pages/{index.tsx → index.ts} +3 -3
- package/src/pages/projects.tsx +12 -22
- package/src/pages/publish.tsx +43 -227
- package/src/pages/types.ts +5 -0
- package/src/pages/upload.tsx +57 -14
- package/src/pages/utils.ts +1 -1
- package/src/parse.ts +23 -1
- package/src/paths.ts +1 -1
- package/src/publish/index.ts +20 -16
- package/src/publish/publish.ts +76 -46
- package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts} +19 -20
- package/src/queues/cli/commands/consumer/add.ts +24 -24
- package/src/queues/cli/commands/consumer/index.ts +3 -6
- package/src/queues/cli/commands/consumer/remove.ts +11 -18
- package/src/queues/cli/commands/create.ts +8 -8
- package/src/queues/cli/commands/delete.ts +8 -8
- package/src/queues/cli/commands/index.ts +3 -4
- package/src/queues/cli/commands/list.ts +8 -8
- package/src/queues/client.ts +1 -0
- package/src/r2/helpers.ts +1 -0
- package/src/r2/index.ts +28 -28
- package/src/secret/index.ts +15 -16
- package/src/{sites.tsx → sites.ts} +165 -53
- package/src/tail/createTail.ts +37 -1
- package/src/tail/filters.ts +1 -1
- package/src/tail/index.ts +8 -11
- package/src/tail/printing.ts +25 -0
- package/src/traverse-module-graph.ts +54 -0
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +11 -3
- package/src/user/access.ts +0 -1
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +1 -31
- package/src/user/index.ts +0 -1
- package/src/user/{user.tsx → user.ts} +114 -77
- package/src/utils/render.ts +93 -0
- package/src/{whoami.tsx → whoami.ts} +37 -71
- package/src/worker.ts +35 -1
- package/src/yargs-types.ts +18 -5
- package/templates/__tests__/tsconfig-sanity.ts +12 -0
- package/templates/__tests__/tsconfig.json +8 -0
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
- package/templates/checked-fetch.js +9 -3
- package/templates/d1-beta-facade.js +42 -3
- package/templates/facade.d.ts +14 -0
- package/templates/first-party-worker-module-facade.ts +4 -3
- package/templates/format-dev-errors.ts +8 -6
- package/templates/gitignore +1 -0
- package/templates/init-tests/test-jest-new-worker.js +3 -5
- package/templates/init-tests/test-vitest-new-worker.js +3 -5
- package/templates/init-tests/test-vitest-new-worker.ts +25 -0
- package/templates/middleware/loader-modules.ts +2 -2
- package/templates/middleware/loader-sw.ts +6 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
- package/templates/new-worker.ts +3 -0
- package/templates/pages-dev-pipeline.ts +4 -1
- package/templates/pages-shim.ts +4 -1
- package/templates/pages-template-plugin.ts +19 -10
- package/templates/serve-static-assets.ts +17 -14
- package/templates/service-bindings-module-facade.js +1 -0
- package/templates/tsconfig-sanity.ts +11 -0
- package/templates/tsconfig.init.json +105 -0
- package/templates/tsconfig.json +5 -103
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +871 -73
- package/wrangler-dist/cli.js +80512 -90686
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/src/__tests__/api-devregistry.test.js +0 -56
- package/src/__tests__/d1.test.ts +0 -80
- package/src/__tests__/dialogs.test.tsx +0 -40
- package/src/__tests__/helpers/mock-cfetch.ts +0 -333
- package/src/__tests__/pages.test.ts +0 -2442
- package/src/dialogs.tsx +0 -168
- package/src/environment-variables.ts +0 -50
- package/src/pages/build.tsx +0 -270
- package/src/user/env-vars.ts +0 -46
- /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
- /package/src/d1/migrations/{index.tsx → index.ts} +0 -0
- /package/src/dev/{get-local-persistence-path.tsx → get-local-persistence-path.ts} +0 -0
- /package/src/pages/{hash.tsx → hash.ts} +0 -0
|
@@ -214,28 +214,61 @@ import url from "node:url";
|
|
|
214
214
|
import { TextEncoder } from "node:util";
|
|
215
215
|
import TOML from "@iarna/toml";
|
|
216
216
|
import { HostURL } from "@webcontainer/env";
|
|
217
|
-
import { render } from "ink";
|
|
218
|
-
import Table from "ink-table";
|
|
219
|
-
import React from "react";
|
|
220
217
|
import { fetch } from "undici";
|
|
221
218
|
import {
|
|
222
219
|
getConfigCache,
|
|
223
220
|
purgeConfigCaches,
|
|
224
221
|
saveToConfigCache,
|
|
225
222
|
} from "../config-cache";
|
|
223
|
+
import { NoDefaultValueProvided, select } from "../dialogs";
|
|
226
224
|
import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
|
|
227
225
|
import { CI } from "../is-ci";
|
|
228
226
|
import isInteractive from "../is-interactive";
|
|
229
227
|
import { logger } from "../logger";
|
|
230
228
|
import openInBrowser from "../open-in-browser";
|
|
231
229
|
import { parseTOML, readFileSync } from "../parse";
|
|
232
|
-
import {
|
|
233
|
-
import {
|
|
230
|
+
import { domainUsesAccess } from "./access";
|
|
231
|
+
import {
|
|
232
|
+
getAuthDomainFromEnv,
|
|
233
|
+
getAuthUrlFromEnv,
|
|
234
|
+
getClientIdFromEnv,
|
|
235
|
+
getCloudflareAccessToken,
|
|
236
|
+
getCloudflareAPITokenFromEnv,
|
|
237
|
+
getCloudflareGlobalAuthEmailFromEnv,
|
|
238
|
+
getCloudflareGlobalAuthKeyFromEnv,
|
|
239
|
+
getRevokeUrlFromEnv,
|
|
240
|
+
getTokenUrlFromEnv,
|
|
241
|
+
} from "./auth-variables";
|
|
242
|
+
import { getAccountChoices } from "./choose-account";
|
|
234
243
|
import { generateAuthUrl } from "./generate-auth-url";
|
|
235
244
|
import { generateRandomState } from "./generate-random-state";
|
|
236
|
-
import type {
|
|
245
|
+
import type { ChooseAccountItem } from "./choose-account";
|
|
237
246
|
import type { ParsedUrlQuery } from "node:querystring";
|
|
238
247
|
|
|
248
|
+
export type ApiCredentials =
|
|
249
|
+
| {
|
|
250
|
+
apiToken: string;
|
|
251
|
+
}
|
|
252
|
+
| {
|
|
253
|
+
authKey: string;
|
|
254
|
+
authEmail: string;
|
|
255
|
+
};
|
|
256
|
+
|
|
257
|
+
/**
|
|
258
|
+
* Try to read an API token or Global Auth from the environment.
|
|
259
|
+
*/
|
|
260
|
+
export function getAuthFromEnv(): ApiCredentials | undefined {
|
|
261
|
+
const globalApiKey = getCloudflareGlobalAuthKeyFromEnv();
|
|
262
|
+
const globalApiEmail = getCloudflareGlobalAuthEmailFromEnv();
|
|
263
|
+
const apiToken = getCloudflareAPITokenFromEnv();
|
|
264
|
+
|
|
265
|
+
if (globalApiKey && globalApiEmail) {
|
|
266
|
+
return { authKey: globalApiKey, authEmail: globalApiEmail };
|
|
267
|
+
} else if (apiToken) {
|
|
268
|
+
return { apiToken };
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
|
|
239
272
|
/**
|
|
240
273
|
* An implementation of rfc6749#section-4.1 and rfc7636.
|
|
241
274
|
*/
|
|
@@ -264,7 +297,7 @@ interface AuthTokens {
|
|
|
264
297
|
accessToken?: AccessToken;
|
|
265
298
|
refreshToken?: RefreshToken;
|
|
266
299
|
scopes?: Scope[];
|
|
267
|
-
/** @deprecated - this field was only provided by the deprecated `
|
|
300
|
+
/** @deprecated - this field was only provided by the deprecated v1 `wrangler config` command. */
|
|
268
301
|
apiToken?: string;
|
|
269
302
|
}
|
|
270
303
|
|
|
@@ -282,7 +315,7 @@ export interface UserAuthConfig {
|
|
|
282
315
|
refresh_token?: string;
|
|
283
316
|
expiration_time?: string;
|
|
284
317
|
scopes?: string[];
|
|
285
|
-
/** @deprecated - this field was only provided by the deprecated `
|
|
318
|
+
/** @deprecated - this field was only provided by the deprecated v1 `wrangler config` command. */
|
|
286
319
|
api_token?: string;
|
|
287
320
|
}
|
|
288
321
|
|
|
@@ -313,6 +346,8 @@ const Scopes = {
|
|
|
313
346
|
"pages:write":
|
|
314
347
|
"See and change Cloudflare Pages projects, settings and deployments.",
|
|
315
348
|
"zone:read": "Grants read level access to account zone.",
|
|
349
|
+
"ssl_certs:write": "See and manage mTLS certificates for your account",
|
|
350
|
+
"constellation:write": "Manage Constellation AI projects/models",
|
|
316
351
|
} as const;
|
|
317
352
|
|
|
318
353
|
/**
|
|
@@ -330,11 +365,6 @@ export function validateScopeKeys(
|
|
|
330
365
|
return scopes.every((scope) => scope in Scopes);
|
|
331
366
|
}
|
|
332
367
|
|
|
333
|
-
const CLIENT_ID = "54d11594-84e4-41aa-b438-e81b8fa78ee7";
|
|
334
|
-
const AUTH_URL = "https://dash.cloudflare.com/oauth2/auth";
|
|
335
|
-
const TOKEN_URL = "https://dash.cloudflare.com/oauth2/token";
|
|
336
|
-
const REVOKE_URL = "https://dash.cloudflare.com/oauth2/revoke";
|
|
337
|
-
|
|
338
368
|
/**
|
|
339
369
|
* To allow OAuth callbacks in environments such as WebContainer we need to
|
|
340
370
|
* create a host URL which only resolves `localhost` to a WebContainer
|
|
@@ -374,7 +404,7 @@ function getAuthTokens(config?: UserAuthConfig): AuthTokens | undefined {
|
|
|
374
404
|
};
|
|
375
405
|
} else if (api_token) {
|
|
376
406
|
logger.warn(
|
|
377
|
-
"It looks like you have used Wrangler
|
|
407
|
+
"It looks like you have used Wrangler v1's `config` command to login with an API token.\n" +
|
|
378
408
|
"This is no longer supported in the current version of Wrangler.\n" +
|
|
379
409
|
"If you wish to authenticate via an API token then please set the `CLOUDFLARE_API_TOKEN` environment variable."
|
|
380
410
|
);
|
|
@@ -386,7 +416,7 @@ function getAuthTokens(config?: UserAuthConfig): AuthTokens | undefined {
|
|
|
386
416
|
}
|
|
387
417
|
|
|
388
418
|
/**
|
|
389
|
-
* Run the
|
|
419
|
+
* Run the initialization of the auth state, in the case that something changed.
|
|
390
420
|
*
|
|
391
421
|
* This runs automatically whenever `writeAuthConfigFile` is run, so generally
|
|
392
422
|
* you won't need to call it yourself.
|
|
@@ -625,8 +655,8 @@ export async function getAuthURL(scopes = ScopeKeys): Promise<string> {
|
|
|
625
655
|
});
|
|
626
656
|
|
|
627
657
|
return generateAuthUrl({
|
|
628
|
-
authUrl:
|
|
629
|
-
clientId:
|
|
658
|
+
authUrl: getAuthUrlFromEnv(),
|
|
659
|
+
clientId: getClientIdFromEnv(),
|
|
630
660
|
callbackUrl: CALLBACK_URL,
|
|
631
661
|
scopes,
|
|
632
662
|
stateQueryParam,
|
|
@@ -653,19 +683,14 @@ async function exchangeRefreshTokenForAccessToken(): Promise<AccessContext> {
|
|
|
653
683
|
logger.warn("No refresh token is present.");
|
|
654
684
|
}
|
|
655
685
|
|
|
656
|
-
const
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
const response = await fetch(TOKEN_URL, {
|
|
662
|
-
method: "POST",
|
|
663
|
-
body,
|
|
664
|
-
headers: {
|
|
665
|
-
"Content-Type": "application/x-www-form-urlencoded",
|
|
666
|
-
},
|
|
686
|
+
const params = new URLSearchParams({
|
|
687
|
+
grant_type: "refresh_token",
|
|
688
|
+
refresh_token: LocalState.refreshToken?.value ?? "",
|
|
689
|
+
client_id: getClientIdFromEnv(),
|
|
667
690
|
});
|
|
668
691
|
|
|
692
|
+
const response = await fetchAuthToken(params);
|
|
693
|
+
|
|
669
694
|
if (response.status >= 400) {
|
|
670
695
|
let tokenExchangeResErr = undefined;
|
|
671
696
|
|
|
@@ -743,20 +768,15 @@ async function exchangeAuthCodeForAccessToken(): Promise<AccessContext> {
|
|
|
743
768
|
logger.warn("No authorization grant code is being passed.");
|
|
744
769
|
}
|
|
745
770
|
|
|
746
|
-
const
|
|
747
|
-
`
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
const response = await fetch(TOKEN_URL, {
|
|
754
|
-
method: "POST",
|
|
755
|
-
body,
|
|
756
|
-
headers: {
|
|
757
|
-
"Content-Type": "application/x-www-form-urlencoded",
|
|
758
|
-
},
|
|
771
|
+
const params = new URLSearchParams({
|
|
772
|
+
grant_type: `authorization_code`,
|
|
773
|
+
code: authorizationCode ?? "",
|
|
774
|
+
redirect_uri: CALLBACK_URL,
|
|
775
|
+
client_id: getClientIdFromEnv(),
|
|
776
|
+
code_verifier: codeVerifier,
|
|
759
777
|
});
|
|
778
|
+
|
|
779
|
+
const response = await fetchAuthToken(params);
|
|
760
780
|
if (!response.ok) {
|
|
761
781
|
const { error } = (await response.json()) as { error: string };
|
|
762
782
|
// .catch((_) => ({ error: "invalid_json" }));
|
|
@@ -933,6 +953,7 @@ export async function login(
|
|
|
933
953
|
|
|
934
954
|
assert(req.url, "This request doesn't have a URL"); // This should never happen
|
|
935
955
|
const { pathname, query } = url.parse(req.url, true);
|
|
956
|
+
if (req.method !== "GET") return res.end("OK");
|
|
936
957
|
switch (pathname) {
|
|
937
958
|
case "/oauth/callback": {
|
|
938
959
|
let hasAuthCode = false;
|
|
@@ -1038,11 +1059,11 @@ export async function logout(): Promise<void> {
|
|
|
1038
1059
|
}
|
|
1039
1060
|
|
|
1040
1061
|
const body =
|
|
1041
|
-
`client_id=${encodeURIComponent(
|
|
1062
|
+
`client_id=${encodeURIComponent(getClientIdFromEnv())}&` +
|
|
1042
1063
|
`token_type_hint=refresh_token&` +
|
|
1043
1064
|
`token=${encodeURIComponent(LocalState.refreshToken?.value || "")}`;
|
|
1044
1065
|
|
|
1045
|
-
const response = await fetch(
|
|
1066
|
+
const response = await fetch(getRevokeUrlFromEnv(), {
|
|
1046
1067
|
method: "POST",
|
|
1047
1068
|
body,
|
|
1048
1069
|
headers: {
|
|
@@ -1055,11 +1076,11 @@ export async function logout(): Promise<void> {
|
|
|
1055
1076
|
);
|
|
1056
1077
|
}
|
|
1057
1078
|
const body =
|
|
1058
|
-
`client_id=${encodeURIComponent(
|
|
1079
|
+
`client_id=${encodeURIComponent(getClientIdFromEnv())}&` +
|
|
1059
1080
|
`token_type_hint=refresh_token&` +
|
|
1060
1081
|
`token=${encodeURIComponent(LocalState.refreshToken?.value || "")}`;
|
|
1061
1082
|
|
|
1062
|
-
const response = await fetch(
|
|
1083
|
+
const response = await fetch(getRevokeUrlFromEnv(), {
|
|
1063
1084
|
method: "POST",
|
|
1064
1085
|
body,
|
|
1065
1086
|
headers: {
|
|
@@ -1077,8 +1098,7 @@ export function listScopes(message = "💁 Available scopes:"): void {
|
|
|
1077
1098
|
Scope: scope,
|
|
1078
1099
|
Description: Scopes[scope],
|
|
1079
1100
|
}));
|
|
1080
|
-
|
|
1081
|
-
unmount();
|
|
1101
|
+
logger.table(data);
|
|
1082
1102
|
// TODO: maybe a good idea to show usage here
|
|
1083
1103
|
}
|
|
1084
1104
|
|
|
@@ -1097,36 +1117,32 @@ export async function getAccountId(): Promise<string | undefined> {
|
|
|
1097
1117
|
return accounts[0].id;
|
|
1098
1118
|
}
|
|
1099
1119
|
|
|
1100
|
-
|
|
1101
|
-
const
|
|
1102
|
-
(
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
+
try {
|
|
1121
|
+
const accountID = await select("Select an account", {
|
|
1122
|
+
choices: accounts.map((account) => ({
|
|
1123
|
+
title: account.name,
|
|
1124
|
+
value: account.id,
|
|
1125
|
+
})),
|
|
1126
|
+
});
|
|
1127
|
+
const account = accounts.find(
|
|
1128
|
+
(a) => a.id === accountID
|
|
1129
|
+
) as ChooseAccountItem;
|
|
1130
|
+
saveAccountToCache({ id: account.id, name: account.name });
|
|
1131
|
+
return accountID;
|
|
1132
|
+
} catch (e) {
|
|
1133
|
+
// Did we try to select an account in CI or a non-interactive terminal?
|
|
1134
|
+
if (e instanceof NoDefaultValueProvided) {
|
|
1135
|
+
throw new Error(
|
|
1136
|
+
`More than one account available but unable to select one in non-interactive mode.
|
|
1137
|
+
Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
|
|
1138
|
+
Available accounts are (\`<name>\`: \`<account_id>\`):
|
|
1139
|
+
${accounts
|
|
1140
|
+
.map((account) => ` \`${account.name}\`: \`${account.id}\``)
|
|
1141
|
+
.join("\n")}`
|
|
1142
|
+
);
|
|
1143
|
+
}
|
|
1144
|
+
throw e;
|
|
1120
1145
|
}
|
|
1121
|
-
|
|
1122
|
-
throw new Error(
|
|
1123
|
-
"More than one account available but unable to select one in non-interactive mode.\n" +
|
|
1124
|
-
`Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.\n` +
|
|
1125
|
-
`Available accounts are ("<name>" - "<id>"):\n` +
|
|
1126
|
-
accounts
|
|
1127
|
-
.map((account) => ` "${account.name}" - "${account.id}")`)
|
|
1128
|
-
.join("\n")
|
|
1129
|
-
);
|
|
1130
1146
|
}
|
|
1131
1147
|
|
|
1132
1148
|
/**
|
|
@@ -1139,7 +1155,7 @@ export async function requireAuth(config: {
|
|
|
1139
1155
|
if (!loggedIn) {
|
|
1140
1156
|
if (!isInteractive() || CI.isCI()) {
|
|
1141
1157
|
throw new Error(
|
|
1142
|
-
"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/
|
|
1158
|
+
"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."
|
|
1143
1159
|
);
|
|
1144
1160
|
} else {
|
|
1145
1161
|
// didn't login, let's just quit
|
|
@@ -1196,3 +1212,24 @@ export function getAccountFromCache():
|
|
|
1196
1212
|
export function getScopes(): Scope[] | undefined {
|
|
1197
1213
|
return LocalState.scopes;
|
|
1198
1214
|
}
|
|
1215
|
+
|
|
1216
|
+
/**
|
|
1217
|
+
* Make a request to the Cloudflare OAuth endpoint to get a token.
|
|
1218
|
+
*
|
|
1219
|
+
* Note that the `body` of the POST request is form-urlencoded so
|
|
1220
|
+
* can be represented by a URLSearchParams object.
|
|
1221
|
+
*/
|
|
1222
|
+
async function fetchAuthToken(body: URLSearchParams) {
|
|
1223
|
+
const headers: Record<string, string> = {
|
|
1224
|
+
"Content-Type": "application/x-www-form-urlencoded",
|
|
1225
|
+
};
|
|
1226
|
+
if (await domainUsesAccess(getAuthDomainFromEnv())) {
|
|
1227
|
+
// We are trying to access the staging API so we need an "access token".
|
|
1228
|
+
headers["Cookie"] = `CF_Authorization=${await getCloudflareAccessToken()}`;
|
|
1229
|
+
}
|
|
1230
|
+
return await fetch(getTokenUrlFromEnv(), {
|
|
1231
|
+
method: "POST",
|
|
1232
|
+
body: body.toString(),
|
|
1233
|
+
headers,
|
|
1234
|
+
});
|
|
1235
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { EventEmitter } from "events";
|
|
2
|
+
import { render as inkRender } from "ink";
|
|
3
|
+
import type { ReactElement } from "react";
|
|
4
|
+
import type { WriteStream } from "tty";
|
|
5
|
+
|
|
6
|
+
export function renderToString(tree: ReactElement): string {
|
|
7
|
+
const { output, cleanup } = render(tree);
|
|
8
|
+
cleanup();
|
|
9
|
+
return output;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
// The code below is mostly copied from ink-render-string.
|
|
13
|
+
// See https://github.com/zhanwang626/ink-render-string.git.
|
|
14
|
+
|
|
15
|
+
// MIT License
|
|
16
|
+
|
|
17
|
+
// Copyright (c) 2021 Zhan Wang
|
|
18
|
+
|
|
19
|
+
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
20
|
+
// of this software and associated documentation files (the "Software"), to deal
|
|
21
|
+
// in the Software without restriction, including without limitation the rights
|
|
22
|
+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
23
|
+
// copies of the Software, and to permit persons to whom the Software is
|
|
24
|
+
// furnished to do so, subject to the following conditions:
|
|
25
|
+
|
|
26
|
+
// The above copyright notice and this permission notice shall be included in all
|
|
27
|
+
// copies or substantial portions of the Software.
|
|
28
|
+
|
|
29
|
+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
30
|
+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
31
|
+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
32
|
+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
33
|
+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
34
|
+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
35
|
+
// SOFTWARE.
|
|
36
|
+
|
|
37
|
+
interface Instance {
|
|
38
|
+
output: string;
|
|
39
|
+
unmount: () => void;
|
|
40
|
+
cleanup: () => void;
|
|
41
|
+
stdout: OutputStream;
|
|
42
|
+
stderr: OutputStream;
|
|
43
|
+
frames: string[];
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const LASTFRAME_UNDEFINED = "value of stdout.lastframe() is undefined";
|
|
47
|
+
|
|
48
|
+
export class OutputStream extends EventEmitter {
|
|
49
|
+
readonly frames: string[] = [];
|
|
50
|
+
private _lastFrame?: string;
|
|
51
|
+
|
|
52
|
+
get columns(): number {
|
|
53
|
+
return this._originalStream.columns;
|
|
54
|
+
}
|
|
55
|
+
get rows(): number {
|
|
56
|
+
return this._originalStream.rows;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
constructor(private _originalStream: WriteStream) {
|
|
60
|
+
super();
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
write = (frame: string) => {
|
|
64
|
+
this.frames.push(frame);
|
|
65
|
+
this._lastFrame = frame;
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
lastFrame = () => {
|
|
69
|
+
return this._lastFrame;
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export const render = (tree: ReactElement): Instance => {
|
|
74
|
+
const stdout = new OutputStream(process.stdout);
|
|
75
|
+
const stderr = new OutputStream(process.stderr);
|
|
76
|
+
|
|
77
|
+
const instance = inkRender(tree, {
|
|
78
|
+
stdout: stdout as unknown as WriteStream,
|
|
79
|
+
stderr: stderr as unknown as WriteStream,
|
|
80
|
+
debug: true,
|
|
81
|
+
exitOnCtrlC: false,
|
|
82
|
+
patchConsole: false,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
return {
|
|
86
|
+
output: stdout.lastFrame() ?? LASTFRAME_UNDEFINED,
|
|
87
|
+
stdout,
|
|
88
|
+
stderr,
|
|
89
|
+
cleanup: instance.cleanup,
|
|
90
|
+
unmount: instance.unmount,
|
|
91
|
+
frames: stdout.frames,
|
|
92
|
+
};
|
|
93
|
+
};
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import Table from "ink-table";
|
|
3
|
-
import React, { Fragment } from "react";
|
|
1
|
+
import chalk from "chalk";
|
|
4
2
|
import { fetchListResult, fetchResult } from "./cfetch";
|
|
5
3
|
import { logger } from "./logger";
|
|
6
4
|
import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
|
|
@@ -8,82 +6,50 @@ import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
|
|
|
8
6
|
export async function whoami() {
|
|
9
7
|
logger.log("Getting User settings...");
|
|
10
8
|
const user = await getUserInfo();
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return user ? (
|
|
17
|
-
<>
|
|
18
|
-
<Email tokenType={user.authType} email={user.email}></Email>
|
|
19
|
-
<Accounts accounts={user.accounts}></Accounts>
|
|
20
|
-
<Permissions
|
|
21
|
-
tokenType={user.authType}
|
|
22
|
-
tokenPermissions={user.tokenPermissions}
|
|
23
|
-
/>
|
|
24
|
-
</>
|
|
25
|
-
) : (
|
|
26
|
-
<Text>You are not authenticated. Please run `wrangler login`.</Text>
|
|
27
|
-
);
|
|
28
|
-
}
|
|
9
|
+
if (user === undefined) {
|
|
10
|
+
return void logger.log(
|
|
11
|
+
"You are not authenticated. Please run `wrangler login`."
|
|
12
|
+
);
|
|
13
|
+
}
|
|
29
14
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
15
|
+
if (user.email !== undefined) {
|
|
16
|
+
logger.log(
|
|
17
|
+
`👋 You are logged in with an ${
|
|
18
|
+
user.authType
|
|
19
|
+
}, associated with the email ${chalk.blue(user.email)}!`
|
|
20
|
+
);
|
|
21
|
+
} else {
|
|
22
|
+
logger.log(
|
|
23
|
+
`👋 You are logged in with an ${user.authType}. Unable to retrieve email for this user. Are you missing the \`User->User Details->Read\` permission?`
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
logger.table(
|
|
27
|
+
user.accounts.map((account) => ({
|
|
28
|
+
"Account Name": account.name,
|
|
29
|
+
"Account ID": account.id,
|
|
30
|
+
}))
|
|
42
31
|
);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function Accounts(props: { accounts: AccountInfo[] }) {
|
|
46
|
-
const accounts = props.accounts.map((account) => ({
|
|
47
|
-
"Account Name": account.name,
|
|
48
|
-
"Account ID": account.id,
|
|
49
|
-
}));
|
|
50
|
-
return <Table data={accounts}></Table>;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
function Permissions(props: {
|
|
54
|
-
tokenPermissions: string[] | undefined;
|
|
55
|
-
tokenType: string;
|
|
56
|
-
}) {
|
|
57
32
|
const permissions =
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
{permissions.map(([scope, access], index) => (
|
|
68
|
-
<Fragment key={`${scope}${index}`}>
|
|
69
|
-
<Text>
|
|
70
|
-
- {scope} {access && `(${access})`}
|
|
71
|
-
</Text>
|
|
72
|
-
</Fragment>
|
|
73
|
-
))}
|
|
74
|
-
</>
|
|
75
|
-
) : null
|
|
76
|
-
) : (
|
|
77
|
-
<Text>
|
|
78
|
-
🔓 To see token permissions visit
|
|
79
|
-
https://dash.cloudflare.com/profile/api-tokens
|
|
80
|
-
</Text>
|
|
33
|
+
user.tokenPermissions?.map((scope) => scope.split(":")) ?? [];
|
|
34
|
+
|
|
35
|
+
if (user.authType !== "OAuth Token") {
|
|
36
|
+
return void logger.log(
|
|
37
|
+
`🔓 To see token permissions visit https://dash.cloudflare.com/profile/api-tokens`
|
|
38
|
+
);
|
|
39
|
+
}
|
|
40
|
+
logger.log(
|
|
41
|
+
`🔓 Token Permissions: If scopes are missing, you may need to logout and re-login.`
|
|
81
42
|
);
|
|
43
|
+
logger.log(`Scope (Access)`);
|
|
44
|
+
for (const [scope, access] of permissions) {
|
|
45
|
+
logger.log(`- ${scope} ${access ? `(${access})` : ``}`);
|
|
46
|
+
}
|
|
82
47
|
}
|
|
83
48
|
|
|
49
|
+
type AuthType = "Global API Key" | "API Token" | "OAuth Token";
|
|
84
50
|
export interface UserInfo {
|
|
85
51
|
apiToken: string;
|
|
86
|
-
authType:
|
|
52
|
+
authType: AuthType;
|
|
87
53
|
email: string | undefined;
|
|
88
54
|
accounts: AccountInfo[];
|
|
89
55
|
tokenPermissions: string[] | undefined;
|
package/src/worker.ts
CHANGED
|
@@ -79,6 +79,15 @@ export interface CfKvNamespace {
|
|
|
79
79
|
id: string;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
+
/**
|
|
83
|
+
* A binding to send email.
|
|
84
|
+
*/
|
|
85
|
+
export interface CfSendEmailBindings {
|
|
86
|
+
name: string;
|
|
87
|
+
destination_address?: string;
|
|
88
|
+
allowed_destination_addresses?: string[];
|
|
89
|
+
}
|
|
90
|
+
|
|
82
91
|
/**
|
|
83
92
|
* A binding to a wasm module (in service-worker format)
|
|
84
93
|
*/
|
|
@@ -144,11 +153,21 @@ interface CfService {
|
|
|
144
153
|
environment?: string;
|
|
145
154
|
}
|
|
146
155
|
|
|
156
|
+
interface CfAnalyticsEngineDataset {
|
|
157
|
+
binding: string;
|
|
158
|
+
dataset?: string;
|
|
159
|
+
}
|
|
160
|
+
|
|
147
161
|
interface CfDispatchNamespace {
|
|
148
162
|
binding: string;
|
|
149
163
|
namespace: string;
|
|
150
164
|
}
|
|
151
165
|
|
|
166
|
+
interface CfMTlsCertificate {
|
|
167
|
+
binding: string;
|
|
168
|
+
certificate_id: string;
|
|
169
|
+
}
|
|
170
|
+
|
|
152
171
|
interface CfLogfwdr {
|
|
153
172
|
schema: string | undefined;
|
|
154
173
|
bindings: CfLogfwdrBinding[];
|
|
@@ -164,6 +183,13 @@ interface CfUnsafeBinding {
|
|
|
164
183
|
type: string;
|
|
165
184
|
}
|
|
166
185
|
|
|
186
|
+
type CfUnsafeMetadata = Record<string, unknown>;
|
|
187
|
+
|
|
188
|
+
interface CfUnsafe {
|
|
189
|
+
bindings: CfUnsafeBinding[] | undefined;
|
|
190
|
+
metadata: CfUnsafeMetadata | undefined;
|
|
191
|
+
}
|
|
192
|
+
|
|
167
193
|
export interface CfDurableObjectMigrations {
|
|
168
194
|
old_tag?: string;
|
|
169
195
|
new_tag: string;
|
|
@@ -177,6 +203,10 @@ export interface CfDurableObjectMigrations {
|
|
|
177
203
|
}[];
|
|
178
204
|
}
|
|
179
205
|
|
|
206
|
+
export interface CfPlacement {
|
|
207
|
+
mode: "smart";
|
|
208
|
+
}
|
|
209
|
+
|
|
180
210
|
/**
|
|
181
211
|
* Options for creating a `CfWorker`.
|
|
182
212
|
*/
|
|
@@ -199,6 +229,7 @@ export interface CfWorkerInit {
|
|
|
199
229
|
bindings: {
|
|
200
230
|
vars: CfVars | undefined;
|
|
201
231
|
kv_namespaces: CfKvNamespace[] | undefined;
|
|
232
|
+
send_email: CfSendEmailBindings[] | undefined;
|
|
202
233
|
wasm_modules: CfWasmModuleBindings | undefined;
|
|
203
234
|
text_blobs: CfTextBlobBindings | undefined;
|
|
204
235
|
data_blobs: CfDataBlobBindings | undefined;
|
|
@@ -207,9 +238,11 @@ export interface CfWorkerInit {
|
|
|
207
238
|
r2_buckets: CfR2Bucket[] | undefined;
|
|
208
239
|
d1_databases: CfD1Database[] | undefined;
|
|
209
240
|
services: CfService[] | undefined;
|
|
241
|
+
analytics_engine_datasets: CfAnalyticsEngineDataset[] | undefined;
|
|
210
242
|
dispatch_namespaces: CfDispatchNamespace[] | undefined;
|
|
243
|
+
mtls_certificates: CfMTlsCertificate[] | undefined;
|
|
211
244
|
logfwdr: CfLogfwdr | undefined;
|
|
212
|
-
unsafe:
|
|
245
|
+
unsafe: CfUnsafe | undefined;
|
|
213
246
|
};
|
|
214
247
|
migrations: CfDurableObjectMigrations | undefined;
|
|
215
248
|
compatibility_date: string | undefined;
|
|
@@ -217,6 +250,7 @@ export interface CfWorkerInit {
|
|
|
217
250
|
usage_model: "bundled" | "unbound" | undefined;
|
|
218
251
|
keepVars: boolean | undefined;
|
|
219
252
|
logpush: boolean | undefined;
|
|
253
|
+
placement: CfPlacement | undefined;
|
|
220
254
|
}
|
|
221
255
|
|
|
222
256
|
export interface CfWorkerContext {
|
package/src/yargs-types.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { OnlyCamelCase } from "./config/config";
|
|
1
2
|
import type { ArgumentsCamelCase, Argv } from "yargs";
|
|
2
3
|
|
|
3
4
|
/**
|
|
@@ -7,18 +8,30 @@ export interface CommonYargsOptions {
|
|
|
7
8
|
v: boolean | undefined;
|
|
8
9
|
config: string | undefined;
|
|
9
10
|
env: string | undefined;
|
|
11
|
+
"experimental-json-config": boolean | undefined;
|
|
10
12
|
}
|
|
11
13
|
|
|
14
|
+
export type CommonYargsArgv = Argv<CommonYargsOptions>;
|
|
15
|
+
|
|
12
16
|
export type YargvToInterface<T> = T extends Argv<infer P>
|
|
13
17
|
? ArgumentsCamelCase<P>
|
|
14
18
|
: never;
|
|
15
19
|
|
|
20
|
+
// See http://stackoverflow.com/questions/51465182/how-to-remove-index-signature-using-mapped-types
|
|
21
|
+
type RemoveIndex<T> = {
|
|
22
|
+
[K in keyof T as string extends K
|
|
23
|
+
? never
|
|
24
|
+
: number extends K
|
|
25
|
+
? never
|
|
26
|
+
: K]: T[K];
|
|
27
|
+
};
|
|
28
|
+
|
|
16
29
|
/**
|
|
17
30
|
* Given some Yargs Options function factory, extract the interface
|
|
18
|
-
* that corresponds to the yargs arguments
|
|
31
|
+
* that corresponds to the yargs arguments, remove index types, and only allow camelCase
|
|
19
32
|
*/
|
|
20
|
-
export type
|
|
21
|
-
T extends (yargs:
|
|
22
|
-
> = T extends (yargs:
|
|
23
|
-
? ArgumentsCamelCase<P
|
|
33
|
+
export type StrictYargsOptionsToInterface<
|
|
34
|
+
T extends (yargs: CommonYargsArgv) => Argv
|
|
35
|
+
> = T extends (yargs: CommonYargsArgv) => Argv<infer P>
|
|
36
|
+
? OnlyCamelCase<RemoveIndex<ArgumentsCamelCase<P>>>
|
|
24
37
|
: never;
|