Use query instead of index for class Deployed checks (intersystems-community#1054)

Author: isc-bsaviano

src/commands/compile.ts

@@ -17,6 +17,7 @@ import {
   currentFile,
   CurrentFile,
   currentFileFromContent,
+  isClassDeployed,
   notNull,
   outputChannel,
   throttleRequests,
@@ -73,8 +74,7 @@ export async function checkChangedOnServer(file: CurrentFile, force = false): Pr
 async function importFile(file: CurrentFile, ignoreConflict?: boolean, skipDeplCheck = false): Promise<any> {
   const api = new AtelierAPI(file.uri);
   if (file.name.split(".").pop().toLowerCase() === "cls" && !skipDeplCheck) {
-    const result = await api.actionIndex([file.name]);
-    if (result.result.content[0].content.depl) {
+    if (await isClassDeployed(file.name, api)) {
       vscode.window.showErrorMessage(`Cannot import ${file.name} because it is deployed on the server.`, "Dismiss");
       return Promise.reject();
     }

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -5,7 +5,13 @@ import { Directory } from "./Directory";
 import { File } from "./File";
 import { fireOtherStudioAction, OtherStudioAction } from "../../commands/studio";
 import { projectContentsFromUri, studioOpenDialogFromURI } from "../../utils/FileProviderUtil";
-import { notNull, outputChannel, redirectDotvscodeRoot, workspaceFolderOfUri } from "../../utils/index";
+import {
+  isClassDeployed,
+  notNull,
+  outputChannel,
+  redirectDotvscodeRoot,
+  workspaceFolderOfUri,
+} from "../../utils/index";
 import { config, workspaceState } from "../../extension";
 import { addIsfsFileToProject, modifyProject } from "../../commands/project";
 import { DocumentContentProvider } from "../DocumentContentProvider";
@@ -306,18 +312,16 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     // Use _lookup() instead of _lookupAsFile() so we send
     // our cached mtime with the GET /doc request if we have it
     return this._lookup(uri).then(
-      () => {
+      async () => {
         // Weirdly, if the file exists on the server we don't actually write its content here.
         // Instead we simply return as though we wrote it successfully.
         // The actual writing is done by our workspace.onDidSaveTextDocument handler.
         // But first check cases for which we should fail the write and leave the document dirty if changed.
         if (!csp && fileName.split(".").pop().toLowerCase() === "cls") {
           // Check if the class is deployed
-          api.actionIndex([fileName]).then((result) => {
-            if (result.result.content[0].content.depl) {
-              throw new Error("Cannot overwrite a deployed class");
-            }
-          });
+          if (await isClassDeployed(fileName, api)) {
+            throw new Error("Cannot overwrite a deployed class");
+          }
           // Check if the class name and file name match
           let clsname = "";
           const match = content.toString().match(/^[ \t]*Class[ \t]+(%?[\p{L}\d]+(?:\.[\p{L}\d]+)+)/imu);

src/utils/index.ts

@@ -551,6 +551,15 @@ export async function fileExists(file: vscode.Uri): Promise<boolean> {
   }
 }
 
+/** Check if class `cls` is Deployed in using server connection `api`. */
+export async function isClassDeployed(cls: string, api: AtelierAPI): Promise<boolean> {
+  return api
+    .actionQuery("SELECT Deployed FROM %Dictionary.ClassDefinition WHERE Name = ?", [
+      cls.slice(-4).toLowerCase() == ".cls" ? cls.slice(0, -4) : cls,
+    ])
+    .then((data) => data.result.content[0].Deployed > 0);
+}
+
 // ---------------------------------------------------------------------
 // Source: https://github.com/amsterdamharu/lib/blob/master/src/index.js