Merge branch 'release/1.0.1'

.gitlab-ci.yml

@@ -11,6 +11,7 @@ build-develop:
       - tags
   stage: build
   script:
+    - npm install
     - ant test
   artifacts:
     paths:
@@ -23,6 +24,7 @@ build-master:
   stage: build
   script:
     - cp master.build.properties local.build.properties
+    - npm install
     - ant test
   artifacts:
     paths:

build.properties

-project.name=https://lab.sub.uni-goettingen.de/restxqopenapi-develop
-project.version=1.0.0
+project.name=https://lab.sub.uni-goettingen.de/openapi4restxq-develop
+project.version=1.0.1
 project.title=OpenAPI for RESTXQ
 project.abbrev=openapi-develop
 project.processorversion=4.6.0

content/openapi.xqm

@@ -42,12 +42,16 @@ as map(*) {
     return
         $inspect
 
-  let $config := doc($target || "/openapi-config.xml")/*
-  let $repo := doc($target || "/repo.xml")/*
+  let $config-uri := $target || "/openapi-config.xml"
+  let $config := if(doc-available($config-uri))
+                then doc($config-uri)/*
+                let $config := if(doc-available($config-uri))
+              then doc($config-uri)/*
+              else doc( replace(system:get-module-load-path(), '^(xmldb:exist://)?(embedded-eXist-server)?(.+)$', '$3') || "/openapi-config.xml" )/*
   let $expath := doc($target || "/expath-pkg.xml")/*
   return
     map:merge((
-    map{"openapi": "3.0.1"},
+    map{"openapi": "3.0.2"},
     openapi:paths-object($module),
     openapi:servers-object($config/openapi:servers),
     openapi:info-object($expath, $repo, $config/openapi:info),

openapi.xq

@@ -14,9 +14,11 @@ declare option output:media-type "application/json";
 let $prepare := xmldb:get-child-resources("/db/apps/openapi/content")[. != "openapi.xqm"]
     ! exrest:register-module(xs:anyURI("/db/apps/openapi/content/" || .))
 
+(: locate the target path :)
+let $thisPath := replace(system:get-module-load-path(),
+'^(xmldb:exist://)?(embedded-eXist-server)?(.+)$', '$3')
+let $target := request:get-parameter("target", $thisPath)
 return
 
 (: prepare OpenAPI as map(*) :)
-openapi:main("/db/apps/openapi")
-
-(: ("paths")("/openapi-test/full/get/{param1}/{param2}.{format}") :)
+openapi:main($target)