Merge pull request #413 from intersystems-community/map-files

Ability to add file mapping

Author: daimor

package.json

@@ -746,6 +746,37 @@
           ],
           "default": false
         },
+        "objectscript.export.map": {
+          "markdownDescription": "Map file names before export, with regexp pattern as a key and replacement as a value (e.g. `{  \"%(.*)\": \"_$1\" }` to make % classes or routines use underscore prefix instead).",
+          "type": "object",
+          "default": {},
+          "examples": [
+            {
+              "%(.*)": "_$1"
+            }
+          ],
+					"patternProperties": {
+						"\\(.*\\)": {
+							"type": "string",
+							"pattern": "\\$1"
+						}
+					},
+					"properties": {
+						"%(.*)": {
+							"description": "Catch any % items. Set value to `_$1` to replace `%` prefix with `_`",
+							"type": "string",
+							"pattern": "\\$1",
+							"default": "_$1"
+						},
+						"(.*)": {
+							"description": "Match everything. Set value to `$1` to leave unchanged",
+							"type": "string",
+							"pattern": "\\$1",
+							"default": "$1"
+						}
+					},
+					"additionalProperties": false
+        },
         "objectscript.export.atelier": {
           "description": "Export source code as Atelier did it, with packages as subfolders.",
           "type": "boolean",

src/commands/export.ts

@@ -36,7 +36,23 @@ const getCategory = (fileName: string, addCategory: any | boolean): string => {
   }
 };
 
-export const getFileName = (folder: string, name: string, split: boolean, addCategory: boolean): string => {
+export const getFileName = (
+  folder: string,
+  name: string,
+  split: boolean,
+  addCategory: boolean,
+  map: {
+    [key: string]: string;
+  }
+): string => {
+  if (map) {
+    for (const pattern of Object.keys(map)) {
+      if (new RegExp(`^${pattern}$`).test(name)) {
+        name = name.replace(new RegExp(`^${pattern}$`), map[pattern]);
+        break;
+      }
+    }
+  }
   const fileNameArray: string[] = name.split(".");
   const fileExt = fileNameArray.pop().toLowerCase();
   const cat = addCategory ? getCategory(name, addCategory) : null;
@@ -142,15 +158,15 @@ export async function exportList(files: string[], workspaceFolder: string, names
   if (!files || !files.length) {
     vscode.window.showWarningMessage("Nothing to export");
   }
-  const { atelier, folder, addCategory } = config("export", workspaceFolder);
+  const { atelier, folder, addCategory, map } = config("export", workspaceFolder);
 
   const root = [workspaceFolderUri(workspaceFolder).fsPath, typeof folder === "string" && folder.length ? folder : null]
     .filter(notNull)
     .join(path.sep);
   const run = async (fileList) => {
     const errors = [];
     for (const file of fileList) {
-      await exportFile(workspaceFolder, namespace, file, getFileName(root, file, atelier, addCategory)).catch(
+      await exportFile(workspaceFolder, namespace, file, getFileName(root, file, atelier, addCategory, map)).catch(
         (error) => {
           errors.push(`${file} - ${error}`);
         }

src/extension.ts

@@ -849,7 +849,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       const { apiTarget } = connectionTarget(uri);
       if (typeof apiTarget === "string") {
         // It was a file-type uri, so find its document (we hope it is open)
-        const docs = vscode.workspace.textDocuments.filter((doc) => doc.uri === uri);
+        const docs = vscode.workspace.textDocuments.filter((doc) => doc.uri.toString() === uri.toString());
         let fileName = "";
         if (docs.length === 1) {
           // Found it, so work out the corresponding server-side name

src/providers/DocumentContentProvider.ts

@@ -14,10 +14,10 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
   }
 
   public static getAsFile(name: string, workspaceFolder: string): string {
-    const { atelier, folder, addCategory } = config("export", workspaceFolder);
+    const { atelier, folder, addCategory, map } = config("export", workspaceFolder);
 
     const root = [workspaceFolderUri(workspaceFolder).fsPath, folder].join(path.sep);
-    const fileName = getFileName(root, name, atelier, addCategory);
+    const fileName = getFileName(root, name, atelier, addCategory, map);
     if (fs.existsSync(fileName)) {
       return fs.realpathSync.native(fileName);
     }