Merge branch 'master' into change/remove_edit_mode_source_dates

Author: worksofliam

package-lock.json

@@ -3,7 +3,7 @@
 	"icon": "icon.png",
 	"displayName": "Code for IBM i",
 	"description": "Maintain your RPGLE, CL, COBOL, C/CPP on IBM i right from Visual Studio Code.",
-	"version": "2.14.10-dev.0",
+	"version": "2.14.12-dev.0",
 	"keywords": [
 		"ibmi",
 		"rpgle",
@@ -209,14 +209,6 @@
 								"default": "QTEMP",
 								"description": "Library used as the current library and &CURLIB variable when running actions."
 							},
-							"sourceASP": {
-								"type": [
-									"string",
-									"null"
-								],
-								"default": null,
-								"description": "If source files live within a specific ASP, please specify it here. Leave blank/null otherwise. You can ignore this column if you have access to `QSYS2.ASP_INFO` as Code for IBM i will fetch ASP information automatically."
-							},
 							"sourceFileCCSID": {
 								"type": "string",
 								"default": "*FILE",
@@ -1685,6 +1677,13 @@
 				"category": "IBM i",
 				"icon": "$(debug)",
 				"enablement": "code-for-ibmi:testing"
+			},
+			{
+				"command": "code-for-ibmi.generateBinderSource",
+				"title": "Generate binder source",
+				"category": "IBM i",
+				"icon": "$(plus)",
+				"enablement": "code-for-ibmi:connected"
 			}
 		],
 		"keybindings": [
@@ -2298,6 +2297,10 @@
 				{
 					"command": "code-for-ibmi.searchIFSBrowser",
 					"when": "never"
+				},
+				{
+					"command": "code-for-ibmi.generateBinderSource",
+					"when": "never"
 				}
 			],
 			"view/title": [
@@ -2918,6 +2921,11 @@
 					"command": "code-for-ibmi.debug.setup.local",
 					"when": "!code-for-ibmi:debugManaged && view == ibmiDebugBrowser && viewItem =~ /^certificateIssue_localissue$/",
 					"group": "inline"
+				},
+				{
+					"command": "code-for-ibmi.generateBinderSource",
+					"when": "view == objectBrowser && viewItem =~ /^object.(module|srvpgm).*/",
+					"group": "1_objActions@6"
 				}
 			],
 			"explorer/context": [

package.json

@@ -14,7 +14,7 @@ import { Tools } from './Tools';
 import * as configVars from './configVars';
 import { DebugConfiguration } from "./configuration/DebugConfiguration";
 import { ConnectionManager } from './configuration/config/ConnectionManager';
-import { CommandData, CommandResult, ConnectionData, IBMiMember, RemoteCommand, WrapResult } from './types';
+import { AspInfo, CommandData, CommandResult, ConnectionData, IBMiMember, RemoteCommand, WrapResult } from './types';
 import { EventEmitter } from 'stream';
 import { ConnectionConfig } from './configuration/config/types';
 import { EditorPath } from '../typings';
@@ -97,12 +97,16 @@ export default class IBMi {
   currentConnectionName: string = ``;
   private tempRemoteFiles: { [name: string]: string } = {};
   defaultUserLibraries: string[] = [];
+
   /**
    * Used to store ASP numbers and their names
    * Their names usually maps up to a directory in
    * the root of the IFS, thus why we store it.
    */
-  aspInfo: { [id: number]: string } = {};
+  private iAspInfo: AspInfo[] = [];
+  private currentAsp: string|undefined;
+  private libraryAsps = new Map<string, number>();
+
   remoteFeatures: { [name: string]: string | undefined };
 
   variantChars: {
@@ -728,20 +732,26 @@ export default class IBMi {
 
       if (this.sqlRunnerAvailable()) {
         // Check for ASP information?
-        if (quickConnect() && cachedServerSettings?.aspInfo) {
-          this.aspInfo = cachedServerSettings.aspInfo;
+        if (quickConnect() && cachedServerSettings?.iAspInfo) {
+          this.iAspInfo = cachedServerSettings.iAspInfo;
         } else {
           callbacks.progress({
-            message: `Checking for ASP information.`
+            message: `Checking for iASP information.`
           });
 
           //This is mostly a nice to have. We grab the ASP info so user's do
           //not have to provide the ASP in the settings.
           try {
             const resultSet = await this.runSQL(`SELECT * FROM QSYS2.ASP_INFO`);
             resultSet.forEach(row => {
+              // Does not ever include SYSBAS/SYSTEM, only iASPs
               if (row.DEVICE_DESCRIPTION_NAME && row.DEVICE_DESCRIPTION_NAME && row.DEVICE_DESCRIPTION_NAME !== `null`) {
-                this.aspInfo[Number(row.ASP_NUMBER)] = String(row.DEVICE_DESCRIPTION_NAME);
+                this.iAspInfo.push({
+                  id: Number(row.ASP_NUMBER),
+                  name: String(row.DEVICE_DESCRIPTION_NAME),
+                  type: String(row.ASP_TYPE),
+                  rdbName: String(row.RDB_NAME)
+                });
               }
             });
           } catch (e) {
@@ -752,6 +762,12 @@ export default class IBMi {
           }
         }
 
+        callbacks.progress({
+          message: `Fetching current iASP information.`
+        });
+
+        this.currentAsp = await this.getUserProfileAsp();
+
         // Fetch conversion values?
         if (quickConnect() && cachedServerSettings?.jobCcsid !== null && cachedServerSettings?.userDefaultCCSID && cachedServerSettings?.qccsid) {
           this.qccsid = cachedServerSettings.qccsid;
@@ -893,7 +909,7 @@ export default class IBMi {
 
       IBMi.GlobalStorage.setServerSettingsCache(this.currentConnectionName, {
         lastCheckedOnVersion: currentExtensionVersion,
-        aspInfo: this.aspInfo,
+        iAspInfo: this.iAspInfo,
         qccsid: this.qccsid,
         jobCcsid: this.userJobCcsid,
         remoteFeatures: this.remoteFeatures,
@@ -1434,6 +1450,68 @@ export default class IBMi {
     return this.remoteFeatures[`startDebugService.sh`] !== undefined;
   }
 
+  private async getUserProfileAsp(): Promise<string|undefined> {
+    const [currentRdb] = await this.runSQL(`values current_server`);
+
+    if (currentRdb) {
+      const key = Object.keys(currentRdb)[0];
+      const rdbName = currentRdb[key];
+      const currentAsp = this.iAspInfo.find(asp => asp.rdbName === rdbName);
+
+      if (currentAsp) {
+        return currentAsp.name;
+      }
+    }
+  }
+
+  getAllIAsps() {
+    return this.iAspInfo;
+  }
+
+  getIAspDetail(by: string|number) {
+    let asp: AspInfo|undefined;
+    if (typeof by === 'string') {
+      asp = this.iAspInfo.find(asp => asp.name === by);
+    } else {
+      asp = this.iAspInfo.find(asp => asp.id === by);
+    }
+
+    if (asp) {
+      return asp;
+    }
+  }
+
+  getIAspName(by: string|number): string|undefined {
+    return this.getIAspDetail(by)?.name;
+  }
+
+  getCurrentIAspName() {
+    return this.currentAsp;
+  }
+  async lookupLibraryIAsp(library: string): Promise<string|undefined> {
+    let foundNumber = this.libraryAsps.get(library);
+
+    if (!foundNumber) {
+      const [row] = await this.runSQL(`SELECT IASP_NUMBER FROM TABLE(QSYS2.LIBRARY_INFO('${this.sysNameInAmerican(library)}'))`);
+      const iaspNumber = Number(row?.IASP_NUMBER);
+      if (iaspNumber >= 0) {
+        this.libraryAsps.set(library, iaspNumber);
+        foundNumber = iaspNumber;
+      }
+    }
+
+    if (foundNumber) {
+      return this.getIAspName(foundNumber);
+    }
+  }
+
+  getLibraryIAsp(library: string) {
+    const found = this.libraryAsps.get(library);
+    if (found && found >= 0) {
+      return this.getIAspName(found);
+    }
+  }
+
   /**
    * @deprecated Use {@link IBMiContent.uploadFiles} instead.
    */