Refactoring Command Handlers with Utils.mapArgumentsToOptions

packages/cli/src/Utils.ts

@@ -9,12 +9,98 @@
 *
 */
 
-import { IImperativeConfig } from "@zowe/imperative";
+import { ICommandOptionDefinition, IImperativeConfig } from "@zowe/imperative";
+import { Arguments } from "yargs";
+import { ZosFilesOptionDefinitions } from "./zosfiles/ZosFiles.options";
 
 /**
  * Get the Imperative config object which defines properties of the CLI.
  * This allows it to be accessed without calling Imperative.init.
  */
 export function getImperativeConfig(): IImperativeConfig {
     return require("./imperative");
+}
+
+/**
+ * Map command arguments to options based on their type definition, applying defaults,
+ * alias mapping, and type transformations.
+ *
+ * Special cases:
+ *  - If the option name is "like", it is skipped (the "like" value is handled separately).
+ *  - For the "dsntype" option, if not provided, then the value of the "dataSetType" argument is used.
+ *  - For "dirblk", the value is determined from the "dsorg" argument.
+ *  - For "alcunit", an inline conversion is applied.
+ *
+ * @param args - The command arguments.
+ * @param optionDefinitions - The option definitions from the command definition.
+ * @returns A mapped options object.
+ */
+export function mapArgumentsToOptions<T>(
+    args: Arguments,
+    optionDefinitions: ICommandOptionDefinition[]
+): T {
+    const options = {} as T;
+    // Merge command-specific options with global ZosFiles option definitions.
+    const combinedDefinitions = [...optionDefinitions, ...ZosFilesOptionDefinitions];
+
+    combinedDefinitions.forEach(optionDef => {
+        const { name, type, defaultValue } = optionDef;
+
+        // Skip the "like" option as it is handled separately.
+        if (name === "like") {
+            return;
+        }
+
+        let argValue: unknown;
+        // For "dsntype", allow the CLI to provide "dataSetType" as an alias.
+        if (name === "dsntype") {
+            if (args[name] !== undefined) {
+                argValue = args[name];
+            } else if (args["dataSetType"] !== undefined) {
+                argValue = args["dataSetType"];
+            } else {
+                argValue = defaultValue;
+            }
+        } else {
+            argValue = args[name] !== undefined ? args[name] : defaultValue;
+        }
+
+        // If no value is found, skip adding this option.
+        if (argValue === undefined) {
+            return;
+        }
+
+        // Special handling for "dirblk": derive from dsorg.
+        if (name === "dirblk") {
+            const dsorg = args["dsorg"];
+            options[name as keyof T] = parseInt(
+                dsorg === "PO" || dsorg === "POE" ? "10" : "0",
+                10
+            ) as unknown as T[keyof T];
+            return;
+        }
+
+        // Special handling for "alcunit": convert allocation unit values.
+        if (name === "alcunit") {
+            const alcMap: Record<string, string> = {
+                "TRACKS": "TRK",
+                "CYLINDERS": "CYL"
+            };
+            if (typeof argValue === "string") {
+                options[name as keyof T] = (alcMap[argValue.toUpperCase()] || "TRK") as unknown as T[keyof T];
+            } else {
+                options[name as keyof T] = "TRK" as unknown as T[keyof T];
+            }
+            return;
+        }
+
+        // Apply type-based transformations.
+        if (type === "number") {
+            options[name as keyof T] = parseInt(argValue as string, 10) as unknown as T[keyof T];
+        } else {
+            options[name as keyof T] = argValue as T[keyof T];
+        }
+    });
+
+    return options;
 }

