upstream merge

.github/workflows/actions.yml

@@ -0,0 +1,29 @@
+name: Run tests across emacs versions
+on: [push, pull_request]
+jobs:
+  test-emacs-versions:
+    strategy:
+      matrix:
+        emacs-version: [28, 29]
+    runs-on: ubuntu-latest
+    container: silex/emacs:${{matrix.emacs-version}}-ci-eask
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install test dependencies
+        run: eask install-deps --dev
+      - name: Run tests
+        run: eask run script test
+  lint:
+    runs-on: ubuntu-latest
+    container: silex/emacs:29-ci-eask
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install test dependencies
+        run: eask install-deps --dev
+      - name: Run linters
+        run: eask lint declare --strict

.gitignore

@@ -0,0 +1,2 @@
+*.elc
+.eask

Eask

@@ -0,0 +1,21 @@
+(package "js-comint"
+         "1.2.0"
+         "JavaScript interpreter in window.")
+
+(website-url "https://github.com/redguardtoo/js-comint")
+(keywords "javascript" "node" "inferior-mode" "convenience")
+
+(package-file "js-comint.el")
+
+(script "test" "eask test ert test/*tests.el")
+
+(source "gnu")
+(source "melpa")
+
+(depends-on "emacs" "28.1")
+
+(development
+ (depends-on "el-mock")
+ (depends-on "nvm")
+ (depends-on "company")
+ (depends-on "ert-async"))

README.org

@@ -1,4 +1,4 @@
-* js-comint.el (v0.0.5)
+* js-comint.el (v1.2.0)
 Run a JavaScript interpreter in an inferior process window
 
 The first release, [[http://js-comint-el.sourceforge.net/][js-comint 0.0.1, is hosted on sourceforge]] but it has not been updated for five years.
@@ -36,16 +36,35 @@ Add js-comint to your Cask file:
 (depends-on "js-comint")
 #+END_SRC
 
+** Windows
+On window, you may need below setup:
+#+begin_src elisp
+(setq js-comint-program-command "C:/Program Files/nodejs/node.exe")
+#+end_src
 * Usage
 After installation, do `M-x run-js` to create a comint buffer with the JavaScript interpreter.
 
+Please note the directory =node_modules= is *automatically* searched and appended into environment variable `NODE_PATH'. So you can use third party javascript without setup. For example, after =npm install --save moment=, run below command in js-comint shell,
+#+begin_src javascript
+require('moment')().format('YYYY-MM-DD');
+#+end_src
+
+You can =M-x js-clear= before =M-x js-send-buffer= to get clean output.
+
+In order to get cleaner output when using NodeJS, I suggest add below setup into =.emacs=,
+#+begin_src elisp
+(defun inferior-js-mode-hook-setup ()
+  (add-hook 'comint-output-filter-functions 'js-comint-process-output))
+(add-hook 'inferior-js-mode-hook 'inferior-js-mode-hook-setup t)
+#+end_src
 * Customization
-You can set the `inferior-js-program-command' string and the `inferior-js-program-arguments' list to the executable that runs the JS interpreter and the arguments to pass to it respectively.
+You can set the `js-comint-program-command' string and the `js-comint-program-arguments' list to the executable that runs the JS interpreter and the arguments to pass to it respectively.
 
 E.g., the default is:
 #+BEGIN_SRC elisp
-(setq inferior-js-program-command "node")
-(setq inferior-js-program-arguments '("--interactive"))
+;; You can also customize `js-comint-drop-regexp' to filter output
+(setq js-comint-program-command "node")
+(setq js-comint-program-arguments '("--interactive"))
 #+END_SRC
 
 Note that in the example above, the version of node that is picked up will be the first found in `exec-path'.
@@ -54,8 +73,8 @@ But you could use Rhino or SpiderMonkey or whatever you want.
 E.g. to set up the Rhino JAR downloaded from https://github.com/mozilla/rhino, do
 
 #+BEGIN_SRC elisp
-(setq inferior-js-program-command "java")
-(setq inferior-js-program-arguments '("-jar" "/absolute/path/to/rhino/js.jar"))
+(setq js-comint-program-command "java")
+(setq js-comint-program-arguments '("-jar" "/absolute/path/to/rhino/js.jar"))
 #+END_SRC
 
 If you have nvm, you can select the versions of node.js installed and run them. This is done thanks to =nvm.el=. =nvm.el= is optional. So you need *manually* install it.
@@ -65,16 +84,12 @@ To enable nvm support, run
 (js-do-use-nvm)
 #+END_SRC
 
-The first time you start the JS interpreter with run-js, you will be asked to select a version of node.js. If you want to change version of node js, run `(js-select-node-version)`
+The first time you start the JS interpreter with run-js, you will be asked to select a version of node.js. If you want to change version of node js, run ~(js-select-node-version)~.
 
-You can add the following couple of lines to your .emacs to take advantage of cool key bindings for sending things to the javascript interpreter inside of Steve Yegge's most excellent js2-mode.
+You can add the following couple of lines to your .emacs/init file to take advantage of key bindings for sending things to the JavaScript REPL: 
 
 #+BEGIN_SRC elisp
-(add-hook 'js2-mode-hook
-          (lambda ()
-            (local-set-key (kbd "C-x C-e") 'js-send-last-sexp)
-            (local-set-key (kbd "C-M-x") 'js-send-last-sexp-and-go)
-            (local-set-key (kbd "C-c b") 'js-send-buffer)
-            (local-set-key (kbd "C-c C-b") 'js-send-buffer-and-go)
-            (local-set-key (kbd "C-c l") 'js-load-file-and-go)))
-#+END_SRC
+  ; Remap Elisp's eval-last-sexp (C-x C-e) to eval JavaScript
+  (define-key js-mode-map [remap eval-last-sexp] #'js-comint-send-last-sexp))
+  (define-key js-mode-map (kbd "C-c b") 'js-send-buffer))
+#+END_SRC