@salesforce/source-testkit 0.0.17 → 0.0.18

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.
 
+### [0.0.18](https://github.com/salesforcecli/source-testkit/compare/v0.0.17...v0.0.18) (2022-03-08)
+
+### Features
+
+- make type changes to make testing sf easier ([#59](https://github.com/salesforcecli/source-testkit/issues/59)) ([7752ed6](https://github.com/salesforcecli/source-testkit/commit/7752ed66eff3be11c9fa6921223f277427334fab))
+
 ### [0.0.17](https://github.com/salesforcecli/source-testkit/compare/v0.0.16...v0.0.17) (2022-02-12)
 
 ### [0.0.16](https://github.com/salesforcecli/source-testkit/compare/v0.0.15...v0.0.16) (2021-10-13)

package/lib/testkit.d.ts

@@ -58,9 +58,9 @@ export declare class SourceTestkit extends AsyncCreatable<SourceTestkit.Options>
     /**
      * Executes force:source:deploy
      */
-    deploy(options?: Partial<SourceTestkit.CommandOpts>): Promise<Result<{
+    deploy<T = {
         id: string;
-    }>>;
+    }>(options?: Partial<SourceTestkit.CommandOpts>): Promise<Result<T>>;
     /**
      * Executes force:source:deploy:report
      */

package/lib/testkit.js

@@ -346,7 +346,7 @@ class SourceTestkit extends kit_1.AsyncCreatable {
                 ? cli_plugins_testkit_1.execCmd(command, { ensureExitCode: exitCode, cli: 'sf' })
                 : cli_plugins_testkit_1.execCmd(command, { ensureExitCode: exitCode, cli: 'sfdx' });
             await this.fileTracker.updateAll(`POST: ${command}`);
-            if (json && this.executableName === Executable.SFDX) {
+            if (json) {
                 const jsonOutput = result.jsonOutput;
                 this.debug('%O', jsonOutput);
                 if (!jsonOutput) {
@@ -361,15 +361,6 @@ class SourceTestkit extends kit_1.AsyncCreatable {
                 }
                 return jsonOutput;
             }
-            if (json && this.executableName === Executable.SF) {
-                const jsonOutput = result.jsonOutput;
-                this.debug('%O', jsonOutput);
-                if (!jsonOutput) {
-                    console.error(`${command} returned null jsonOutput`);
-                    console.error(result);
-                }
-                return jsonOutput;
-            }
         }
         catch (err) {
             const error = err;

package/lib/types.d.ts

@@ -1,11 +1,9 @@
 import { Connection } from '@salesforce/core';
 import { JsonCollection, JsonMap, Nullable } from '@salesforce/ts-types';
-export declare type SfdxResult<T = JsonMap> = Nullable<JsonMap & {
+export declare type Result<T = JsonCollection> = Nullable<JsonMap & {
     status: number;
     result: T;
 }>;
-export declare type SfResult<T = JsonCollection> = Nullable<T>;
-export declare type Result<T = JsonCollection> = SfdxResult<T> | SfResult<T>;
 export declare type Context = {
     projectDir: string;
     connection: Nullable<Connection>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-testkit",
   "description": "testkit for running NUTs for source related commands",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -69,7 +69,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",
-    "sinon": "10.0.0",
+    "sinon": "^10.0.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.1.3"
   },