Add mapped options for isfs and export (intersystems-community#932)

Author: isc-bsaviano

docs/ServerSide.md

@@ -147,14 +147,15 @@ Changes you make to files opened from this root folder of your VS Code workspace
 
 The query string of the `uri` property accepts several parameters that control filtering and display of the server-side entities. The examples below access the USER namespace on the server whose definition is named 'myserver'.
 
-- `isfs://myserver:user?type=cls`, shows only classes
-- `isfs://myserver:user?type=rtn`, shows only mac, int and inc files
-- `isfs://myserver:user?generated=1`, shows generated files as well as not generated
-- `isfs://myserver:user?filter=%Z*.mac,%z*.mac`, comma-delimited list of search options, ignores `type`. The default is `*.cls,*.inc,*.mac,*.int`. To see all files, use `*`.
-- `isfs://myserver:user?flat=1`, a flat list of files. Does not split packages as folders. Cannot be combined with `csp`.
-- `isfs://myserver:user?project=prjname`, shows only files in project `prjname`. Cannot be combined with any other parameter.
-
-The options `flat` and `generated` can be combined with each other, and with `type` or `filter`. If `filter` is specified, `type` is ignored.
+- `isfs://myserver:user/?type=cls`, shows only classes
+- `isfs://myserver:user/?type=rtn`, shows only mac, int and inc files
+- `isfs://myserver:user/?generated=1`, shows generated files as well as not generated
+- `isfs://myserver:user/?filter=%Z*.mac,%z*.mac`, comma-delimited list of search options, ignores `type`. The default is `*.cls,*.inc,*.mac,*.int`. To see all files, use `*`.
+- `isfs://myserver:user/?flat=1`, a flat list of files. Does not split packages as folders. Cannot be combined with `csp`.
+- `isfs://myserver:user/?project=prjname`, shows only files in project `prjname`. Cannot be combined with any other parameter.
+- `isfs://myserver:user/?mapped=0`, hides files that are mapped from a non-default database
+
+The options `flat`, `generated` and `mapped` can be combined with each other, and with `type` or `filter`. If `filter` is specified, `type` is ignored.
 
 ## Advanced Workspace Configurations
 

docs/SettingsReference.md

@@ -51,6 +51,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
 | `"objectscript.export.folder"` | Folder for exported source code within workspace. | `string` | `"src"` | |
 | `"objectscript.export.generated"` | Export generated source code files, such as INTs generated from classes. | `boolean` | `false` | |
 | `"objectscript.export.map"` | Map file names before export, with regexp pattern as a key and replacement as a value. | `object` | `{}` | For example, `{  \"%(.*)\": \"_$1\" }` to make % classes or routines use underscore prefix instead. |
+| `"objectscript.export.mapped"` | Export source code files mapped from a non-default database. | `boolean` | `true` | |
 | `"objectscript.export.maxConcurrentConnections"` | Maximum number of concurrent export connections. | `number` | `0` | 0 = unlimited |
 | `"objectscript.export.noStorage"` | Strip the storage definition on export. | `boolean` | `false` | Can be useful when working across multiple systems. |
 | `"objectscript.format.commandCase"` | Case for commands. | `"upper"`, `"lower"` or `"word"` | `"word"` | Has no effect if the `InterSystems Language Server` extension is installed and enabled. |

package.json

@@ -1071,7 +1071,8 @@
             "category": "*",
             "noStorage": false,
             "dontExportIfNoChanges": false,
-            "maxConcurrentConnections": 0
+            "maxConcurrentConnections": 0,
+            "mapped": true
           },
           "properties": {
             "folder": {
@@ -1149,6 +1150,10 @@
             "maxConcurrentConnections": {
               "description": "Maximum number of concurrent export connections. (0 = unlimited)",
               "type": "number"
+            },
+            "mapped": {
+              "description": "Export source code files mapped from a non-default database.",
+              "type": "boolean"
             }
           }
         },

src/commands/export.ts

@@ -246,7 +246,7 @@ export async function exportAll(): Promise<any> {
   }
   const api = new AtelierAPI(workspaceFolder);
   outputChannel.show(true);
-  const { category, generated, filter, exactFilter } = config("export", workspaceFolder);
+  const { category, generated, filter, exactFilter, mapped } = config("export", workspaceFolder);
   // Replicate the behavior of getDocNames() but use StudioOpenDialog for better performance
   let filterStr = "";
   switch (category) {
@@ -277,7 +277,7 @@ export async function exportAll(): Promise<any> {
     }
   }
   return api
-    .actionQuery("SELECT Name FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?,?)", [
+    .actionQuery("SELECT Name FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?,?,?,?)", [
       "*",
       "1",
       "1",
@@ -286,6 +286,8 @@ export async function exportAll(): Promise<any> {
       "0",
       generated ? "1" : "0",
       filterStr,
+      "0",
+      mapped ? "1" : "0",
     ])
     .then(async (data) => {
       let files: vscode.QuickPickItem[] = data.result.content.map((file) => {

src/utils/FileProviderUtil.ts

@@ -136,7 +136,7 @@ export function studioOpenDialogFromURI(
   if (!api.active) {
     return;
   }
-  const sql = `SELECT Name, Type FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?,?)`;
+  const sql = `SELECT Name, Type FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?,?,?,?)`;
   const params = new URLSearchParams(uri.query);
   const csp = params.has("csp") && ["", "1"].includes(params.get("csp"));
   const spec = fileSpecFromURI(uri, overrides.type);
@@ -150,5 +150,6 @@ export function studioOpenDialogFromURI(
   if (overrides && overrides.flat) {
     flat = "1";
   }
-  return api.actionQuery(sql, [spec, dir, orderBy, system, flat, notStudio, generated, overrides.filter]);
+  const mapped = params.has("mapped") && params.get("mapped") == "0" ? "0" : "1";
+  return api.actionQuery(sql, [spec, dir, orderBy, system, flat, notStudio, generated, overrides.filter, "0", mapped]);
 }