[mod] lib/custom

compose.yaml

@@ -10,12 +10,10 @@ services:
     volumes:
       - ./data:/srv/basex/data
 #     - ./webapp/web.xml:/srv/basex/webapp/WEB-INF/web.xml # set websocket options 12.1+
-      - ./bundles/grammar/xq4.jar:/srv/basex/lib/custom/xq4.jar
+      - ./webapp/custom:/srv/basex/lib/custom  # jars
       - ./webapp/lsp:/srv/basex/webapp/lsp 
       - ./webapp/static/clients:/srv/basex/webapp/static/clients
 
-
-#      - ./jars:/srv/basex/lib/custom
 #      - ./repo:/srv/basex/repo
     environment:
       - "SERVER_OPTS= "

package.json

@@ -22,9 +22,11 @@
   "scripts": {
     "build": "rollup src/index.js -m true -f iife -o dist/cm6.bundle.js -p node-resolve,tla --output.name cm6",
     "build-cm": "rollup bundles/src/lsp.js -m true -f iife -o webapp/static/clients/codemirror/lsp.bundle.js -p node-resolve,tla --output.name lsp",
+
     "min-cm": "cd webapp/static/clients/codemirror && npx minify lsp.bundle.js > lsp.bundle.min.js ",
+    
     "min": "cd dist && npx minify cm6.bundle.js > cm6.bundle.min.js && npx minify lsp.bundle.js > lsp.bundle.min.js",
     
-    "javac":"cd bundles/grammar && javac -cp %BASEX12%\\BaseX.jar -d build xq4.java && cd build && jar cf ../xq4.jar . "
+    "javac":"cd bundles/grammar && javac -cp %BASEX12%\\BaseX.jar -d build xq4.java && cd build && jar cf ../../../webapp/custom/xq4.jar . "
   }
 }

scripts/rex.xq

@@ -5,6 +5,7 @@ declare function local:resolve($path as xs:string)
 as xs:string{
   file:resolve-path($path,file:base-dir())
 };
+
 declare function local:rex($ebnf,$opts as map(*))
 {
 let $xq:= qform:post-form(map:put($opts,"@input",$ebnf),$REX)

test/position-tests.xqm

@@ -59,6 +59,6 @@ declare %unit:test function test:apply-change() {
 33333333`
     let $ch:= {"text":`11111111,
 A22222222,
-33333333`};
-pos:apply-change($text,$ch)
-    
+33333333`}
+return pos:apply-change($text,$ch)
+};    

webapp/static/clients/codemirror/index.html

@@ -36,14 +36,8 @@
             </button>
         </div>
     </nav>
-            <div class="row">
 
 
-            </div>
-        </div>
-        </div>
-    </nav>
-
     <div class="container-fluid">
         <div class="row " style="overflow:hidden">
             <div class="col-2">
@@ -130,7 +124,7 @@
         </div>
     </dialog>
 
-    <dialog id="popSettings" popover >
+    <dialog id="popSettings" popover>
         <div class="modal-header">
             <h5 class="modal-title">Editor configuration</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>