[mod] lib/custom

This commit is contained in:
Andy Bunce 2025-08-25 10:09:56 +01:00
parent 9f34c28efc
commit e894e9cf19
6 changed files with 27 additions and 32 deletions

View file

@ -10,12 +10,10 @@ services:
volumes: volumes:
- ./data:/srv/basex/data - ./data:/srv/basex/data
# - ./webapp/web.xml:/srv/basex/webapp/WEB-INF/web.xml # set websocket options 12.1+ # - ./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/lsp:/srv/basex/webapp/lsp
- ./webapp/static/clients:/srv/basex/webapp/static/clients - ./webapp/static/clients:/srv/basex/webapp/static/clients
# - ./jars:/srv/basex/lib/custom
# - ./repo:/srv/basex/repo # - ./repo:/srv/basex/repo
environment: environment:
- "SERVER_OPTS= " - "SERVER_OPTS= "

View file

@ -22,9 +22,11 @@
"scripts": { "scripts": {
"build": "rollup src/index.js -m true -f iife -o dist/cm6.bundle.js -p node-resolve,tla --output.name cm6", "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", "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-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", "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 . "
} }
} }

View file

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

View file

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

View file

@ -17,33 +17,27 @@
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand">XQuery 4.0 LSP client</a> <a class="navbar-brand">XQuery 4.0 LSP client</a>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" aria-current="page" href="#">Editor</a> <a class="nav-link active" aria-current="page" href="#">Editor</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#">Msgs</a> <a class="nav-link" href="#">Msgs</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/dba/logs" target="dba">Dba</a> <a class="nav-link" href="/dba/logs" target="dba">Dba</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a> <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li> </li>
</ul> </ul>
<button id="popcon" popovertarget="popConnect" class="btn btn-danger"> <button id="popcon" popovertarget="popConnect" class="btn btn-danger">
<i class="bi bi-router"></i> <i class="bi bi-router"></i>
</button> </button>
</div>
</nav>
<div class="row">
</div>
</div>
</div> </div>
</nav> </nav>
<div class="container-fluid"> <div class="container-fluid">
<div class="row " style="overflow:hidden"> <div class="row " style="overflow:hidden">
<div class="col-2"> <div class="col-2">
@ -130,7 +124,7 @@
</div> </div>
</dialog> </dialog>
<dialog id="popSettings" popover > <dialog id="popSettings" popover>
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">Editor configuration</h5> <h5 class="modal-title">Editor configuration</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>