Sm/updates

CHANGELOG.md

@@ -1,86 +1,195 @@
-# Changelog
+## [2.1.6](https://github.com/salesforcecli/plugin-limits/compare/2.1.5...2.1.6) (2022-12-25)
 
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.33 to 5.2.35 ([96b3233](https://github.com/salesforcecli/plugin-limits/commit/96b3233b48eb5a0095aff3b471dbd2ef444222aa))
 
-### [2.0.1](https://github.com/salesforcecli/plugin-limits/compare/v2.0.0...v2.0.1) (2022-05-20)
+## [2.1.5](https://github.com/salesforcecli/plugin-limits/compare/2.1.4...2.1.5) (2022-12-18)
 
 ### Bug Fixes
 
-- add prompt to examples ([e7c575f](https://github.com/salesforcecli/plugin-limits/commit/e7c575f6ba3504032a82ae60a978987522d7c10f))
-- add prompt to examples ([b58d728](https://github.com/salesforcecli/plugin-limits/commit/b58d72884976e734a22d4bf00f7f71438cbd9671))
+- **deps:** bump @salesforce/command from 5.2.28 to 5.2.33 ([e8a2632](https://github.com/salesforcecli/plugin-limits/commit/e8a2632de850d8a539856f0b889a7b8b60dc6a70))
+
+## [2.1.4](https://github.com/salesforcecli/plugin-limits/compare/2.1.3...2.1.4) (2022-12-18)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 3.32.6 to 3.32.11 ([ffda4c3](https://github.com/salesforcecli/plugin-limits/commit/ffda4c382e8a7b55b9d7f74580122f0e616d3a38))
+
+## [2.1.3](https://github.com/salesforcecli/plugin-limits/compare/2.1.2...2.1.3) (2022-12-04)
+
+### Bug Fixes
 
-## [2.0.0](https://github.com/salesforcecli/plugin-limits/compare/v1.3.0...v2.0.0) (2022-04-01)
+- **deps:** bump @salesforce/command from 5.2.22 to 5.2.28 ([bcb0fba](https://github.com/salesforcecli/plugin-limits/commit/bcb0fba8ea8be876fd5d0d52dbd84f925e334a3c))
+
+## [2.1.2](https://github.com/salesforcecli/plugin-limits/compare/2.1.1...2.1.2) (2022-11-27)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 3.32.1 to 3.32.2 ([52a0e59](https://github.com/salesforcecli/plugin-limits/commit/52a0e59a0378d425f63b6cd9c06ab466729aa817))
+
+## [2.1.1](https://github.com/salesforcecli/plugin-limits/compare/2.1.0...2.1.1) (2022-11-17)
+
+### Reverts
+
+- Revert "feat: modify limits commands to align with sf and sfdx (#365)" (#372) ([4c76933](https://github.com/salesforcecli/plugin-limits/commit/4c76933386186875376f73486af2e976dd79a5b5)), closes [#365](https://github.com/salesforcecli/plugin-limits/issues/365) [#372](https://github.com/salesforcecli/plugin-limits/issues/372)
+
+# [2.1.0](https://github.com/salesforcecli/plugin-limits/compare/2.0.13...2.1.0) (2022-11-17)
 
 ### Features
 
-- display all record counts ([2e905ce](https://github.com/salesforcecli/plugin-limits/commit/2e905ceaef69865680b1cdfb5a9cd0468302f753))
+- modify limits commands to align with sf and sfdx ([#365](https://github.com/salesforcecli/plugin-limits/issues/365)) ([28b6c4e](https://github.com/salesforcecli/plugin-limits/commit/28b6c4e8d6006fe74bdb1504850b7942cf6c7a7c))
+
+## [2.0.13](https://github.com/salesforcecli/plugin-limits/compare/2.0.12...2.0.13) (2022-11-13)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 1.20.3 to 1.20.4 ([aececa3](https://github.com/salesforcecli/plugin-limits/commit/aececa3e9d3b6d8be8ed4fcc9896d99817ea053f))
+
+## [2.0.12](https://github.com/salesforcecli/plugin-limits/compare/2.0.11...2.0.12) (2022-11-13)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.20 to 5.2.22 ([0eaec11](https://github.com/salesforcecli/plugin-limits/commit/0eaec11ae8943941d4ed7c80e823e9aa02c8c085))
+
+## [2.0.11](https://github.com/salesforcecli/plugin-limits/compare/2.0.10...2.0.11) (2022-11-06)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.18 to 5.2.20 ([a9af854](https://github.com/salesforcecli/plugin-limits/commit/a9af85460430f66f3c7e859c5937724813230c62))
+
+## [2.0.10](https://github.com/salesforcecli/plugin-limits/compare/2.0.9...2.0.10) (2022-10-30)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 1.19.1 to 1.20.0 ([3c9825e](https://github.com/salesforcecli/plugin-limits/commit/3c9825e2027479a62aedde6f3f408427e021fd4f))
+
+## [2.0.9](https://github.com/salesforcecli/plugin-limits/compare/2.0.8...2.0.9) (2022-10-30)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.16 to 5.2.17 ([1bbf966](https://github.com/salesforcecli/plugin-limits/commit/1bbf966bec9b92db165ff8866dd84d6ad2588b4b))
+
+## [2.0.8](https://github.com/salesforcecli/plugin-limits/compare/2.0.7...2.0.8) (2022-10-26)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.11 to 5.2.16 ([f2415f4](https://github.com/salesforcecli/plugin-limits/commit/f2415f4e408efb32de8f8eeab0a5397b03645c49))
+
+## [2.0.7](https://github.com/salesforcecli/plugin-limits/compare/2.0.6...2.0.7) (2022-10-25)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 3.30.9 to 3.31.16 ([aae7e53](https://github.com/salesforcecli/plugin-limits/commit/aae7e53661ee4e91dc658b35d9bb973f53729bb3))
+
+## [2.0.6](https://github.com/salesforcecli/plugin-limits/compare/2.0.5...2.0.6) (2022-10-23)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 1.16.4 to 1.19.1 ([699483e](https://github.com/salesforcecli/plugin-limits/commit/699483ee2528b3f3c961b2049c76e62154f2164e))
+
+## [2.0.5](https://github.com/salesforcecli/plugin-limits/compare/2.0.4...2.0.5) (2022-10-02)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.10 to 5.2.11 ([69b83dc](https://github.com/salesforcecli/plugin-limits/commit/69b83dc2a2e9f4e80502a5fbde427a8df3b18add))
+
+## [2.0.4](https://github.com/salesforcecli/plugin-limits/compare/2.0.3...2.0.4) (2022-09-30)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 3.30.8 to 3.30.9 ([0d15ff0](https://github.com/salesforcecli/plugin-limits/commit/0d15ff0bd292d206a8f30c39c8946dbcf375cfab))
+
+## [2.0.3](https://github.com/salesforcecli/plugin-limits/compare/2.0.2...2.0.3) (2022-09-28)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 1.16.0 to 1.16.4 ([5b27743](https://github.com/salesforcecli/plugin-limits/commit/5b277431723051ae859e13ea133f1d7a6de59336))
+
+## [2.0.2](https://github.com/salesforcecli/plugin-limits/compare/v2.0.1...2.0.2) (2022-09-28)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/command from 5.2.6 to 5.2.10 ([3e6c201](https://github.com/salesforcecli/plugin-limits/commit/3e6c2016aebf55c63c4bf340238d10e1bf8a2b90))
+
+## [2.0.1](https://github.com/salesforcecli/plugin-limits/compare/v2.0.0...v2.0.1) (2022-05-20)
+
+### Bug Fixes
+
+- add prompt to examples ([e7c575f](https://github.com/salesforcecli/plugin-limits/commit/e7c575f6ba3504032a82ae60a978987522d7c10f))
+- add prompt to examples ([b58d728](https://github.com/salesforcecli/plugin-limits/commit/b58d72884976e734a22d4bf00f7f71438cbd9671))
+
+# [2.0.0](https://github.com/salesforcecli/plugin-limits/compare/v1.3.0...v2.0.0) (2022-04-01)
 
 ### Bug Fixes
 
 - parking orbit plugin-limits ([e870115](https://github.com/salesforcecli/plugin-limits/commit/e870115b61bb8d6201787bf2d74e2ae3de5b13e2))
-- parking orbit plugin-limits ([ce77180](https://github.com/salesforcecli/plugin-limits/commit/ce77180d05176f6f1016762a06356210d6bf46d3))
 
-## [1.3.0](https://github.com/salesforcecli/plugin-limits/compare/v1.2.3...v1.3.0) (2021-12-02)
+### Features
+
+- display all record counts ([2e905ce](https://github.com/salesforcecli/plugin-limits/commit/2e905ceaef69865680b1cdfb5a9cd0468302f753))
+
+# [1.3.0](https://github.com/salesforcecli/plugin-limits/compare/v1.2.3...v1.3.0) (2021-12-02)
 
 ### Features
 
 - bump deps ([1df1fef](https://github.com/salesforcecli/plugin-limits/commit/1df1fef17d0fc6655fa1db79f525948e893d557c))
 
-### [1.2.3](https://github.com/salesforcecli/plugin-limits/compare/v1.2.2...v1.2.3) (2021-11-02)
+## [1.2.3](https://github.com/salesforcecli/plugin-limits/compare/v1.2.2...v1.2.3) (2021-11-02)
 
-### [1.2.2](https://github.com/salesforcecli/plugin-limits/compare/v1.2.1...v1.2.2) (2021-10-05)
+## [1.2.2](https://github.com/salesforcecli/plugin-limits/compare/v1.2.1...v1.2.2) (2021-10-05)
 
 ### Bug Fixes
 
 - update deps ([2f291d9](https://github.com/salesforcecli/plugin-limits/commit/2f291d9b20ae5d37bac285fb3964d97219d52526))
 
-### [1.2.1](https://github.com/salesforcecli/plugin-limits/compare/v1.2.0...v1.2.1) (2021-05-10)
-
-## [1.2.0](https://github.com/salesforcecli/plugin-limits/compare/v1.1.0...v1.2.0) (2021-04-29)
-
-### Features
+## [1.2.1](https://github.com/salesforcecli/plugin-limits/compare/v1.2.0...v1.2.1) (2021-05-10)
 
-- add recordcounts command ([7628eaa](https://github.com/salesforcecli/plugin-limits/commit/7628eaab70a6b1fc9b015f22b4040de198d53745))
+# [1.2.0](https://github.com/salesforcecli/plugin-limits/compare/v1.1.0...v1.2.0) (2021-04-29)
 
 ### Bug Fixes
 
 - add 0 count response output ([14ede94](https://github.com/salesforcecli/plugin-limits/commit/14ede94c39dfc7cca008a22b2bd2fcecee3e0c5c))
 - arg in test ([b56ad46](https://github.com/salesforcecli/plugin-limits/commit/b56ad4687d59dc4272b4a6c770d4f81b059ace74))
 - update message ([3e5c28f](https://github.com/salesforcecli/plugin-limits/commit/3e5c28f118caceaff6acaace3e0ed5f94cf1bca9))
 
-## [1.1.0](https://github.com/salesforcecli/plugin-limits/compare/v1.0.6...v1.1.0) (2021-04-26)
+### Features
+
+- add recordcounts command ([7628eaa](https://github.com/salesforcecli/plugin-limits/commit/7628eaab70a6b1fc9b015f22b4040de198d53745))
+
+# [1.1.0](https://github.com/salesforcecli/plugin-limits/compare/v1.0.6...v1.1.0) (2021-04-26)
 
 ### Features
 
 - add nut test ([#77](https://github.com/salesforcecli/plugin-limits/issues/77)) ([fa87c17](https://github.com/salesforcecli/plugin-limits/commit/fa87c172384d09e5a1c677743b20d9c2096fa445))
 
-### [1.0.6](https://github.com/salesforcecli/plugin-limits/compare/v1.0.5...v1.0.6) (2021-04-13)
+## [1.0.6](https://github.com/salesforcecli/plugin-limits/compare/v1.0.5...v1.0.6) (2021-04-13)
 
 ### Bug Fixes
 
 - update help for force:limit:api:display ([86f3f51](https://github.com/salesforcecli/plugin-limits/commit/86f3f519e91fff81e5a1478a0c963e8ce011ce0d))
 
-### [1.0.5](https://github.com/salesforcecli/plugin-limits/compare/v1.0.4...v1.0.5) (2021-04-01)
+## [1.0.5](https://github.com/salesforcecli/plugin-limits/compare/v1.0.4...v1.0.5) (2021-04-01)
 
 ### Bug Fixes
 
 - jobs names [skip-validate-pr] ([4103421](https://github.com/salesforcecli/plugin-limits/commit/4103421091618625c08cec33a98682194d43e589))
 - leif .yml merge [skip-validate-pr] ([bdbf265](https://github.com/salesforcecli/plugin-limits/commit/bdbf2658b369ad3053cca3ed50cc3c0cafffcbb1))
 - leif .yml merge [skip-validate-pr] ([42dc4b1](https://github.com/salesforcecli/plugin-limits/commit/42dc4b1ae9308f54efcbe24fab564b135a287e24))
 
-### [1.0.4](https://github.com/salesforcecli/plugin-limits/compare/v1.0.3...v1.0.4) (2021-02-19)
+## [1.0.4](https://github.com/salesforcecli/plugin-limits/compare/v1.0.3...v1.0.4) (2021-02-19)
 
-### [1.0.3](https://github.com/salesforcecli/plugin-limits/compare/v1.0.2...v1.0.3) (2021-01-21)
+## [1.0.3](https://github.com/salesforcecli/plugin-limits/compare/v1.0.2...v1.0.3) (2021-01-21)
 
 ### Bug Fixes
 
 - add force topic ([970113e](https://github.com/salesforcecli/plugin-limits/commit/970113e53651ee63481ce9060e15e36352bbe493))
 
-### [1.0.2](https://github.com/salesforcecli/plugin-limits/compare/v1.0.1...v1.0.2) (2020-12-16)
+## [1.0.2](https://github.com/salesforcecli/plugin-limits/compare/v1.0.1...v1.0.2) (2020-12-16)
 
-### [1.0.1](https://github.com/salesforcecli/plugin-limits/compare/v1.0.0...v1.0.1) (2020-12-10)
+## [1.0.1](https://github.com/salesforcecli/plugin-limits/compare/v1.0.0...v1.0.1) (2020-12-10)
 
-## 1.0.0 (2020-11-16)
+# [1.0.0](https://github.com/salesforcecli/plugin-limits/compare/82730609c6eb3c6c294fc3b16096a7ebc354b2f4...v1.0.0) (2020-11-16)
 
 ### Bug Fixes
 

README.md

@@ -50,11 +50,11 @@ yarn install
 yarn build
 ```
 
-To use your plugin, run using the local `./bin/run` or `./bin/run.cmd` file.
+To use your plugin, run using the local `./bin/dev` or `./bin/dev.cmd` file.
 
 ```bash
 # Run using local run file.
-./bin/run force:limits
+./bin/dev force:limits
 ```
 
 There should be no differences when running via the Salesforce CLI or using the local run file. However, it can be useful to link the plugin to do some additional testing or run your commands from anywhere on your machine.

bin/run

@@ -1,5 +1,3 @@
 #!/usr/bin/env node
 
-require('@oclif/core').run()
-.then(require('@oclif/core/flush'))
-.catch(require('@oclif/core/handle'))
+require('@oclif/core').run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));

command-snapshot.json

@@ -1,16 +1,4 @@
 [
-  {
-    "command": "force:limits:api:display",
-    "plugin": "@salesforce/plugin-limits",
-    "flags": ["api-version", "json", "loglevel", "target-org"],
-    "alias": ["force:limits:api:display", "org:list:limits"]
-  },
-  {
-    "command": "force:limits:recordcounts:display",
-    "plugin": "@salesforce/plugin-limits",
-    "flags": ["api-version", "json", "loglevel", "sobject", "target-org"],
-    "alias": ["force:limits:recordcounts:display", "org:list:sobject:record-counts"]
-  },
   {
     "command": "limits:api:display",
     "plugin": "@salesforce/plugin-limits",
@@ -22,17 +10,5 @@
     "plugin": "@salesforce/plugin-limits",
     "flags": ["api-version", "json", "loglevel", "sobject", "target-org"],
     "alias": ["force:limits:recordcounts:display", "org:list:sobject:record-counts"]
-  },
-  {
-    "command": "org:list:limits",
-    "plugin": "@salesforce/plugin-limits",
-    "flags": ["api-version", "json", "loglevel", "target-org"],
-    "alias": ["force:limits:api:display", "org:list:limits"]
-  },
-  {
-    "command": "org:list:sobject:record-counts",
-    "plugin": "@salesforce/plugin-limits",
-    "flags": ["api-version", "json", "loglevel", "sobject", "target-org"],
-    "alias": ["force:limits:recordcounts:display", "org:list:sobject:record-counts"]
   }
 ]

package.json

@@ -1,43 +1,45 @@
 {
   "name": "@salesforce/plugin-limits",
   "description": "commands to display api limits to your org",
-  "version": "2.1.1",
+  "version": "2.1.6",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "main": "lib/index.js",
   "dependencies": {
-    "@salesforce/core": "^3.32.1",
+    "@oclif/core": "^1.20.4",
+    "@salesforce/core": "^3.32.11",
     "@salesforce/kit": "^1.8.0",
-    "@salesforce/sf-plugins-core": "^1.18.1",
+    "@salesforce/sf-plugins-core": "^1.21.3",
     "@salesforce/ts-types": "^1.7.1",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^3",
-    "@oclif/test": "^2.2.10",
+    "@oclif/plugin-command-snapshot": "^3.2.11",
+    "@oclif/test": "^2.2.17",
     "@salesforce/cli-plugins-testkit": "^3.2.9",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^3.1.0",
     "@salesforce/plugin-command-reference": "^2.2.8",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.2",
-    "@swc/core": "^1.3.16",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@swc/core": "^1.3.22",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.47.0",
     "chai": "^4.3.7",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsdoc": "^39.6.2",
-    "eslint-plugin-sf-plugin": "^1.1.5",
+    "eslint-plugin-jsdoc": "^39.6.4",
+    "eslint-plugin-sf-plugin": "^1.3.1",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.7.1",
+    "oclif": "^3.4.2",
+    "prettier": "^2.8.1",
     "pretty-quick": "^3.1.0",
     "shx": "0.3.4",
     "sinon": "10.0.0",

src/commands/limits/api/display.ts

@@ -35,7 +35,7 @@ export class LimitsApiDisplayCommand extends SfCommand<ApiLimits> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
-  public static flags = {
+  public static readonly flags = {
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,

src/commands/limits/recordcounts/display.ts

@@ -6,7 +6,7 @@
  */
 import { Messages, SfError } from '@salesforce/core';
 import {
-  Flags,
+  arrayWithDeprecation,
   loglevel,
   orgApiVersionFlagWithDeprecations,
   requiredOrgFlagWithDeprecations,
@@ -33,12 +33,11 @@ export class LimitsRecordCountsDisplayCommand extends SfCommand<RecordCounts> {
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
 
-  public static flags = {
-    sobject: Flags.string({
+  public static readonly flags = {
+    sobject: arrayWithDeprecation({
       char: 's',
       summary: messages.getMessage('sobjectFlagDescription'),
       aliases: ['sobjecttype'],
-      multiple: true,
       default: [],
     }),
     'target-org': requiredOrgFlagWithDeprecations,
@@ -50,13 +49,12 @@ export class LimitsRecordCountsDisplayCommand extends SfCommand<RecordCounts> {
     try {
       const { flags } = await this.parse(LimitsRecordCountsDisplayCommand);
       const conn = flags['target-org'].getConnection(flags['api-version']);
-      const sobjectsPassed = flags.sobject.map((sobject) => sobject.split(',')).flat();
-      const sobjectsQuery = sobjectsPassed.length > 0 ? `=${sobjectsPassed.join()}` : '';
+      const sobjectsQuery = flags.sobject.length > 0 ? `=${flags.sobject.join()}` : '';
       const geturl = `/limits/recordCount?sObjects${sobjectsQuery}`;
       const result = await conn.request<Result>(geturl);
 
       const recordCounts = result.sObjects
-        .filter((record) => (sobjectsPassed.length > 0 ? sobjectsPassed.includes(record.name) : result.sObjects))
+        .filter((record) => (flags.sobject.length > 0 ? flags.sobject.includes(record.name) : result.sObjects))
         .sort((a, b) => a.name.localeCompare(b.name));
 
       this.table(recordCounts, {

test/commands/display.nut.ts

@@ -34,8 +34,8 @@ describe('Limits display', () => {
     const output = execCmd<ListApiDisplayOutput>(`limits:api:display -u ${username} --json`, {
       ensureExitCode: 0,
     }).jsonOutput;
-    expect(output.result).length.greaterThan(0);
-    expect(output.status).to.equal(0);
+    expect(output?.result).length.greaterThan(0);
+    expect(output?.status).to.equal(0);
   });
 
   it('Displays the limits (human readable)', () => {