packages/cli/src/zosfiles/create/binaryPds/BinaryPDS.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { Create, CreateDataSetTypeEnum, IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { BinaryPDSDefinition } from "./BinaryPDS.definition";
 
 /**
  * Handler to create a Binary-PDS data set
@@ -23,7 +24,7 @@ export default class BinaryPDSHandler extends ZosFilesBaseHandler {
             session,
             CreateDataSetTypeEnum.DATA_SET_BINARY,
             commandParameters.arguments.dataSetName,
-            generateZosmfOptions(commandParameters.arguments)
+            mapArgumentsToOptions(commandParameters.arguments, BinaryPDSDefinition.options )
         );
     }
 }

packages/cli/src/zosfiles/create/cPds/CPDS.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { IZosFilesResponse, Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { CPDSDefinition } from "./CPDS.definition";
 
 /**
  * Handler to create a C-PDS data set
@@ -23,7 +24,7 @@ export default class CPDSHandler extends ZosFilesBaseHandler {
             session,
             CreateDataSetTypeEnum.DATA_SET_C,
             commandParameters.arguments.dataSetName,
-            generateZosmfOptions(commandParameters.arguments)
+            mapArgumentsToOptions(commandParameters.arguments, CPDSDefinition.options)
         );
     }
 }

packages/cli/src/zosfiles/create/classicPds/ClassicPDS.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { Create, CreateDataSetTypeEnum, IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { ClassicPDSDefinition } from "./ClassicPDS.definition";
 
 /**
  * Handler to create a Classic-PDS data set
@@ -23,7 +24,7 @@ export default class ClassicPDSHandler extends ZosFilesBaseHandler {
             session,
             CreateDataSetTypeEnum.DATA_SET_CLASSIC,
             commandParameters.arguments.dataSetName,
-            generateZosmfOptions(commandParameters.arguments)
+            mapArgumentsToOptions(commandParameters.arguments, ClassicPDSDefinition.options)
         );
     }
 }

packages/cli/src/zosfiles/create/ds/ds.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { Create, CreateDataSetTypeEnum, IZosFilesResponse } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { DsDefinition } from "./ds.definition";
 
 /**
  * Handler to like a data set
@@ -25,7 +26,7 @@ export default class DataSetHandler extends ZosFilesBaseHandler {
                 session,
                 CreateDataSetTypeEnum.DATA_SET_BLANK,
                 commandParameters.arguments.dataSetName,
-                generateZosmfOptions(commandParameters.arguments)
+                mapArgumentsToOptions(commandParameters.arguments, DsDefinition.options)
             );
 
         }
@@ -34,7 +35,7 @@ export default class DataSetHandler extends ZosFilesBaseHandler {
                 session,
                 commandParameters.arguments.dataSetName,
                 commandParameters.arguments.like,
-                generateZosmfOptions(commandParameters.arguments)
+                mapArgumentsToOptions(commandParameters.arguments, DsDefinition.options)
             );
         }
 

packages/cli/src/zosfiles/create/pds/Pds.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { IZosFilesResponse, Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { PdsDefinition } from "./Pds.definition";
 
 /**
  * Handler to create a PDS data set
@@ -23,7 +24,7 @@ export default class PdsHandler extends ZosFilesBaseHandler {
             session,
             CreateDataSetTypeEnum.DATA_SET_PARTITIONED,
             commandParameters.arguments.dataSetName,
-            generateZosmfOptions(commandParameters.arguments)
+            mapArgumentsToOptions(commandParameters.arguments, PdsDefinition.options)
         );
     }
 }

packages/cli/src/zosfiles/create/ps/Ps.handler.ts

@@ -12,7 +12,8 @@
 import { AbstractSession, IHandlerParameters } from "@zowe/imperative";
 import { IZosFilesResponse, Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
 import { ZosFilesBaseHandler } from "../../ZosFilesBase.handler";
-import { generateZosmfOptions } from "../Create.utils";
+import { mapArgumentsToOptions } from "../../../Utils";
+import { PsDefinition } from "./Ps.definition";
 
 /**
  * Handler to create a PDS data set
@@ -23,7 +24,7 @@ export default class PsHandler extends ZosFilesBaseHandler {
             session,
             CreateDataSetTypeEnum.DATA_SET_SEQUENTIAL,
             commandParameters.arguments.dataSetName,
-            generateZosmfOptions(commandParameters.arguments)
+            mapArgumentsToOptions(commandParameters.arguments, PsDefinition.options)
         );
     }
 }