pyret-embed 0.1.8 → 0.1.9

package/dist/build/web/js/cpo-main.jarr

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/build/web/js/cpo-main.jarr
-size: 39419095 bytes
-sha256: 463aeca97884e60038f806d6ace1f16095634fe41c3632d707fde19ef0697108
+size: 39425070 bytes
+sha256: e538bdded88d99cf1f4b5054ba82c446f75118fb31c768cfc3f7811cafbe648e

package/dist/build/web/js/cpo-main.jarr.js

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/build/web/js/cpo-main.jarr.js
-size: 39419095 bytes
-sha256: 463aeca97884e60038f806d6ace1f16095634fe41c3632d707fde19ef0697108
+size: 39425070 bytes
+sha256: e538bdded88d99cf1f4b5054ba82c446f75118fb31c768cfc3f7811cafbe648e

package/dist/build/web/js/cpo-main.jarr.min

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/build/web/js/cpo-main.jarr.min
-size: 36463335 bytes
-sha256: 4fac69dd8fa65ffa6118e45ae2fb72232f6f2336d7c8dd8de84c12d8c126e346
+size: 36467830 bytes
+sha256: 240e5f973fccc25df91da15592f0d665e9daa4e4dcc2cec6e0c165f8fef37bd8

package/dist/build/web/js/cpo-main.js

@@ -230,6 +230,8 @@
                 const realpath = window.MESSAGES.sendRpc('path', 'resolve', [info.path]);
                 realpath.then((realpath) => {
                   restarter.resume(`js-file://${realpath}`);
+                }, (err) => {
+                  restarter.error(runtime.ffi.makeMessageException("Error resolving import path: " + String(err)));
                 });
               });
             }
@@ -242,6 +244,8 @@
                 const realpath = window.MESSAGES.sendRpc('path', 'resolve', [info.path]);
                 realpath.then((realpath) => {
                   restarter.resume(`file://${realpath}`);
+                }, (err) => {
+                  restarter.error(runtime.ffi.makeMessageException("Error resolving import path: " + String(err)));
                 });
               });
             }
@@ -341,30 +345,45 @@
                         return fileLocatorConstructor.makeFileLocator(info.path);
                       case "local-if-present":
                         return runtime.pauseStack(async (restarter) => {
-                          const exists = await fsInternal.exists(info.path);
+                          // This callback is async, so anything it throws is a
+                          // rejected promise nobody looks at; catch it here or
+                          // the run never resumes.
+                          let exists;
+                          try {
+                            exists = await fsInternal.exists(info.path);
+                          }
+                          catch(err) {
+                            restarter.error(runtime.isObject(err) ? err
+                              : runtime.ffi.makeMessageException("Error checking for local file " + JSON.stringify(info.path) + ": " + String(err)));
+                            return;
+                          }
                           if(exists) {
                             fsInternal.readFile(info.path).then((contents) => {
                               const strContents = Buffer.from(contents).toString('utf8');
                               CPO.documents.set(fullUrl, new CodeMirror.Doc(strContents, "pyret"));
                             });
-                            return runtime.runThunk(() => {
-                              var fileLocatorConstructor = fileLocator.makeFileLocatorConstructor(window.MESSAGES.sendRpc, runtime, compileLib, compileStructs, parsePyret, builtinModules, cpo);
-                              return fileLocatorConstructor.makeFileLocator(info.path);
-                            }, (result) => {
-                              if(runtime.isSuccessResult(result)) {
-                                restarter.resume(result.result);
-                              }
-                              else {
-                                restarter.error(result.error);
-                              }
-                            });
                           }
                           else {
                             fetch(fullUrl).then(async (response) => {
                               CPO.documents.set(fullUrl, new CodeMirror.Doc(await response.text(), "pyret"));
                             });
-                            return restarter.resume(runtime.getField(runtime.getField(urlLoc, "values"), "url-locator").app(fullUrl, replGlobals));
                           }
+                          return runtime.runThunk(() => {
+                            if(exists) {
+                              var fileLocatorConstructor = fileLocator.makeFileLocatorConstructor(window.MESSAGES.sendRpc, runtime, compileLib, compileStructs, parsePyret, builtinModules, cpo);
+                              return fileLocatorConstructor.makeFileLocator(info.path);
+                            }
+                            else {
+                              return runtime.getField(runtime.getField(urlLoc, "values"), "url-locator").app(fullUrl, replGlobals);
+                            }
+                          }, (result) => {
+                            if(runtime.isSuccessResult(result)) {
+                              restarter.resume(result.result);
+                            }
+                            else {
+                              restarter.error(result.exn);
+                            }
+                          });
                         });
                     }
 

package/dist/build/web/js/file-locator.js

@@ -67,6 +67,14 @@ define("cpo/file-locator", [], function() {
     var gmf = function(m, f) { return gf(gf(m, "values"), f); };
 
 
+    // Every RPC here runs under a paused stack, so a rejected RPC has to
+    // become restarter.error -- otherwise the run waits forever, silently.
+    function rpcFailed(restarter, what) {
+      return function(err) {
+        restarter.error(runtime.ffi.makeMessageException(what + ": " + String(err)));
+      };
+    }
+
     function makeFileLocator(path) {
       return runtime.pauseStack((restarter) => {
         const realpath = sendRpc('path', 'resolve', [path]);
@@ -89,10 +97,14 @@ define("cpo/file-locator", [], function() {
                     return ast; 
                   }, "file-locator:parse-contents");
                 }, function(result) {
-                  console.log("Result from getModule runThunk: ", result);
-                  restarter.resume(result.result);
+                  if(runtime.isSuccessResult(result)) {
+                    restarter.resume(result.result);
+                  }
+                  else {
+                    restarter.error(result.exn);
+                  }
                 });
-              });
+              }, rpcFailed(restarter, "Could not read file " + JSON.stringify(path)));
             });
           }
 
@@ -166,7 +178,7 @@ define("cpo/file-locator", [], function() {
             "set-compiled": m2(setCompiled),
             "get-compiled": m1(function() { return runtime.ffi.makeNone(); })
           }));
-        });
+        }, rpcFailed(restarter, "Could not resolve file path " + JSON.stringify(path)));
       });
     }