chore: code refactoring of exports (#176)

* chore: code refactoring of exports

* chore: code refactoring of exports

* fix: remove empty import, publish plugin-source

Co-authored-by: Steve Hetzel <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>

Author: 3 people

package.json

@@ -8,7 +8,7 @@
     "@oclif/config": "^1",
     "@salesforce/command": "^4.0.4",
     "@salesforce/core": "^2.26.1",
-    "@salesforce/source-deploy-retrieve": "^4.1.1",
+    "@salesforce/source-deploy-retrieve": "^4.3.2",
     "chalk": "^4.1.1",
     "cli-ux": "^5.6.3",
     "open": "^8.2.1",

src/commands/force/source/deploy.ts

@@ -7,11 +7,10 @@
 import * as os from 'os';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
-import { AsyncResult, DeployResult } from '@salesforce/source-deploy-retrieve';
+import { AsyncResult, DeployResult, RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { Duration } from '@salesforce/kit';
 import { getString, isString } from '@salesforce/ts-types';
 import { env, once } from '@salesforce/kit';
-import { RequestStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
 import { DeployCommand } from '../../../deployCommand';
 import { ComponentSetBuilder } from '../../../componentSetBuilder';
 import { DeployResultFormatter, DeployCommandResult } from '../../../formatters/deployResultFormatter';

src/commands/force/source/deploy/cancel.ts

@@ -10,7 +10,7 @@ import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { getString } from '@salesforce/ts-types';
-import { RequestStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+import { RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { DeployCommand } from '../../../../deployCommand';
 import {
   DeployCancelCommandResult,

src/commands/force/source/retrieve.ts

@@ -11,8 +11,7 @@ import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages, SfdxProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { getString } from '@salesforce/ts-types';
-import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
-import { RequestStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+import { RetrieveResult, RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { SourceCommand } from '../../../sourceCommand';
 import {
   RetrieveResultFormatter,

src/deployCommand.ts

@@ -5,9 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { ComponentSet, DeployResult } from '@salesforce/source-deploy-retrieve';
+import { ComponentSet, DeployResult, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve';
 import { SfdxError, ConfigFile, ConfigAggregator, PollingClient, StatusResult } from '@salesforce/core';
-import { MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
 import { AnyJson, asString, getBoolean } from '@salesforce/ts-types';
 import { Duration, once } from '@salesforce/kit';
 import { SourceCommand } from './sourceCommand';

src/formatters/deployCancelResultFormatter.ts

@@ -8,8 +8,7 @@
 import { UX } from '@salesforce/command';
 import { Logger } from '@salesforce/core';
 import { getString } from '@salesforce/ts-types';
-import { DeployResult } from '@salesforce/source-deploy-retrieve';
-import { MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+import { DeployResult, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve';
 import { ResultFormatter } from './resultFormatter';
 
 export type DeployCancelCommandResult = MetadataApiDeployStatus;

src/formatters/deployProgressStatusFormatter.ts

@@ -8,8 +8,7 @@ import * as chalk from 'chalk';
 import { UX } from '@salesforce/command';
 import { Logger } from '@salesforce/core';
 import { getNumber } from '@salesforce/ts-types';
-import { MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
-import { MetadataApiDeploy } from '@salesforce/source-deploy-retrieve';
+import { MetadataApiDeploy, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve';
 import { Duration } from '@salesforce/kit';
 import { ProgressFormatter } from './progressFormatter';
 export class DeployProgressStatusFormatter extends ProgressFormatter {

src/formatters/deployReportResultFormatter.ts

@@ -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 { MetadataApiDeployStatus, RequestStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+import { MetadataApiDeployStatus, RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { getString } from '@salesforce/ts-types';
 import { SfdxError } from '@salesforce/core';
 import { DeployResultFormatter } from './deployResultFormatter';

src/formatters/deployResultFormatter.ts

@@ -9,13 +9,13 @@ import * as chalk from 'chalk';
 import { UX } from '@salesforce/command';
 import { Logger, Messages, SfdxError } from '@salesforce/core';
 import { get, getBoolean, getString, getNumber, asString } from '@salesforce/ts-types';
-import { DeployResult } from '@salesforce/source-deploy-retrieve';
 import {
+  DeployResult,
   CodeCoverage,
   FileResponse,
   MetadataApiDeployStatus,
   RequestStatus,
-} from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+} from '@salesforce/source-deploy-retrieve';
 import { ResultFormatter, ResultFormatterOptions, toArray } from './resultFormatter';
 
 Messages.importMessagesDirectory(__dirname);

src/formatters/resultFormatter.ts

@@ -8,9 +8,8 @@
 import * as path from 'path';
 import { UX } from '@salesforce/command';
 import { Logger } from '@salesforce/core';
-import { FileResponse } from '@salesforce/source-deploy-retrieve';
+import { FileResponse, Failures, Successes } from '@salesforce/source-deploy-retrieve';
 import { getBoolean, getNumber } from '@salesforce/ts-types';
-import { Failures, Successes } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
 
 export interface ResultFormatterOptions {
   verbose?: boolean;

src/formatters/retrieveResultFormatter.ts

@@ -9,13 +9,14 @@ import { blue, yellow } from 'chalk';
 import { UX } from '@salesforce/command';
 import { Logger, Messages, SfdxError } from '@salesforce/core';
 import { get, getString, getNumber } from '@salesforce/ts-types';
-import { RetrieveResult, MetadataApiRetrieveStatus } from '@salesforce/source-deploy-retrieve';
 import {
+  RetrieveResult,
+  MetadataApiRetrieveStatus,
   ComponentStatus,
   FileResponse,
   RequestStatus,
   RetrieveMessage,
-} from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+} from '@salesforce/source-deploy-retrieve';
 import { ResultFormatter, ResultFormatterOptions, toArray } from './resultFormatter';
 
 Messages.importMessagesDirectory(__dirname);

test/commands/source/deployResponses.ts

@@ -5,12 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { DeployResult } from '@salesforce/source-deploy-retrieve';
 import {
+  DeployResult,
   DeployMessage,
   MetadataApiDeployStatus,
   RequestStatus,
-} from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+} from '@salesforce/source-deploy-retrieve';
 import { cloneJson } from '@salesforce/kit';
 import { toArray } from '../../../src/formatters/resultFormatter';
 

test/commands/source/retrieveResponses.ts

@@ -6,8 +6,7 @@
  */
 
 import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
-import { RequestStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
-import { MetadataApiRetrieveStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
+import { RequestStatus, MetadataApiRetrieveStatus } from '@salesforce/source-deploy-retrieve';
 import { toArray } from '../../../src/formatters/resultFormatter';
 
 const packageFileProp = {

yarn.lock

@@ -843,10 +843,10 @@
     unzipper "0.10.11"
     xmldom-sfdx-encoding "^0.1.29"
 
-"@salesforce/source-deploy-retrieve@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-4.1.1.tgz#8c5b23cec488dcd4aea5e15df49e014bf00a7929"
-  integrity sha512-tfuPtmdtWU/1HwuB+ZM6gvCXUBZh+XOiBLPz98KU3khKi81CRnJyXQCL+tiBZpIwzGaQV1emOIZD2WsjTEY9oA==
+"@salesforce/source-deploy-retrieve@^4.3.2":
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-4.3.2.tgz#b4eb01d235a1d2ab16918e5d25df34886654e294"
+  integrity sha512-xzLL7/YjMbrAXE3sAr4lbXQDTcFpGLDgnh2k9Bqf+Ns24/xgtm5avg65OlXpeLR1/A+WSAPv3tE9osIiR27yAg==
   dependencies:
     "@salesforce/core" "2.25.1"
     "@salesforce/kit" "^1.5.0"