@algorandfoundation/puya-ts 1.0.1 → 1.0.2-beta.2

package/README.md

@@ -15,3 +15,4 @@ Algorand TypeScript is compiled for execution on the AVM by PuyaTs, a TypeScript
 - [CLI Guide](https://algorandfoundation.github.io/puya-ts/documents/Compiler_CLI_Guide.html)
 - [Contribution Guide](CONTRIBUTING.md)
 - [Releases Notes](https://github.com/algorandfoundation/puya-ts/releases)
+- [Migration Guides to 1.0.1](https://algorandfoundation.github.io/puya-ts/documents/Algorand_TypeScript_Migration_Guides.html)

package/bin/puyats-ls.mjs

@@ -14,6 +14,7 @@ import fs__default from 'fs';
 import require$$3 from 'child_process';
 import { L as LogLevel, k as distinct, C as Constants, I as InternalError, l as logger, a as LoggingContext, n as isIn, o as LogSource, z as zipStrict, r as resolvePuyaPath } from '../resolve-puya-path-LGppZCBg.js';
 import EventEmitter from 'node:events';
+import { globSync } from 'glob';
 import 'arcsecond';
 import 'node:fs';
 import 'pathe';
@@ -25,7 +26,6 @@ import 'node:url';
 import 'cross-spawn';
 import 'change-case';
 import 'polytype';
-import 'glob';
 import 'minimatch';
 import 'chalk';
 import 'signal-exit';
@@ -11400,6 +11400,39 @@ function logCaughtExpression(e) {
     }
 }
 
+function normalisedUri(args) {
+    if ('fsPath' in args) {
+        const resolvedFileName = globSync(args.fsPath, { absolute: true })[0];
+        return URI.file(resolvedFileName ?? args.fsPath);
+    }
+    else {
+        const filePath = URI.parse(args.uri).fsPath;
+        return normalisedUri({ fsPath: filePath });
+    }
+}
+function createNormalisedTextDocumentConnection(connection) {
+    return {
+        onDidOpenTextDocument(handler) {
+            return connection.onDidOpenTextDocument((params) => handler({ textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }));
+        },
+        onDidChangeTextDocument(handler) {
+            return connection.onDidChangeTextDocument((params) => handler({ ...params, textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }));
+        },
+        onDidCloseTextDocument(handler) {
+            return connection.onDidCloseTextDocument((params) => handler({ textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }));
+        },
+        onWillSaveTextDocument(handler) {
+            return connection.onWillSaveTextDocument((params) => handler({ ...params, textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }));
+        },
+        onWillSaveTextDocumentWaitUntil(handler) {
+            return connection.onWillSaveTextDocumentWaitUntil((params, edits) => handler({ ...params, textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }, edits));
+        },
+        onDidSaveTextDocument(handler) {
+            return connection.onDidSaveTextDocument((params) => handler({ textDocument: { ...params.textDocument, uri: normalisedUri({ uri: params.textDocument.uri }).toString() } }));
+        },
+    };
+}
+
 let CompileWorker = (() => {
     let _instanceExtraInitializers = [];
     let _stop_decorators;
@@ -11437,17 +11470,16 @@ let CompileWorker = (() => {
                     try {
                         const work = this.queue.tryDequeue();
                         if (work) {
-                            switch (work.type) {
-                                case 'workspace':
-                                    this.activeBuild = new AbortController();
-                                    await this.compileWorkspaces(work, this.activeBuild.signal);
-                                    delete this.activeBuild;
-                                    break;
-                            }
+                            logger.debug(undefined, `[Compile Worker] Found work ${work.workspaces.join(', ')}`);
+                            this.activeBuild = new AbortController();
+                            await this.compileWorkspaces(work, this.activeBuild.signal);
+                            delete this.activeBuild;
                         }
                         else {
+                            logger.debug(undefined, `[Compile Worker] No work, sleeping`);
                             this.sleeping = Promise.withResolvers();
                             await this.sleeping.promise;
+                            delete this.sleeping;
                         }
                     }
                     catch (e) {
@@ -11463,8 +11495,14 @@ let CompileWorker = (() => {
             await this.stopped.promise;
         }
         onCompileTriggerQueueItemQueued() {
-            this.activeBuild?.abort('Build has been superseded');
-            this.sleeping?.resolve();
+            if (this.activeBuild) {
+                logger.debug(undefined, `[Compile Worker] New work, aborting active build`);
+                this.activeBuild.abort('Build has been superseded');
+            }
+            else if (this.sleeping) {
+                logger.debug(undefined, `[Compile Worker] New work, waking worker`);
+                this.sleeping.resolve();
+            }
         }
         async compileWorkspaces(workspaceTrigger, abortSignal) {
             logger.debug(undefined, `[Workspace Compile] \n${workspaceTrigger.workspaces.join('\n')}`);
@@ -11489,7 +11527,7 @@ let CompileWorker = (() => {
                 sourceFileProvider({ readFile, fileExists }) {
                     return {
                         readFile(fileName) {
-                            const fileUri = URI.file(fileName).toString();
+                            const fileUri = normalisedUri({ fsPath: fileName }).toString();
                             const doc = documents.get(fileUri);
                             if (doc) {
                                 documentVersions[fileUri] = doc.version;
@@ -11498,7 +11536,7 @@ let CompileWorker = (() => {
                             return readFile(fileName);
                         },
                         fileExists(fileName) {
-                            const fileUri = URI.file(fileName).toString();
+                            const fileUri = normalisedUri({ fsPath: fileName }).toString();
                             return Boolean(documents.get(fileUri)) || fileExists(fileName);
                         },
                     };
@@ -11659,7 +11697,7 @@ let PuyaLanguageServer = (() => {
             connection.onShutdown(this.shutdown.bind(this));
         }
         start() {
-            this.documents.listen(this.connection);
+            this.documents.listen(createNormalisedTextDocumentConnection(this.connection));
             this.connection.listen();
             this.compileWorker.start();
         }
@@ -11670,7 +11708,7 @@ let PuyaLanguageServer = (() => {
             logger.debug(undefined, '[PuyaLanguageServer] Shutdown');
         }
         initialize(params) {
-            this.workspaceFolders.push(...(params.workspaceFolders?.map((f) => f.uri) ?? []));
+            this.workspaceFolders.push(...(params.workspaceFolders?.map((f) => normalisedUri({ uri: f.uri }).toString()) ?? []));
             this.triggers.enqueue({
                 type: 'workspace',
                 workspaces: this.workspaceFolders,
@@ -11699,8 +11737,9 @@ let PuyaLanguageServer = (() => {
         documentDidChangeContent(params) {
             if (this.stopping)
                 return;
-            logger.debug(undefined, `[Document Changed]: ${params.document.uri}`);
-            this.diagnosticsMgr.setDiagnostics({ fileUri: params.document.uri, version: params.document.version, diagnostics: 'pending' });
+            const normalizedDocumentUri = normalisedUri({ uri: params.document.uri }).toString();
+            logger.debug(undefined, `[Document Changed]: ${normalizedDocumentUri}`);
+            this.diagnosticsMgr.setDiagnostics({ fileUri: normalizedDocumentUri, version: params.document.version, diagnostics: 'pending' });
             this.triggers.enqueue({
                 type: 'workspace',
                 workspaces: this.workspaceFolders,