fix: refactor away to a shared types

Author: joroscoSF

src/base/deployBase.ts

@@ -2,6 +2,7 @@ import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, Org } from '@salesforce/core';
 import { DatacodeBinaryChecker, type DatacodeDeployExecutionResult } from '../utils/datacodeBinaryChecker.js';
 import { checkEnvironment } from '../utils/environmentChecker.js';
+import { type SharedResultProps } from './types.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('data-code-extension', 'deploy');
@@ -16,27 +17,11 @@ export type BaseDeployFlags = {
   network?: string;
 };
 
-export type DeployResult = {
-  success: boolean;
-  pythonVersion: {
-    version: string;
-    command: string;
-  };
-  packageInfo?: {
-    name: string;
-    version: string;
-  };
-  binaryInfo?: {
-    command: string;
-    version: string;
-  };
-  codeType: 'script' | 'function';
-  packageDir: string;
+export type DeployResult = SharedResultProps & {
   targetOrg: string;
   deploymentId?: string;
   endpointUrl?: string;
   status?: string;
-  message: string;
   executionResult?: DatacodeDeployExecutionResult;
 };
 

src/base/initBase.ts

@@ -1,26 +1,14 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
-import { type PythonVersionInfo } from '../utils/pythonChecker.js';
-import { type PipPackageInfo } from '../utils/pipChecker.js';
-import {
-  DatacodeBinaryChecker,
-  type DatacodeBinaryInfo,
-  type DatacodeInitExecutionResult,
-} from '../utils/datacodeBinaryChecker.js';
+import { DatacodeBinaryChecker, type DatacodeInitExecutionResult } from '../utils/datacodeBinaryChecker.js';
 import { checkEnvironment } from '../utils/environmentChecker.js';
+import { type SharedResultProps } from './types.js';
 
 export type BaseInitFlags = {
   'package-dir': string;
 };
 
-export type InitResult = {
-  success: boolean;
-  pythonVersion: PythonVersionInfo;
-  packageInfo?: PipPackageInfo;
-  binaryInfo?: DatacodeBinaryInfo;
-  codeType: 'script' | 'function';
-  packageDir: string;
-  message: string;
+export type InitResult = SharedResultProps & {
   executionResult?: DatacodeInitExecutionResult;
 };
 

src/base/runBase.ts

@@ -1,13 +1,8 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, Org } from '@salesforce/core';
-import { type PythonVersionInfo } from '../utils/pythonChecker.js';
-import { type PipPackageInfo } from '../utils/pipChecker.js';
-import {
-  DatacodeBinaryChecker,
-  type DatacodeBinaryInfo,
-  type DatacodeRunExecutionResult,
-} from '../utils/datacodeBinaryChecker.js';
+import { DatacodeBinaryChecker, type DatacodeRunExecutionResult } from '../utils/datacodeBinaryChecker.js';
 import { checkEnvironment } from '../utils/environmentChecker.js';
+import { type SharedResultProps } from './types.js';
 
 export type BaseRunFlags = {
   entrypoint: string;
@@ -16,17 +11,10 @@ export type BaseRunFlags = {
   dependencies?: string;
 };
 
-export type RunResult = {
-  success: boolean;
-  pythonVersion: PythonVersionInfo;
-  packageInfo?: PipPackageInfo;
-  binaryInfo?: DatacodeBinaryInfo;
-  codeType: 'script' | 'function';
-  packageDir: string;
+export type RunResult = SharedResultProps & {
   targetOrg: string;
   status?: string;
   output?: string;
-  message: string;
   executionResult?: DatacodeRunExecutionResult;
 };
 

src/base/types.ts

@@ -0,0 +1,13 @@
+import { type PythonVersionInfo } from '../utils/pythonChecker.js';
+import { type PipPackageInfo } from '../utils/pipChecker.js';
+import { type DatacodeBinaryInfo } from '../utils/datacodeBinaryChecker.js';
+
+export type SharedResultProps = {
+  success: boolean;
+  pythonVersion: PythonVersionInfo;
+  packageInfo?: PipPackageInfo;
+  binaryInfo?: DatacodeBinaryInfo;
+  codeType: 'script' | 'function';
+  packageDir: string;
+  message: string;
+};

src/base/zipBase.ts

@@ -1,29 +1,17 @@
 import { existsSync } from 'node:fs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
-import { type PythonVersionInfo } from '../utils/pythonChecker.js';
-import { type PipPackageInfo } from '../utils/pipChecker.js';
-import {
-  DatacodeBinaryChecker,
-  type DatacodeBinaryInfo,
-  type DatacodeZipExecutionResult,
-} from '../utils/datacodeBinaryChecker.js';
+import { DatacodeBinaryChecker, type DatacodeZipExecutionResult } from '../utils/datacodeBinaryChecker.js';
 import { checkEnvironment } from '../utils/environmentChecker.js';
+import { type SharedResultProps } from './types.js';
 
 export type BaseZipFlags = {
   'package-dir': string;
   network?: string;
 };
 
-export type ZipResult = {
-  success: boolean;
-  pythonVersion: PythonVersionInfo;
-  packageInfo?: PipPackageInfo;
-  binaryInfo?: DatacodeBinaryInfo;
-  codeType: 'script' | 'function';
-  packageDir: string;
+export type ZipResult = SharedResultProps & {
   archivePath?: string;
-  message: string;
   executionResult?: DatacodeZipExecutionResult;
 };