Skip to content

Commit

Permalink
fix: use ability to omit default and defaultHelp from manifest
Browse files Browse the repository at this point in the history 
@W-12513575@
@W-11868418@
  • Loading branch information
@peternhale
peternhale committed Mar 22, 2023
1 parent 03ef091 commit ad6be7c
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 61 deletions.
27 changes: 13 additions & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
"/messages"
],
"dependencies": {
"@oclif/core": "^2.4.0",
"@salesforce/core": "^3.34.1",
"@salesforce/kit": "^1.9.0",
"@oclif/core": "^2.7.0",
"@salesforce/core": "^3.34.4",
"@salesforce/kit": "^1.9.2",
"@salesforce/ts-types": "^1.7.3",
"chalk": "^4",
"inquirer": "^8.2.5"
},
"devDependencies": {
"@oclif/test": "^2.3.8",
"@salesforce/dev-config": "^3.0.0",
"@salesforce/dev-scripts": "^4.1.2",
"@oclif/test": "^2.3.11",
"@salesforce/dev-config": "^3.1.0",
"@salesforce/dev-scripts": "^4.1.3",
"@salesforce/prettier-config": "^0.0.2",
"@salesforce/ts-sinon": "^1.4.2",
"@salesforce/ts-sinon": "^1.4.6",
"@types/inquirer": "^8.2.3",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.47.0",
Expand Down Expand Up @@ -83,7 +83,7 @@
"command": "tsc -p . --pretty --incremental",
"files": [
"src/**/*.ts",
"tsconfig.json",
"**/tsconfig.json",
"messages/**"
],
"output": [
Expand All @@ -109,16 +109,16 @@
"src/**/*.ts",
"test/**/*.ts",
"messages/**",
".eslint*"
"**/.eslint*",
"**/tsconfig.json"
],
"output": []
},
"test:compile": {
"command": "tsc -p \"./test\" --pretty",
"files": [
"test/**/*.ts",
"tsconfig.json",
"test/tsconfig.json"
"**/tsconfig.json"
],
"output": []
},
Expand All @@ -136,13 +136,12 @@
"files": [
"test/**/*.ts",
"src/**/*.ts",
"tsconfig.json",
"**/tsconfig.json",
".mocha*",
"test/tsconfig.json",
"!*.nut.ts",
".nycrc"
],
"output": []
}
}
}
}
12 changes: 7 additions & 5 deletions src/flags/orgFlags.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/
import { Flags } from '@oclif/core';
import { Messages, Org, ConfigAggregator, OrgConfigProperties } from '@salesforce/core';
import { ConfigAggregator, Messages, Org, OrgConfigProperties } from '@salesforce/core';

Messages.importMessagesDirectory(__dirname);
const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
Expand Down Expand Up @@ -102,7 +102,7 @@ export const optionalOrgFlag = Flags.custom({
char: 'o',
parse: async (input: string | undefined) => maybeGetOrg(input),
default: async () => maybeGetOrg(),
defaultHelp: async () => (await maybeGetOrg())?.getUsername(),
defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetOrg())?.getUsername() : undefined),
});

