Merge branch 'master' into do-1243

Author: gjsjohnmurray

package-lock.json

@@ -1799,7 +1799,7 @@
     "eslint-plugin-promise": "^7.1.0",
     "glob": "^11.0.1",
     "globals": "^15.12.0",
-    "mocha": "^9.1.3",
+    "mocha": "^11.1.0",
     "path-browserify": "^1.0.1",
     "prettier": "^3.3.1",
     "ts-loader": "^9.5.1",

package.json

@@ -23,14 +23,16 @@ import {
   exportedUris,
   handleError,
   isClassDeployed,
+  isClassOrRtn,
   notIsfs,
   notNull,
   outputChannel,
+  RateLimiter,
   routineNameTypeRegex,
-  throttleRequests,
 } from "../utils";
 import { StudioActions } from "./studio";
 import { NodeBase, PackageNode, RootNode } from "../explorer/nodes";
+import { updateIndexForDocument } from "../utils/documentIndex";
 
 async function compileFlags(): Promise<string> {
   const defaultFlags = config().compileFlags;
@@ -226,6 +228,10 @@ export async function loadChanges(files: (CurrentTextFile | CurrentBinaryFile)[]
             file.uri,
             Buffer.isBuffer(content) ? content : new TextEncoder().encode(content.join("\n"))
           );
+          if (isClassOrRtn(file.uri)) {
+            // Update the document index
+            updateIndexForDocument(file.uri, undefined, undefined, content);
+          }
           exportedUris.push(file.uri.toString());
         } else if (filesystemSchemas.includes(file.uri.scheme)) {
           fileSystemProvider.fireFileChanged(file.uri);
@@ -414,9 +420,10 @@ export async function namespaceCompile(askFlags = false): Promise<any> {
 
 async function importFiles(files: vscode.Uri[], noCompile = false) {
   const toCompile: CurrentFile[] = [];
+  const rateLimiter = new RateLimiter(50);
   await Promise.allSettled<void>(
-    files.map(
-      throttleRequests((uri: vscode.Uri) => {
+    files.map((uri) =>
+      rateLimiter.call(async () => {
         return vscode.workspace.fs
           .readFile(uri)
           .then((contentBytes) => {
@@ -661,7 +668,7 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     return;
   }
   // Filter out non-ISC files
-  uris = uris.filter((uri) => ["cls", "mac", "int", "inc"].includes(uri.path.split(".").pop().toLowerCase()));
+  uris = uris.filter(isClassOrRtn);
   if (uris.length == 0) {
     vscode.window.showErrorMessage("No classes or routines were selected.", "Dismiss");
     return;
@@ -711,9 +718,10 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     docs.map((e) => e.name)
   );
   // Import the files
+  const rateLimiter = new RateLimiter(50);
   return Promise.allSettled<string>(
-    docs.map(
-      throttleRequests((doc: { name: string; content: string; uri: vscode.Uri }) => {
+    docs.map((doc) =>
+      rateLimiter.call(async () => {
         // Allow importing over deployed classes since the XML import
         // command and SMP, terminal, and Studio imports allow it
         return importFileFromContent(doc.name, doc.content, api, false, true).then(() => {

src/commands/compile.ts

@@ -4,17 +4,19 @@ import { AtelierAPI } from "../api";
 import { config, explorerProvider, OBJECTSCRIPT_FILE_SCHEMA, schemas, workspaceState } from "../extension";
 import {
   currentFile,
-  currentFileFromContent,
   exportedUris,
   handleError,
+  isClassOrRtn,
   notNull,
   outputChannel,
+  RateLimiter,
   stringifyError,
-  throttleRequests,
   uriOfWorkspaceFolder,
+  workspaceFolderOfUri,
 } from "../utils";
 import { pickDocuments } from "../utils/documentPicker";
 import { NodeBase } from "../explorer/nodes";
+import { updateIndexForDocument } from "../utils/documentIndex";
 
 export function getCategory(fileName: string, addCategory: any | boolean): string {
   const fileExt = fileName.split(".").pop().toLowerCase();
@@ -99,28 +101,19 @@ async function exportFile(wsFolderUri: vscode.Uri, namespace: string, name: stri
       throw new Error("Received malformed JSON object from server fetching document");
     }
     const content = data.result.content;
-
-    // Local function to update local record of mtime
-    const recordMtime = async () => {
-      const contentString = Buffer.isBuffer(content) ? "" : content.join("\n");
-      const file = currentFileFromContent(fileUri, contentString);
-      const serverTime = Number(new Date(data.result.ts + "Z"));
-      await workspaceState.update(`${file.uniqueId}:mtime`, serverTime);
-    };
-    if (Buffer.isBuffer(content)) {
-      // This is a binary file
-      await vscode.workspace.fs.writeFile(fileUri, content);
-      exportedUris.push(fileUri.toString());
-      await recordMtime();
-      log("Success");
-    } else {
-      // This is a text file
-      const joinedContent = content.join("\n");
-      await vscode.workspace.fs.writeFile(fileUri, new TextEncoder().encode(joinedContent));
-      exportedUris.push(fileUri.toString());
-      await recordMtime();
-      log("Success");
+    await vscode.workspace.fs.writeFile(
+      fileUri,
+      Buffer.isBuffer(content) ? content : new TextEncoder().encode(content.join("\n"))
+    );
+    if (isClassOrRtn(fileUri)) {
+      // Update the document index
+      updateIndexForDocument(fileUri, undefined, undefined, content);
     }
+    exportedUris.push(fileUri.toString());
+    const ws = workspaceFolderOfUri(fileUri);
+    const mtime = Number(new Date(data.result.ts + "Z"));
+    if (ws) await workspaceState.update(`${ws}:${name}:mtime`, mtime > 0 ? mtime : undefined);
+    log("Success");
   } catch (error) {
     const errorStr = stringifyError(error);
     log(errorStr == "" ? "ERROR" : errorStr);
@@ -146,6 +139,7 @@ export async function exportList(files: string[], workspaceFolder: string, names
   const { atelier, folder, addCategory, map } = config("export", workspaceFolder);
   const root = wsFolderUri.fsPath + (folder.length ? path.sep + folder : "");
   outputChannel.show(true);
+  const rateLimiter = new RateLimiter(50);
   return vscode.window.withProgress(
     {
       title: `Exporting ${files.length == 1 ? files[0] : files.length + " documents"}`,
@@ -154,8 +148,8 @@ export async function exportList(files: string[], workspaceFolder: string, names
     },
     () =>
       Promise.allSettled<void>(
-        files.map(
-          throttleRequests((file: string) =>
+        files.map((file) =>
+          rateLimiter.call(() =>
             exportFile(wsFolderUri, namespace, file, getFileName(root, file, atelier, addCategory, map))
           )
         )

src/commands/export.ts

@@ -1,9 +1,8 @@
 import axios from "axios";
 import * as httpsModule from "https";
-
 import * as vscode from "vscode";
 import { AtelierAPI } from "../api";
-import { cspAppsForUri, handleError } from "../utils";
+import { handleError } from "../utils";
 import { iscIcon } from "../extension";
 
 interface WebviewMessage {
@@ -83,24 +82,6 @@ export class RESTDebugPanel {
       return;
     }
 
-    // Build the list of all non-CSP web apps
-    const cspWebApps: string[] = cspAppsForUri(openEditor.document.uri);
-    const allWebApps: string[] | null = await api
-      .actionQuery("CALL %CSP.Apps_CSPAppList()", [])
-      .then((data) => data.result.content.map((obj) => obj.AppUrl))
-      .catch((error) => {
-        handleError(error, "Failed to fetch the list of web applications from the server.");
-        return null;
-      });
-    if (allWebApps == null) {
-      return;
-    }
-    const restWebApps = allWebApps.filter((app) => !cspWebApps.includes(app));
-    if (restWebApps.length == 0) {
-      vscode.window.showErrorMessage("No REST web applications are configured in the server's namespace.", "Dismiss");
-      return;
-    }
-
     if (this.currentPanel !== undefined) {
       // Can only have one panel open at once
       if (!this.currentPanel._panel.visible) {
@@ -133,10 +114,10 @@ export class RESTDebugPanel {
     panel.iconPath = iscIcon;
 
     this._file = openEditor.document.uri;
-    this.currentPanel = new RESTDebugPanel(panel, webviewFolderUri, api, restWebApps);
+    this.currentPanel = new RESTDebugPanel(panel, webviewFolderUri, api);
   }
 
-  private constructor(panel: vscode.WebviewPanel, webviewFolderUri: vscode.Uri, api: AtelierAPI, webApps: string[]) {
+  private constructor(panel: vscode.WebviewPanel, webviewFolderUri: vscode.Uri, api: AtelierAPI) {
     this._panel = panel;
     const serverInfo = `${api.config.https ? "https" : "http"}://${api.config.host}:${api.config.port}${
       api.config.pathPrefix
@@ -153,12 +134,7 @@ export class RESTDebugPanel {
           vscode.Uri.joinPath(webviewFolderUri, "elements-1.6.3.js")
         )}"></script>
         <title>${RESTDebugPanel._viewTitle}</title>
-        <style>
-          .path-grid {
-            display: grid;
-            grid-template-columns: 1fr 20fr;
-            column-gap: 0.5rem;
-          }      
+        <style>     
           .component-container > * {
             margin: 0.5rem 0;
           }
@@ -168,15 +144,6 @@ export class RESTDebugPanel {
           vscode-tabs {
             display: contents;
           }
-          .path-grid-container {
-            display: flex;
-            flex-direction: row;
-            align-items: flex-start;
-            justify-content: flex-start;
-          }
-          #webApp {
-            max-width: 45vw;
-          }
           #button {
             margin-top: 0.5rem;
           }
@@ -198,15 +165,8 @@ export class RESTDebugPanel {
             <vscode-tab-header id="bodyTab">BODY</vscode-tab-header>
             <vscode-tab-panel id="methodPathView">
               <section class="component-container">
-                <p>
-                  Select a method for this request, then select the web application
-                  to use from the dropdown and enter the rest of the path in the input field
-                  next to the dropdown. 
-                </p>
-                <p>
-                  The connection information of the server definition
-                  is shown for clarity but it cannot be edited.
-                </p>
+                <p>Select a method for this request, then enter the path in the bottom input field.</p>
+                <p>The connection information of the server definition is shown, but it cannot be edited.</p>
                 <vscode-radio-group id="method" name="method">
                   <vscode-radio value="GET" name="method" checked>GET</vscode-radio>
                   <vscode-radio value="POST" name="method">POST</vscode-radio>
@@ -217,14 +177,7 @@ export class RESTDebugPanel {
                   <vscode-radio value="OPTIONS" name="method">OPTIONS</vscode-radio>
                 </vscode-radio-group>
                 <vscode-textfield readonly id="serverInfo"></vscode-textfield>
-                <section class="path-grid">
-                  <section class="path-grid-container">
-                    <vscode-single-select id="webApp" name="webApp" position="below"></vscode-single-select>
-                  </section>
-                  <section class="path-grid-container">
-                    <vscode-textfield id="path" name="path" placeholder="/path" pattern="^/.*$" required></vscode-textfield>
-                  </section>
-                </section>
+                <vscode-textfield id="path" name="path" placeholder="/path" pattern="^/.*$" required></vscode-textfield>
               </section>
             </vscode-tab-panel>
             <vscode-tab-panel id="headersView">
@@ -271,13 +224,12 @@ export class RESTDebugPanel {
           const bodyType = document.getElementById("bodyType");
           const bodyContent = document.getElementById("bodyContent");
           const button = document.getElementById("button");
-          const webApp = document.getElementById("webApp");
-          const formFields = [method, serverInfo, path, headersText, paramsText, bodyType, bodyContent, webApp];
+          const formFields = [method, serverInfo, path, headersText, paramsText, bodyType, bodyContent];
           const sendData = (submitted) => {
             const data = Object.fromEntries(new FormData(form));
             if (
               Object.keys(data).length == (formFields.length - 1) &&
-              data.webApp != "" && data.method != "" && data.bodyType != "" &&
+              data.method != "" && data.bodyType != "" &&
               (!submitted || (submitted && path.checkValidity()))
             ) {
               vscode.postMessage({
@@ -290,24 +242,7 @@ export class RESTDebugPanel {
           window.onmessage = (event) => {
             const data = event.data, currentVals = new FormData(form);
             formFields.forEach((field) => {
-              if (field.id == "webApp" && webApp.children.length == 0) {
-                // Create options and set the initial value
-                const initIdx = data.webApps.findIndex((e) => e == data.webApp) ?? 0;
-                data.webApps.forEach((webAppStr, idx) => {
-                  const option = document.createElement("vscode-option");
-                  option.innerText = webAppStr;
-                  option.setAttribute("value",webAppStr);
-                  if (idx == initIdx) {
-                    option.selected = true;
-                  }
-                  webApp.appendChild(option);
-                });
-                // Update width of dropdown
-                const longest = data.webApps.reduce((a,b) => a.length > b.length ? a : b);
-                const context = document.createElement("canvas").getContext("2d");
-                context.font = window.getComputedStyle(webApp,null).getPropertyValue("font");
-                webApp.style.width = Math.ceil(context.measureText(longest).width*(4/3)) + "px";
-              } else if (data[field.id] != undefined && currentVals.get(field.id) != data[field.id]) {
+              if (data[field.id] != undefined && currentVals.get(field.id) != data[field.id]) {
                 if (["method","bodyType"].includes(field.id)) {
                   // Check the correct radio
                   for (const c of field.children) {
@@ -341,7 +276,7 @@ export class RESTDebugPanel {
           // Bubble change events up to the form
           bodyContent.onchange = headersText.onchange = 
             paramsText.onchange = path.onchange = 
-            webApp.onchange = () => form.dispatchEvent(new Event("change"));
+            () => form.dispatchEvent(new Event("change"));
         </script>
 			</body>
 			</html>`;
@@ -460,7 +395,6 @@ export class RESTDebugPanel {
           // Restore the content
           this._panel.webview.postMessage({
             serverInfo,
-            webApps,
             ...RESTDebugPanel._cache,
           });
         }

src/commands/restDebugPanel.ts

@@ -101,6 +101,7 @@ import {
   cspApps,
   otherDocExts,
   getWsServerConnection,
+  isClassOrRtn,
   addWsServerRootFolderData,
 } from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
@@ -1232,7 +1233,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       return Promise.all(
         e.files
           .filter(notIsfs)
-          .filter((uri) => ["cls", "inc", "int", "mac"].includes(uri.path.split(".").pop().toLowerCase()))
+          .filter(isClassOrRtn)
           .map(async (uri) => {
             // Determine the file name
             const workspace = workspaceFolderOfUri(uri);

src/extension.ts

@@ -5,7 +5,7 @@ import { AtelierAPI } from "../api";
 
 import { getFileName } from "../commands/export";
 import { config, FILESYSTEM_SCHEMA, FILESYSTEM_READONLY_SCHEMA, OBJECTSCRIPT_FILE_SCHEMA } from "../extension";
-import { currentWorkspaceFolder, notIsfs, uriOfWorkspaceFolder } from "../utils";
+import { currentWorkspaceFolder, isClassOrRtn, notIsfs, uriOfWorkspaceFolder } from "../utils";
 import { getUrisForDocument } from "../utils/documentIndex";
 
 export function compareConns(
@@ -52,7 +52,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
     if (!notIsfs(wsFolder.uri)) return;
     const conf = vscode.workspace.getConfiguration("objectscript.export", wsFolder);
     const confFolder = conf.get("folder", "");
-    if (["cls", "mac", "int", "inc"].includes(name.split(".").pop().toLowerCase())) {
+    if (isClassOrRtn(name)) {
       // Use the document index to find the local URI
       const uris = getUrisForDocument(name, wsFolder);
       switch (uris.length) {