fix(deps): bump the dependencies group with 11 updates (#60)

* fix(deps): bump the dependencies group with 11 updates Bumps the dependencies group with 11 updates: | Package | From | To | | --- | --- | --- | | [@oclif/core](https://github.com/oclif/core) | `4.0.25` | `4.0.31` | | [@salesforce/core](https://github.com/forcedotcom/sfdx-core) | `8.6.1` | `8.6.4` | | [@salesforce/sf-plugins-core](https://github.com/salesforcecli/sf-plugins-core) | `11.3.10` | `12.0.11` | | [@salesforce/source-deploy-retrieve](https://github.com/forcedotcom/source-deploy-retrieve) | `12.7.3` | `12.10.0` | | [@salesforce/source-tracking](https://github.com/forcedotcom/source-tracking) | `7.1.16` | `7.1.18` | | [@salesforce/ts-sinon](https://github.com/forcedotcom/ts-sinon) | `1.4.27` | `1.4.28` | | [@oclif/plugin-command-snapshot](https://github.com/oclif/plugin-command-snapshot) | `5.2.17` | `5.2.20` | | [@salesforce/cli-plugins-testkit](https://github.com/salesforcecli/cli-plugins-testkit) | `5.3.33` | `5.3.35` | | [eslint-plugin-sf-plugin](https://github.com/salesforcecli/eslint-plugin-sf-plugin) | `1.20.8` | `1.20.10` | | [oclif](https://github.com/oclif/oclif) | `4.14.36` | `4.15.16` | | [typescript](https://github.com/microsoft/TypeScript) | `5.6.2` | `5.6.3` | Updates `@oclif/core` from 4.0.25 to 4.0.31 - [Release notes](https://github.com/oclif/core/releases) - [Changelog](https://github.com/oclif/core/blob/main/CHANGELOG.md) - [Commits](oclif/core@4.0.25...4.0.31) Updates `@salesforce/core` from 8.6.1 to 8.6.4 - [Release notes](https://github.com/forcedotcom/sfdx-core/releases) - [Changelog](https://github.com/forcedotcom/sfdx-core/blob/main/CHANGELOG.md) - [Commits](forcedotcom/sfdx-core@8.6.1...8.6.4) Updates `@salesforce/sf-plugins-core` from 11.3.10 to 12.0.11 - [Release notes](https://github.com/salesforcecli/sf-plugins-core/releases) - [Changelog](https://github.com/salesforcecli/sf-plugins-core/blob/main/CHANGELOG.md) - [Commits](salesforcecli/sf-plugins-core@11.3.10...12.0.11) Updates `@salesforce/source-deploy-retrieve` from 12.7.3 to 12.10.0 - [Release notes](https://github.com/forcedotcom/source-deploy-retrieve/releases) - [Changelog](https://github.com/forcedotcom/source-deploy-retrieve/blob/main/CHANGELOG.md) - [Commits](forcedotcom/source-deploy-retrieve@12.7.3...12.10.0) Updates `@salesforce/source-tracking` from 7.1.16 to 7.1.18 - [Release notes](https://github.com/forcedotcom/source-tracking/releases) - [Changelog](https://github.com/forcedotcom/source-tracking/blob/main/CHANGELOG.md) - [Commits](forcedotcom/source-tracking@7.1.16...7.1.18) Updates `@salesforce/ts-sinon` from 1.4.27 to 1.4.28 - [Release notes](https://github.com/forcedotcom/ts-sinon/releases) - [Changelog](https://github.com/forcedotcom/ts-sinon/blob/main/CHANGELOG.md) - [Commits](forcedotcom/ts-sinon@1.4.27...1.4.28) Updates `@oclif/plugin-command-snapshot` from 5.2.17 to 5.2.20 - [Release notes](https://github.com/oclif/plugin-command-snapshot/releases) - [Changelog](https://github.com/oclif/plugin-command-snapshot/blob/main/CHANGELOG.md) - [Commits](oclif/plugin-command-snapshot@5.2.17...5.2.20) Updates `@salesforce/cli-plugins-testkit` from 5.3.33 to 5.3.35 - [Release notes](https://github.com/salesforcecli/cli-plugins-testkit/releases) - [Changelog](https://github.com/salesforcecli/cli-plugins-testkit/blob/main/CHANGELOG.md) - [Commits](salesforcecli/cli-plugins-testkit@5.3.33...5.3.35) Updates `eslint-plugin-sf-plugin` from 1.20.8 to 1.20.10 - [Release notes](https://github.com/salesforcecli/eslint-plugin-sf-plugin/releases) - [Changelog](https://github.com/salesforcecli/eslint-plugin-sf-plugin/blob/main/CHANGELOG.md) - [Commits](salesforcecli/eslint-plugin-sf-plugin@1.20.8...1.20.10) Updates `oclif` from 4.14.36 to 4.15.16 - [Release notes](https://github.com/oclif/oclif/releases) - [Changelog](https://github.com/oclif/oclif/blob/main/CHANGELOG.md) - [Commits](oclif/oclif@4.14.36...4.15.16) Updates `typescript` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](microsoft/TypeScript@v5.6.2...v5.6.3) --- updated-dependencies: - dependency-name: "@oclif/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/sf-plugins-core" dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: "@salesforce/source-deploy-retrieve" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: "@salesforce/source-tracking" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/ts-sinon" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@oclif/plugin-command-snapshot" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: "@salesforce/cli-plugins-testkit" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: eslint-plugin-sf-plugin dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: oclif dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * updates to ux.table --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kyle <[email protected]>
k-capehart · Nov 7, 2024 · ce7d140 · ce7d140
1 parent 098715e
commit ce7d140
Show file tree

Hide file tree

Showing 5 changed files with 944 additions and 444 deletions.
diff --git a/package.json b/package.json
@@ -16,28 +16,28 @@
   },
   "homepage": "https://github.com/k-capehart/kc-sf-plugin",
   "dependencies": {
-    "@oclif/core": "^4.0.25",
-    "@salesforce/core": "^8.6.1",
-    "@salesforce/sf-plugins-core": "^11.3.10",
-    "@salesforce/source-deploy-retrieve": "^12.7.3",
-    "@salesforce/source-tracking": "^7.1.16",
-    "@salesforce/ts-sinon": "^1.4.27",
+    "@oclif/core": "^4.0.31",
+    "@salesforce/core": "^8.6.4",
+    "@salesforce/sf-plugins-core": "^12.0.11",
+    "@salesforce/source-deploy-retrieve": "^12.10.0",
+    "@salesforce/source-tracking": "^7.1.18",
+    "@salesforce/ts-sinon": "^1.4.28",
     "@salesforce/ts-types": "^2.0.12",
     "chalk": "^5.3.0",
     "fast-xml-parser": "^4.5.0",
     "fs-extra": "^11.2.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.2.17",
-    "@salesforce/cli-plugins-testkit": "^5.3.33",
+    "@oclif/plugin-command-snapshot": "^5.2.20",
+    "@salesforce/cli-plugins-testkit": "^5.3.35",
     "@salesforce/dev-scripts": "^10.2.10",
     "@types/fs-extra": "^11.0.4",
     "@types/yeoman-assert": "^3.1.4",
-    "eslint-plugin-sf-plugin": "^1.20.8",
-    "oclif": "^4.14.36",
+    "eslint-plugin-sf-plugin": "^1.20.10",
+    "oclif": "^4.15.16",
     "shx": "0.3.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "yeoman-assert": "^3.1.1"
   },
   "engines": {

diff --git a/src/utils/diffSource.ts b/src/utils/diffSource.ts
@@ -112,7 +112,6 @@ const getWillDelete = (files: PreviewFile[]): PreviewFile[] =>
   files.filter(willGo).filter((f) => f.operation && ['deletePre', 'deletePost'].includes(f.operation));
 
 // relative paths are easier on tables
-const columns = { type: {}, fullName: {}, projectRelativePath: { header: 'Path' } };
 const makeKey = ({ type, fullName }: { type: MetadataType; fullName: string }): string => `${type.name}#${fullName}`;
 
 export const compileResults = ({
@@ -229,13 +228,19 @@ const printDeployTable = (files: PreviewFile[], deletedFiles: PreviewFile[]): vo
     );
     if (files.length !== 0) {
       ux.log(chalk.dim(messages.getMessage('deployChanges.header', [files.length])));
-      ux.table<PreviewFile>(files, columns);
+      ux.table<PreviewFile>({
+        data: files,
+        columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      });
     } else {
       ux.log(chalk.dim(messages.getMessage('deployChanges.none')));
     }
     if (deletedFiles.length !== 0) {
       ux.log(chalk.dim(messages.getMessage('deployDeletes.header', [deletedFiles.length])));
-      ux.table<PreviewFile>(deletedFiles, columns);
+      ux.table<PreviewFile>({
+        data: deletedFiles,
+        columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      });
     } else {
       ux.log(chalk.dim(messages.getMessage('deployDeletes.none')));
     }
@@ -253,13 +258,19 @@ const printRetrieveTable = (files: PreviewFile[], deletedFiles: PreviewFile[]):
     );
     if (files.length !== 0) {
       ux.log(chalk.dim(messages.getMessage('retrieveChanges.header', [files.length])));
-      ux.table<PreviewFile>(files, columns);
+      ux.table<PreviewFile>({
+        data: files,
+        columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      });
     } else {
       ux.log(chalk.dim(messages.getMessage('retrieveChanges.none')));
     }
     if (deletedFiles.length !== 0) {
       ux.log(chalk.dim(messages.getMessage('retrieveDeletes.header', [deletedFiles.length])));
-      ux.table<PreviewFile>(deletedFiles, columns);
+      ux.table<PreviewFile>({
+        data: deletedFiles,
+        columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      });
     } else {
       ux.log(chalk.dim(messages.getMessage('retrieveDeletes.none')));
     }
@@ -272,7 +283,11 @@ const printConflictsTable = (files: PreviewFile[]): void => {
     ux.log(chalk.dim(messages.getMessage('conflicts.none')));
   } else {
     ux.log(StandardColors.error(chalk.bold(messages.getMessage('conflicts.header', [files.length]))));
-    ux.table<PreviewFile>(files, columns, { sort: 'path' });
+    ux.table<PreviewFile>({
+      data: files,
+      columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      sort: { path: 'asc' },
+    });
   }
 };
 
@@ -282,7 +297,11 @@ const printIgnoredTable = (files: PreviewFile[]): void => {
     ux.log(chalk.dim(messages.getMessage('ignored.none')));
   } else {
     ux.log(chalk.dim(messages.getMessage('ignored.header', [files.length, 'change'])));
-    ux.table<PreviewFile>(files, columns, { sort: 'path' });
+    ux.table<PreviewFile>({
+      data: files,
+      columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      sort: { path: 'asc' },
+    });
   }
 };
 