/**
Expand Down Expand Up @@ -132,7 +132,8 @@ export const requiredOrgFlag = Flags.custom({
summary: messages.getMessage('flags.targetOrg.summary'),
parse: async (input: string | undefined) => getOrgOrThrow(input),
default: async () => getOrgOrThrow(),
defaultHelp: async () => (await getOrgOrThrow())?.getUsername(),
defaultHelp: async (_, isWritingManifest) =>
!isWritingManifest ? (await getOrgOrThrow())?.getUsername() : undefined,
required: true,
});

Expand Down Expand Up @@ -163,7 +164,8 @@ export const requiredHubFlag = Flags.custom({
summary: messages.getMessage('flags.targetDevHubOrg.summary'),
parse: async (input: string | undefined) => getHubOrThrow(input),
default: async () => getHubOrThrow(),
defaultHelp: async () => (await getHubOrThrow())?.getUsername(),
defaultHelp: async (_, isWritingManifest) =>
!isWritingManifest ? (await getHubOrThrow())?.getUsername() : undefined,
required: true,
});

Expand Down Expand Up @@ -193,6 +195,6 @@ export const optionalHubFlag = Flags.custom({
summary: messages.getMessage('flags.targetDevHubOrg.summary'),
parse: async (input: string | undefined) => maybeGetHub(input),
default: async () => maybeGetHub(),
defaultHelp: async () => (await maybeGetHub())?.getUsername(),
defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetHub())?.getUsername() : undefined),
required: false,
});
85 changes: 43 additions & 42 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,10 +675,10 @@
supports-color "^8.1.1"
tslib "^2"

"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.4.0":
version "2.4.0"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.4.0.tgz#8e5983dd0d50a3c0c170a844fe8925cb639f0a9f"
integrity sha512-wWUnOOfQQty0k1Cstm/iWW6pbG0mHzU7rcUtab2Sni9kjBPCcy6ENTgpsWbb/WdITopqtXmvpYII2fgcjKdzUA==
"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4", "@oclif/core@^2.7.0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.0.tgz#18223631f32d60589d528f3fd5f61832018e5f80"
integrity sha512-8+qll0gr+if7QxZ5PBxhSFDK67uR62lJvUHTnQ5p1lzapHO/ucwA5YIiSn6LtIsKnP7l0uDINegXb9z8lNM/OQ==
dependencies:
"@types/cli-progress" "^3.11.0"
ansi-escapes "^4.3.2"
Expand All @@ -704,6 +704,7 @@
strip-ansi "^6.0.1"
supports-color "^8.1.1"
supports-hyperlinks "^2.2.0"
ts-node "^10.9.1"
tslib "^2.5.0"
widest-line "^3.1.0"
wordwrap "^1.0.0"
Expand Down Expand Up @@ -739,13 +740,13 @@
lodash "^4.17.21"
semver "^7.3.8"

"@oclif/test@^2.3.8":
version "2.3.8"
resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.8.tgz#ad2fb6375cb9891ebc002258d090075b8621ed0e"
integrity sha512-usE2GeE2S+feOgf8uFLUUVDKt0N3orH+pc1bKkKQtCNAFDvdyAdAMcBS+1PnmCn+cSxaez0bCQ6xOpxA9s7x3A==
"@oclif/test@^2.3.11":
version "2.3.11"
resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.11.tgz#efb268b2313bfe89c0ceee08497cbca8fc8f7b3d"
integrity sha512-QZGhAla1+lfXGJfzB/7yMs1rtdjmHFuu9prBxuT6yHKXTIdi5vwqDZKKzlZzJhtNLe+37ub/Z7uk0zT7dXbhBA==
dependencies:
"@oclif/core" "^2.3.1"
fancy-test "^2.0.12"
"@oclif/core" "^2.6.4"
fancy-test "^2.0.13"

"@octokit/auth-token@^2.4.4":
version "2.5.0"
Expand Down Expand Up @@ -860,10 +861,10 @@
mv "~2"
safe-json-stringify "~1"

"@salesforce/core@^3.34.1":
version "3.34.1"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.1.tgz#dd52254cc63143ebad58d53bb80c00a76b303868"
integrity sha512-mhq7pBU3aTaXdBeheIfsBa3/TxHW0ccLhTZ4pMHawViO+tubXvcU7oa7yWCwI9sQP3S1ZsXwlUPWasbbBEXKHw==
"@salesforce/core@^3.34.4":
version "3.34.4"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.4.tgz#6fa11c32f14d20130a0c92c5d306f368671ec104"
integrity sha512-WasR/6IXKcNj3MgZIcVaT7W5Ic/blxOgpQIzob/7JEsnLVr3pPPb+9/axRvxEGdJr/gOnL1vR0NbBX+Mz6TtkQ==
dependencies:
"@salesforce/bunyan" "^2.0.0"
"@salesforce/kit" "^1.9.2"
Expand All @@ -877,21 +878,21 @@
debug "^3.2.7"
faye "^1.4.0"
form-data "^4.0.0"
graceful-fs "^4.2.9"
graceful-fs "^4.2.11"
js2xmlparser "^4.0.1"
jsforce "^2.0.0-beta.19"
jsforce "^2.0.0-beta.20"
jsonwebtoken "9.0.0"
ts-retry-promise "^0.7.0"

"@salesforce/dev-config@^3.0.0":
"@salesforce/dev-config@^3.0.0", "@salesforce/dev-config@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-3.1.0.tgz#8eb5b35860ff60d1c1dc3fd9329b01a28475d5b9"
integrity sha512-cPph7ibj3DeSzWDFLcLtxOh5fmUlDUY2Ezq43n0V6auVP+l8orxRHjCExHS86SB3QKVgXkC8yYhryXiS8KF7Zw==

"@salesforce/dev-scripts@^4.1.2":
version "4.1.2"
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.1.2.tgz#d9d4b403ac06934c069ca16d849ff7c2e12ee773"
integrity sha512-mxpwOb818k4H04DM/GV0/ZTzK5EDovcnROI+0CnR71Fqc4gwrWBmK+jlcRtICGypC48W+myOXKXet0oySQphyA==
"@salesforce/dev-scripts@^4.1.3":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.1.3.tgz#e6d561e13f148d9ae6eec80d0e2e24303011e03c"
integrity sha512-RDZTM1Im2P++zRWSiLSGY31E+SYkHk+18uikMigZZm0XQsZf04XjDz0JMXujewMWWFnObJM0gKrswcDK/O9qSg==
dependencies:
"@commitlint/cli" "^17.1.2"
"@commitlint/config-conventional" "^17.1.0"
Expand Down Expand Up @@ -928,7 +929,7 @@
typescript "^4.1.3"
wireit "^0.9.5"

"@salesforce/kit@^1.9.0", "@salesforce/kit@^1.9.2":
"@salesforce/kit@^1.9.2":
version "1.9.2"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.9.2.tgz#d232f135428363cdfe2649cb99a94bc2eb0a12fd"
integrity sha512-kjZvjFNP6njhAiEa/ErdLXSDWZKafHYJyKCKz1wnSFmDM8TOpKHCCVw5cQo87ZQr8OqxqwUDIAlSBLyMzKi4Lg==
Expand All @@ -947,14 +948,14 @@
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.0.tgz#8bfe2cb5d7cb29d3394b3b9cfb71bb527009c82c"
integrity sha512-EKFBURBuON7cj8XZCW+ybeSRRw7wUP1XUXZVHzFgx8KiYmSeGiRHBYbDjQOsQMho2uOLsTozMPEt2ehYnji0YA==

"@salesforce/ts-sinon@^1.4.2":
version "1.4.4"
resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.4.tgz#ee7039f7eb6c488d58b0a3365e7196e9b1b1ebb4"
integrity sha512-27kF+8flAEGGikIrLrGkDiFUCgukhRf2cRhYBbD0ihG8RedsYoFTsEW9gG9VApVgWACyhkEmGICisJl8LRD7Rg==
"@salesforce/ts-sinon@^1.4.6":
version "1.4.6"
resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.6.tgz#50ac8f091ae546bcc5b1a2b0937f566e3f9683c6"
integrity sha512-yWed+QzGU3UOSX9ytg09ELWA7Oc5BAK4MVYv8Ap9uUbkg6tylETF7nzuMkvP49TaZcKC7zOG6MBebKNVZqUjPw==
dependencies:
"@salesforce/ts-types" "^1.7.2"
"@salesforce/ts-types" "^1.7.3"
sinon "^5.1.1"
tslib "^2.2.0"
tslib "^2.5.0"

"@salesforce/ts-types@^1.7.2", "@salesforce/ts-types@^1.7.3":
version "1.7.3"
Expand Down Expand Up @@ -3087,10 +3088,10 @@ external-editor@^3.0.3:
iconv-lite "^0.4.24"
tmp "^0.0.33"

fancy-test@^2.0.12:
version "2.0.12"
resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.12.tgz#a93cd92ffc23f70b069c39f19940d34f64c6ca67"
integrity sha512-S7qVQNaViLTMzn71huZvrUCV59ldq+enQ1EQOkdNbl4q4Om97gwqbYKvZoglsnzCWRRFaFP+qHynpdqaLdiZqg==
fancy-test@^2.0.13:
version "2.0.15"
resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.15.tgz#d2949d7a4b889030389e46402289c754be69ffbb"
integrity sha512-yCtzWue60qfQd+b16dVUNE8kWCyQHNHUALnrue32M/ZxwH2AXjzjxdzA5YCe48kFlzqIi/tSxOuJa8TkU8Px1g==
dependencies:
"@types/chai" "*"
"@types/lodash" "*"
Expand Down Expand Up @@ -3573,10 +3574,10 @@ got@^11:
p-cancelable "^2.0.0"
responselike "^2.0.0"

graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
version "4.2.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
version "4.2.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==

grapheme-splitter@^1.0.4:
version "1.0.4"
Expand Down Expand Up @@ -4303,10 +4304,10 @@ jsesc@^2.5.1:
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==

jsforce@^2.0.0-beta.19:
version "2.0.0-beta.19"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.19.tgz#4a136b88d6a9f6668714c4ccbb0acd55e46ea493"
integrity sha512-WdF6hs7kukXNGvp/VRhu2DngldgiBBorsc2WA5us08oJGbEIPwn/itqYJWKJ+rfPXepz5JbkWQd48XHGjqmPpw==
jsforce@^2.0.0-beta.20:
version "2.0.0-beta.20"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.20.tgz#907630942b2ecd653098caa3f87e7710874cb207"
integrity sha512-5TpdU0MEUN34M0mSKmBwOMKaI8dllTYF8NzpJn0/9akrwqKEERK6K2jGiMWcs85Vx1HCHEcwU2n+5ij6z6zr2g==
dependencies:
"@babel/runtime" "^7.12.5"
"@babel/runtime-corejs3" "^7.12.5"
Expand Down Expand Up @@ -6735,7 +6736,7 @@ trim-newlines@^3.0.0:
resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==

ts-node@^10.0.0, ts-node@^10.7.0, ts-node@^10.8.1:
ts-node@^10.0.0, ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
version "10.9.1"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
Expand Down Expand Up @@ -6774,7 +6775,7 @@ tslib@^1.8.1, tslib@^1.9.0:
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.5.0:
tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
Expand Down

0 comments on commit ad6be7c

Please sign in to comment.