Tryhosting isfs folder-level settings on server

Author: gjsjohnmurray

src/commands/compile.ts

@@ -251,18 +251,22 @@ export async function importAndCompile(askFlags = false, document?: vscode.TextD
       // console.error(error);
       throw error;
     })
-    .then(() => compile([file], flags));
+    .then(() => {
+      if (!file.fileName.startsWith("\\.vscode\\")) {
+        compile([file], flags);
+      }
+    });
 }
 
 // Compiles all files types in the namespace
-export async function namespaceCompile(askFLags = false): Promise<any> {
+export async function namespaceCompile(askFlags = false): Promise<any> {
   const api = new AtelierAPI();
   const fileTypes = ["*.CLS", "*.MAC", "*.INC", "*.BAS"];
   if (!config("conn").active) {
     throw new Error(`No Active Connection`);
   }
   const defaultFlags = config().compileFlags;
-  const flags = askFLags ? await compileFlags() : defaultFlags;
+  const flags = askFlags ? await compileFlags() : defaultFlags;
   if (flags === undefined) {
     // User cancelled
     return;

src/providers/FileSystemPovider/FileSystemProvider.ts

@@ -6,6 +6,7 @@ import { Directory } from "./Directory";
 import { File } from "./File";
 import { fireOtherStudioAction, OtherStudioAction } from "../../commands/studio";
 import { StudioOpenDialog } from "../../queries";
+import { redirectDotvscodeRoot } from "../../utils/index";
 
 declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
 
@@ -61,7 +62,13 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     } else {
       filter = "*.cls,*.inc,*.mac,*.int";
     }
-    const folder = csp ? (uri.path.endsWith("/") ? uri.path : uri.path + "/") : uri.path.replace(/\//g, ".");
+    const folder = !csp
+      ? uri.path.replace(/\//g, ".")
+      : uri.path === "/"
+      ? ""
+      : uri.path.endsWith("/")
+      ? uri.path
+      : uri.path + "/";
     const spec = csp ? folder + filter : folder.length > 1 ? folder.slice(1) + "/" + filter : filter;
     const dir = "1";
     const orderBy = "1";
@@ -72,18 +79,48 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     return api
       .actionQuery(sql, [spec, dir, orderBy, system, flat, notStudio, generated])
       .then((data) => data.result.content || [])
-      .then((data) =>
-        data.map((item: StudioOpenDialog) => {
-          const name = item.Name;
+      .then((data) => {
+        const results = data.map((item: StudioOpenDialog) => {
+          // Handle how query returns web apps
+          const name = item.Name.split("/")[0];
           const fullName = folder === "" ? name : folder + "/" + name;
           if (item.Type === "10" || item.Type === "9") {
             parent.entries.set(name, new Directory(name, fullName));
             return [name, vscode.FileType.Directory];
           } else {
             return [name, vscode.FileType.File];
           }
-        })
-      )
+        });
+        if (!csp || results.length) {
+          return results;
+        }
+        //TODO further request(s) to get the next level in CSP app names
+        // e.g. folder root is isfs://server/?ns=USER&csp
+        //  and USER namespace is the home of /csp/app1 and /csp/app2
+        // Initial expand showed the csp folder.
+        // Expand of that came here and asked Studio dialog query for /csp/*
+        // but this doesn't return app1 and app2 folders.
+        return api
+          .actionQuery(sql, ["/*.CSPALL", dir, orderBy, system, flat, notStudio, generated])
+          .then((data) => data.result.content || [])
+          .then((data) => {
+            return results;
+            /*
+            const results = data.map((item: StudioOpenDialog) => {
+              // Handle how query returns web apps
+              const name = item.Name.split("/")[0];
+              const fullName = folder === "" ? name : folder + "/" + name;
+              if (item.Type === "10" || item.Type === "9") {
+                parent.entries.set(name, new Directory(name, fullName));
+                return [name, vscode.FileType.Directory];
+              } else {
+                return [name, vscode.FileType.File];
+              }
+            });
+            return results;
+            */
+          });
+      })
       .catch((error) => {
         error && console.error(error);
       });
@@ -138,16 +175,17 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       overwrite: boolean;
     }
   ): void | Thenable<void> {
-    if (uri.path.match(/\/\.[^/]*\//)) {
+    uri = redirectDotvscodeRoot(uri);
+    if (uri.path.startsWith("/.")) {
       throw vscode.FileSystemError.NoPermissions("dot-folders not supported by server");
     }
+    const api = new AtelierAPI(uri);
     const { query } = url.parse(decodeURIComponent(uri.toString()), true);
     const csp = query.csp === "" || query.csp === "1";
     const fileName = csp ? uri.path : uri.path.slice(1).replace(/\//g, ".");
     if (fileName.startsWith(".")) {
       return;
     }
-    const api = new AtelierAPI(uri);
     return this._lookupAsFile(uri).then(
       () => {
         // Weirdly, if the file exists on the server we don't actually write its content here.
@@ -274,15 +312,16 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
 
   // Fetch from server and cache it
   private async _lookupAsFile(uri: vscode.Uri): Promise<File> {
-    // Reject attempts to access files in .-folders such as .vscode and .git
-    if (uri.path.match(/\/\.[^/]*\//)) {
-      throw vscode.FileSystemError.FileNotFound("dot-folders not supported by server");
+    uri = redirectDotvscodeRoot(uri);
+    if (uri.path.startsWith("/.")) {
+      throw vscode.FileSystemError.NoPermissions("dot-folders not supported by server");
     }
+
+    const api = new AtelierAPI(uri);
     const { query } = url.parse(decodeURIComponent(uri.toString()), true);
     const csp = query.csp === "" || query.csp === "1";
     const fileName = csp ? uri.path : uri.path.slice(1).replace(/\//g, ".");
     const name = path.basename(uri.path);
-    const api = new AtelierAPI(uri);
     return api
       .getDoc(fileName)
       .then((data) => data.result)

src/utils/index.ts

@@ -72,19 +72,20 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
       !document.fileName ||
       !document.languageId ||
       !document.languageId.startsWith("objectscript") ||
-      fileExt.match(/(csp)/i)) // Skip CSP for now, yet
+      fileExt.match(/(csp)/i)) // Skip local CSPs for now
   ) {
     return null;
   }
   const eol = document.eol || vscode.EndOfLine.LF;
-  const uri = document.uri;
+  const uri = redirectDotvscodeRoot(document.uri);
   const content = document.getText();
   let name = "";
   let ext = "";
   const { query } = url.parse(decodeURIComponent(uri.toString()), true);
   const csp = query.csp === "" || query.csp === "1";
   if (csp) {
-    name = fileName.replace("\\", "/");
+    //name = fileName.replace("\\", "/");
+    name = uri.path;
   } else if (fileExt === "cls") {
     const match = content.match(/^Class (%?\w+(?:\.\w+)+)/im);
     if (match) {
@@ -333,3 +334,30 @@ export async function terminalWithDocker(): Promise<vscode.Terminal> {
   terminal.show(true);
   return terminal;
 }
+
+/**
+ * Alter isfs-type uri.path of /.vscode/* files or subdirectories.
+ * Rewrite `/.vscode/path/to/file` as `/_vscode/XYZ/path/to/file`
+ *  where XYZ comes from the `ns` queryparam of uri.
+ * Also alter query to specify `ns=%SYS&csp=1`
+ *
+ * @returns uri, altered if necessary.
+ * @throws if `ns` queryparam is missing but required.
+ */
+export function redirectDotvscodeRoot(uri: vscode.Uri): vscode.Uri {
+  if (!schemas.includes(uri.scheme)) {
+    return uri;
+  }
+  const dotMatch = uri.path.match(/^\/(\.[^/]*)\/(.*)$/);
+  if (dotMatch && dotMatch[1] === ".vscode") {
+    const nsMatch = `&${uri.query}&`.match(/&ns=(.+)&/);
+    if (!nsMatch) {
+      throw new Error("No 'ns' query parameter on uri");
+    }
+    const namespace = nsMatch[1];
+    const newQueryString = (("&" + uri.query).replace(`ns=${namespace}`, "ns=%SYS") + "&csp=1").slice(1);
+    return uri.with({ path: `/_vscode/${namespace}/${dotMatch[2]}`, query: newQueryString });
+  } else {
+    return uri;
+  }
+}