diff --git a/test/utils/diffSource.test.ts b/test/utils/diffSource.test.ts
@@ -116,25 +116,29 @@ describe('diff table', () => {
   it('prints output table', () => {
     printTables(mockRetrievePreviewOutput, mockDeployPreviewOutput);
     expect(tableStub.callCount).to.equal(6);
-    expect(tableStub.firstCall.args[0]).to.deep.equal([
-      {
-        fullName: 'test',
-        type: 'PermissionSet',
-        conflict: true,
-        ignored: false,
-        path: 'force-app',
-        projectRelativePath: 'force-app',
-        operation: 'retrieve',
-      },
-      {
-        fullName: 'test',
-        type: 'PermissionSet',
-        conflict: true,
-        ignored: false,
-        path: 'force-app',
-        projectRelativePath: 'force-app',
-        operation: 'deploy',
-      },
-    ]);
+    expect(tableStub.firstCall.args[0]).to.deep.equal({
+      data: [
+        {
+          fullName: 'test',
+          type: 'PermissionSet',
+          conflict: true,
+          ignored: false,
+          path: 'force-app',
+          projectRelativePath: 'force-app',
+          operation: 'retrieve',
+        },
+        {
+          fullName: 'test',
+          type: 'PermissionSet',
+          conflict: true,
+          ignored: false,
+          path: 'force-app',
+          projectRelativePath: 'force-app',
+          operation: 'deploy',
+        },
+      ],
+      columns: ['type', 'fullName', { key: 'projectRelativePath', name: 'Path' }],
+      sort: { path: 'asc' },
+    });
   });
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,9 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
-    "lib": [
-      "ES2021.String"
-    ]
+    "lib": ["ES2021.String"]
   },
   "include": ["./src/**/*.ts"]
 }