From fccf4b9d6b5228e0003d1dc96387eab376ccaa90 Mon Sep 17 00:00:00 2001 From: Peter Verhas Date: Sat, 11 May 2024 20:54:27 +0200 Subject: [PATCH] 2.6.1-SNAPSHOT --- .mvn/extensions.xml | 4 +- BUILTIN.adoc | 6 +- README.adoc | 8 +- README.jrf | 2 +- documentation/JAMAL_API.adoc | 2 +- documentation/SAMPLE_README.adoc | 2 +- documentation/TUTORIAL-5min.adoc | 2 +- documentation/macros/require.adoc | 6 +- install-asciidoc.sh | 2 +- jamal-all/README.adoc | 2 +- jamal-all/pom.xml | 4 +- jamal-api/pom.xml | 4 +- jamal-asciidoc/README.adoc | 24 +++--- jamal-asciidoc/install-asciidoc.sh | 2 +- jamal-asciidoc/pom.xml | 6 +- jamal-asciidoc258/pom.xml | 4 +- jamal-assertions/README.adoc | 4 +- jamal-assertions/pom.xml | 10 +-- jamal-cmd/pom.xml | 4 +- jamal-core/pom.xml | 4 +- jamal-debug-ui/build/asset-manifest.json | 6 +- jamal-debug-ui/build/index.html | 2 +- jamal-debug-ui/package.json | 2 +- jamal-debug/pom.xml | 4 +- .../src/main/resources/ui/asset-manifest.json | 6 +- jamal-debug/src/main/resources/ui/index.html | 2 +- ...bb8b83.chunk.js => main.d1fd25da.chunk.js} | 4 +- jamal-doclet/README.adoc | 6 +- jamal-doclet/pom.xml | 4 +- jamal-engine/pom.xml | 4 +- jamal-extensions/pom.xml | 4 +- jamal-groovy/README.adoc | 8 +- jamal-groovy/pom.xml | 8 +- jamal-io/README.adoc | 4 +- jamal-io/pom.xml | 8 +- jamal-jamal/README.adoc | 2 +- jamal-jamal/pom.xml | 6 +- jamal-jar-input/pom.xml | 4 +- jamal-java/pom.xml | 6 +- jamal-json/README.adoc | 2 +- jamal-json/pom.xml | 4 +- jamal-kotlin-testsupport/pom.xml | 4 +- jamal-kotlin/pom.xml | 4 +- jamal-markdown/README.adoc | 8 +- jamal-markdown/pom.xml | 4 +- jamal-maven-extension/README.adoc | 4 +- jamal-maven-extension/pom.xml | 36 ++++----- jamal-maven-input/pom.xml | 4 +- jamal-maven-load/pom.xml | 6 +- jamal-maven-plugin/README.adoc | 6 +- jamal-maven-plugin/pom.xml | 4 +- jamal-mock/pom.xml | 8 +- jamal-openai/pom.xml | 12 +-- jamal-prog/README.adoc | 2 +- jamal-prog/pom.xml | 10 +-- jamal-ruby/README.adoc | 8 +- jamal-ruby/pom.xml | 4 +- jamal-scriptbasic/README.adoc | 8 +- jamal-scriptbasic/pom.xml | 10 +-- jamal-snippet/README.adoc | 34 ++++----- jamal-snippet/THINXML.adoc | 32 ++++---- jamal-snippet/pom.xml | 4 +- jamal-sql/demodb.mv.db | Bin 20480 -> 20480 bytes jamal-sql/pom.xml | 12 +-- jamal-test/pom.xml | 4 +- jamal-testsupport/pom.xml | 4 +- jamal-tools/pom.xml | 4 +- jamal-word/README.adoc | 2 +- jamal-word/pom.xml | 4 +- .../src/test/resources/demoConverted.docx | Bin 12782 -> 12792 bytes .../test/resources/includetestConverted.docx | Bin 34572 -> 34572 bytes .../src/test/resources/pictureConverted.docx | Bin 21869 -> 21869 bytes .../src/test/resources/sampleConverted.docx | Bin 40811 -> 40815 bytes jamal-yaml/README.adoc | 2 +- jamal-yaml/pom.xml | 4 +- jamal.sh | 40 +++++----- pom.xml | 72 +++++++++--------- version.jim | 2 +- 78 files changed, 281 insertions(+), 279 deletions(-) rename jamal-debug/src/main/resources/ui/static/js/{main.a4bb8b83.chunk.js => main.d1fd25da.chunk.js} (93%) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index af6bd6f7..143c4c3b 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,11 +1,11 @@ com.javax0.jamal jamal-maven-extension - 2.5.0 + 2.6.0 \ No newline at end of file diff --git a/BUILTIN.adoc b/BUILTIN.adoc index ef53d439..4f9978c8 100644 --- a/BUILTIN.adoc +++ b/BUILTIN.adoc @@ -38,7 +38,7 @@ You need the following dependency in your project: com.javax0.jamal jamal-api - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -50,7 +50,7 @@ In later versions, when we will do a bit more in our macros we will also need th com.javax0.jamal jamal-tools - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -107,7 +107,7 @@ To use the test support library, you have to add the dependency to your `pom.xml com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test ---- diff --git a/README.adoc b/README.adoc index 6163da9b..374d981d 100644 --- a/README.adoc +++ b/README.adoc @@ -52,7 +52,9 @@ TOC |image:{jamal_home}actions/workflows/jamal-build.yml/badge.svg[Java CI with Maven,link={jamal_home}actions/workflows/jamal-build.yml] |=== - +NOTE: This is the latest development documentation. +To see the documentation of a release, you have to follow the link in the documentation link:RELEASES.adoc[`RELEASES.adoc`]. +If you want to read the latest release, please visit link:{jamal_home}/tree/v2.5.0[Jamal2.5.0] @@ -85,7 +87,7 @@ Having that, you can issue the command: [source] ---- -mvn com.javax0.jamal:jamal-maven-plugin:2.6.0:jamal +mvn com.javax0.jamal:jamal-maven-plugin:2.6.1-SNAPSHOT:jamal ---- if you have a `pom.xml` file in your directory. @@ -108,7 +110,7 @@ Create a `.mvn` directory with an `extensions.xml` file in your project root. com.javax0.jamal jamal-maven-extension - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/README.jrf b/README.jrf index cea01f95..af1e03b1 100644 --- a/README.jrf +++ b/README.jrf @@ -1,5 +1,5 @@ # This is a Jamal reference file containing serialized base64 encoded macros -# Created: 2024-05-11 15:20:33 +0200 +# Created: 2024-05-11 20:51:45 +0200 # id|openStr|closeStr|verbatim|tailParameter|pure|content|parameters # TOC VE9D|eyU=|JX0=|0|0|0|Ci4gPDxJbnN0YWxsYXRpb24+PgouIDw8R1M+PgouIDw8Q29uZmlndXJhdGlvbj4+Ci4gPDxGZWF0dXJlcz4+Ci4gPDxDb250cmlidXRpbmc+PgouIDw8RG9jdW1lbnRhdGlvbj4+Ci4gPDxMaWNlbnNlPj4KLiA8PENoYW5nZWxvZz4+Ci4gPDxSb2FkbWFwPj4KLiA8PFN1cHBvcnQ+PgouIDw8RkFRPj4KLiA8PE1haW50ZW5hbmNlPj4=| diff --git a/documentation/JAMAL_API.adoc b/documentation/JAMAL_API.adoc index 81b8bbce..ce47e8e1 100644 --- a/documentation/JAMAL_API.adoc +++ b/documentation/JAMAL_API.adoc @@ -11,7 +11,7 @@ If you use Maven, you can simply have com.javax0.jamal jamal-engine - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/documentation/SAMPLE_README.adoc b/documentation/SAMPLE_README.adoc index bd689683..e0ea7dd7 100644 --- a/documentation/SAMPLE_README.adoc +++ b/documentation/SAMPLE_README.adoc @@ -4,6 +4,6 @@ How to use Jamal in five minutes. -This is a sample readme of the version `2.6.0`. +This is a sample readme of the version `2.6.1-SNAPSHOT`. diff --git a/documentation/TUTORIAL-5min.adoc b/documentation/TUTORIAL-5min.adoc index 9a8030f5..f0cb6bb1 100644 --- a/documentation/TUTORIAL-5min.adoc +++ b/documentation/TUTORIAL-5min.adoc @@ -62,7 +62,7 @@ The result, processed by Jamal finally is: How to use Jamal in five minutes. -This is a sample readme of the version `2.6.0`. +This is a sample readme of the version `2.6.1-SNAPSHOT`. diff --git a/documentation/macros/require.adoc b/documentation/macros/require.adoc index c5e7c4bf..d07e06a9 100644 --- a/documentation/macros/require.adoc +++ b/documentation/macros/require.adoc @@ -48,7 +48,7 @@ will result .output [source] ---- -The current version 2.6 is older than the required version. It has to be newer. +The current version 2.6.1-SNAPSHOT is older than the required version. It has to be newer. ---- @@ -72,11 +72,11 @@ will result in .output [source] ---- -This documentation was processed using the version 2.6.0 +This documentation was processed using the version 2.6.1-SNAPSHOT ---- NOTE: In the documentation of Jamal (this document and other modules) we do not use this macro. The documentation is about the version of Jamal, which is the source code and not the one running. They may be different. -The version of the documented code is in the `pom.xml` file: `2.6.0`. +The version of the documented code is in the `pom.xml` file: `2.6.1-SNAPSHOT`. diff --git a/install-asciidoc.sh b/install-asciidoc.sh index 8bc20fae..3824d7a8 100755 --- a/install-asciidoc.sh +++ b/install-asciidoc.sh @@ -13,7 +13,7 @@ pushd .asciidoctor/lib echo "removing all old files" rm -f * echo "unzipping the libraries from the local maven repo" -unzip ~/.m2/repository/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip >/dev/null +unzip ~/.m2/repository/com/javax0/jamal/jamal-asciidoc/2.6.1-SNAPSHOT/jamal-asciidoc-2.6.1-SNAPSHOT-jamal-asciidoc-distribution.zip >/dev/null echo "cd back to Jamal main project directory" popd echo "Restart IntelliJ, then you have the new version" diff --git a/jamal-all/README.adoc b/jamal-all/README.adoc index 872489a9..09bc2b43 100644 --- a/jamal-all/README.adoc +++ b/jamal-all/README.adoc @@ -15,7 +15,7 @@ The solution is to have a JAR project that has all the needed dependencies and a com.javax0.jamal jamal-all - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-all/pom.xml b/jamal-all/pom.xml index e1fb0476..0a1be44b 100644 --- a/jamal-all/pom.xml +++ b/jamal-all/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal all jamal-all - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT empty jar with dependencies on all macro libraries diff --git a/jamal-api/pom.xml b/jamal-api/pom.xml index bb42a214..4cac01b7 100644 --- a/jamal-api/pom.xml +++ b/jamal-api/pom.xml @@ -4,11 +4,11 @@ jamal api jar jamal-api - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library API interfaces diff --git a/jamal-asciidoc/README.adoc b/jamal-asciidoc/README.adoc index c8808f83..c3cc0f59 100644 --- a/jamal-asciidoc/README.adoc +++ b/jamal-asciidoc/README.adoc @@ -5,7 +5,7 @@ Use Jamal in IntelliJ or AsciidocFX interactively with AsciiDoc utilizing the As image:images/splash.png[width=100%] -This document is the readme file for the Jamal Asciidoc extension version `2.6.0`. +This document is the readme file for the Jamal Asciidoc extension version `2.6.1-SNAPSHOT`. == Introduction @@ -43,19 +43,19 @@ This preprocessor works for any JetBrains IDE that supports the Asciidoctor plug === Manual installation -To use the plugin together with the IntelliJ Asciidoc plugin, you need the file `jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip`. +To use the plugin together with the IntelliJ Asciidoc plugin, you need the file `jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip`. You can download this file from the central Maven repository using the URLs: -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.asc[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.asc``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.asc[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.asc``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.md5[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.md5``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.md5[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.md5``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.sha1[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.sha1``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.sha1[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.sha1``] The ZIP file contains all the JAR files, the `.asc`, `.md5` and `.sha1` files are standard checksum files to check the integrity of the archive. @@ -66,11 +66,11 @@ Extract the content of this zip file into your projects `.Asciidoctor/lib` folde If you have JBang or Jamal command line version, you can ask Jamal itself to install the extension. To do that, execute the command - jbang jamal@verhas -jamalize version=2.6.0 + jbang jamal@verhas -jamalize version=2.5.0 or, if you installed Jamal so that you can start it from the command line as `jamal`: - jamal -jamalize version=2.6.0 + jamal -jamalize version=2.5.0 This command will install the extension into the `.Asciidoctor/lib` directory under the current directory. If you omit the `version` parameter, then the version of the installing Jamal will be used. @@ -131,13 +131,13 @@ Asciidoctor itself is writen in Ruby, and it mistakenly thinks so is everything The installation for AsciidocFX needs to copy all the JAR files downloadable from Maven central -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.asc[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.asc``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.asc[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.asc``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.md5[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.md5``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.md5[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.md5``] -https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.sha1[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip.sha1``] +https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.sha1[``https://repo.maven.apache.org/maven2/com/javax0/jamal/jamal-asciidoc/2.5.0/jamal-asciidoc-2.5.0-jamal-asciidoc-distribution.zip.sha1``] into the `lib` directory of your AsciidocFX installation. It is diff --git a/jamal-asciidoc/install-asciidoc.sh b/jamal-asciidoc/install-asciidoc.sh index 13688f0a..ddb0d7d3 100755 --- a/jamal-asciidoc/install-asciidoc.sh +++ b/jamal-asciidoc/install-asciidoc.sh @@ -13,7 +13,7 @@ pushd ../.asciidoctor/lib echo "removing all old files" rm -f * echo "unzipping the libraries from the local maven repo" -unzip ~/.m2/repository/com/javax0/jamal/jamal-asciidoc/2.6.0/jamal-asciidoc-2.6.0-jamal-asciidoc-distribution.zip >/dev/null +unzip ~/.m2/repository/com/javax0/jamal/jamal-asciidoc/2.6.1-SNAPSHOT/jamal-asciidoc-2.6.1-SNAPSHOT-jamal-asciidoc-distribution.zip >/dev/null echo "cd back to jamal-asciidoc project directory" popd echo "Restart IntelliJ, then you have the new version" diff --git a/jamal-asciidoc/pom.xml b/jamal-asciidoc/pom.xml index afc25ba1..10235375 100644 --- a/jamal-asciidoc/pom.xml +++ b/jamal-asciidoc/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal asciidoc jamal-asciidoc - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Asciidoc preprocessor extension @@ -130,7 +130,7 @@ com.javax0.jamal jamal-asciidoc258 - 2.6.0 + 2.6.1-SNAPSHOT org.junit.jupiter diff --git a/jamal-asciidoc258/pom.xml b/jamal-asciidoc258/pom.xml index d44c220b..b5b25798 100644 --- a/jamal-asciidoc258/pom.xml +++ b/jamal-asciidoc258/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal asciidoc258 jamal-asciidoc258 - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Asciidoc preprocessor extension diff --git a/jamal-assertions/README.adoc b/jamal-assertions/README.adoc index 6b7445a0..abe3f3bb 100644 --- a/jamal-assertions/README.adoc +++ b/jamal-assertions/README.adoc @@ -37,7 +37,7 @@ This version currently is .output [source] ---- -2.6.0 +2.6.1-SNAPSHOT ---- @@ -109,7 +109,7 @@ To do it as a Maven dependency use the following Maven coordinates: com.javax0.jamal jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-assertions/pom.xml b/jamal-assertions/pom.xml index b4be6012..540cdd1b 100644 --- a/jamal-assertions/pom.xml +++ b/jamal-assertions/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal assertions jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Assertions module for Jamal @@ -51,19 +51,19 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-cmd/pom.xml b/jamal-cmd/pom.xml index 1f0dd45f..25a7ca30 100644 --- a/jamal-cmd/pom.xml +++ b/jamal-cmd/pom.xml @@ -4,11 +4,11 @@ jamal command line jar jamal-cmd - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library command line interface diff --git a/jamal-core/pom.xml b/jamal-core/pom.xml index 29d05730..d8041216 100644 --- a/jamal-core/pom.xml +++ b/jamal-core/pom.xml @@ -4,11 +4,11 @@ jamal core jar jamal-core - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library built-in macros diff --git a/jamal-debug-ui/build/asset-manifest.json b/jamal-debug-ui/build/asset-manifest.json index 6215fc44..660e2279 100644 --- a/jamal-debug-ui/build/asset-manifest.json +++ b/jamal-debug-ui/build/asset-manifest.json @@ -1,8 +1,8 @@ { "files": { "main.css": "/static/css/main.8c61e705.chunk.css", - "main.js": "/static/js/main.a4bb8b83.chunk.js", - "main.js.map": "/static/js/main.a4bb8b83.chunk.js.map", + "main.js": "/static/js/main.d1fd25da.chunk.js", + "main.js.map": "/static/js/main.d1fd25da.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.7507aa8d.js", "runtime-main.js.map": "/static/js/runtime-main.7507aa8d.js.map", "static/css/2.b53b5f81.chunk.css": "/static/css/2.b53b5f81.chunk.css", @@ -19,6 +19,6 @@ "static/css/2.b53b5f81.chunk.css", "static/js/2.b1df29a1.chunk.js", "static/css/main.8c61e705.chunk.css", - "static/js/main.a4bb8b83.chunk.js" + "static/js/main.d1fd25da.chunk.js" ] } \ No newline at end of file diff --git a/jamal-debug-ui/build/index.html b/jamal-debug-ui/build/index.html index 0c12b74b..2a17cfee 100644 --- a/jamal-debug-ui/build/index.html +++ b/jamal-debug-ui/build/index.html @@ -1 +1 @@ -React App
\ No newline at end of file +React App
\ No newline at end of file diff --git a/jamal-debug-ui/package.json b/jamal-debug-ui/package.json index 93425a88..36db216d 100644 --- a/jamal-debug-ui/package.json +++ b/jamal-debug-ui/package.json @@ -1,6 +1,6 @@ { "name": "jamal-debug-ui", - "version": "2.6.0", + "version": "2.6.1-SNAPSHOT", "private": true, "dependencies": { "@material-ui/core": "^4.12.3", diff --git a/jamal-debug/pom.xml b/jamal-debug/pom.xml index 43fe4144..b7a103d9 100644 --- a/jamal-debug/pom.xml +++ b/jamal-debug/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal debug jamal-debug - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Debugger module for Jamal diff --git a/jamal-debug/src/main/resources/ui/asset-manifest.json b/jamal-debug/src/main/resources/ui/asset-manifest.json index 6215fc44..660e2279 100644 --- a/jamal-debug/src/main/resources/ui/asset-manifest.json +++ b/jamal-debug/src/main/resources/ui/asset-manifest.json @@ -1,8 +1,8 @@ { "files": { "main.css": "/static/css/main.8c61e705.chunk.css", - "main.js": "/static/js/main.a4bb8b83.chunk.js", - "main.js.map": "/static/js/main.a4bb8b83.chunk.js.map", + "main.js": "/static/js/main.d1fd25da.chunk.js", + "main.js.map": "/static/js/main.d1fd25da.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.7507aa8d.js", "runtime-main.js.map": "/static/js/runtime-main.7507aa8d.js.map", "static/css/2.b53b5f81.chunk.css": "/static/css/2.b53b5f81.chunk.css", @@ -19,6 +19,6 @@ "static/css/2.b53b5f81.chunk.css", "static/js/2.b1df29a1.chunk.js", "static/css/main.8c61e705.chunk.css", - "static/js/main.a4bb8b83.chunk.js" + "static/js/main.d1fd25da.chunk.js" ] } \ No newline at end of file diff --git a/jamal-debug/src/main/resources/ui/index.html b/jamal-debug/src/main/resources/ui/index.html index 0c12b74b..2a17cfee 100644 --- a/jamal-debug/src/main/resources/ui/index.html +++ b/jamal-debug/src/main/resources/ui/index.html @@ -1 +1 @@ -React App
\ No newline at end of file +React App
\ No newline at end of file diff --git a/jamal-debug/src/main/resources/ui/static/js/main.a4bb8b83.chunk.js b/jamal-debug/src/main/resources/ui/static/js/main.d1fd25da.chunk.js similarity index 93% rename from jamal-debug/src/main/resources/ui/static/js/main.a4bb8b83.chunk.js rename to jamal-debug/src/main/resources/ui/static/js/main.d1fd25da.chunk.js index 2f833c56..b6d5e230 100644 --- a/jamal-debug/src/main/resources/ui/static/js/main.a4bb8b83.chunk.js +++ b/jamal-debug/src/main/resources/ui/static/js/main.d1fd25da.chunk.js @@ -1,2 +1,2 @@ -(this["webpackJsonpjamal-debug-ui"]=this["webpackJsonpjamal-debug-ui"]||[]).push([[0],{102:function(e,t,s){},111:function(e,t,s){},115:function(e,t,s){},118:function(e,t,s){},152:function(e,t,s){},153:function(e,t,s){},155:function(e,t,s){},178:function(e,t,s){},188:function(e,t,s){"use strict";s.r(t);var r=s(0),a=s.n(r),l=s(24),n=s.n(l);s(152),s(153);let i={};var c=e=>{const t=r.useState;for(let s in e)[i[s],i["set"+s.charAt(0).toUpperCase()+s.slice(1)]]=t(e[s]);return i};var o=e=>i.showP?e.replaceAll("\n","\xb6\n"):e,d=s(1);const u=(e,t)=>{if(0===e.length)return Object(d.jsx)(d.Fragment,{});let s=e.split("\n");return Object(d.jsxs)(d.Fragment,{children:[s.slice(0,-1).map((e=>Object(d.jsxs)("span",{style:{color:t},children:[e,Object(d.jsx)("br",{})]}))),Object(d.jsx)("span",{style:{color:t},children:s[s.length-1]})]})};var j=e=>{let{text:t,macro:s=""}=e;const r=t.indexOf(s),a=r+s.length,l=o(-1===r?t:t.substr(0,r)),n=o(-1===r?"":s),i=o(-1===r?"":t.substr(a));return Object(d.jsxs)("div",{style:{overflow:"auto"},className:"Input_SourceCode",children:[u(l,"black"),u(n,"red"),u(i,"black")]})};var p=e=>{let{children:t,hidden:s,id:r,other:a=""}=e;return Object(d.jsx)("div",{role:"tabpanel",hidden:s,id:r,...a,children:t})};s(102);var h=e=>{let{caption:t,reference:s,backgroundColor:r="white",height:a=260}=e;return Object(d.jsxs)("div",{className:"SimpleTextInput_Caption",style:{backgroundColor:r},children:[Object(d.jsx)("div",{className:"textbox_caption",style:{backgroundColor:r},children:t}),Object(d.jsx)("textarea",{className:"SimpleTextInput_TextArea",ref:s,style:{backgroundColor:r,width:"99%",height:a},defaultValue:"",onChange:()=>{}})]})},b=s(223),v=s(225),x=s(228),O=s(226),m=s(75),g=s.n(m),f=s(76),y=s.n(f),w=s(132),C=s.n(w),S=s(133),A=s.n(S),L=s(134),k=s.n(L),R=s(135),T=s.n(R),N=s(222),E=s(224),M=s(128),_=s.n(M),B=s(121),D=s.n(B),I=s(127),P=s.n(I);const H=500,z="DISCONNECTED",F="BEFORE",J="AFTER",U="RUN";s(155);var V=e=>{let{message:t}=e;const s=Object(r.useMemo)((()=>{switch(t){case F:return Object(d.jsx)(D.a,{});case J:return Object(d.jsx)(P.a,{});case z:return Object(d.jsx)(_.a,{});case U:return Object(d.jsx)(g.a,{});default:return Object(d.jsx)(y.a,{})}}),[t]);return Object(d.jsx)(N.a,{className:"TitleBar",children:Object(d.jsxs)(b.a,{container:!0,direction:"row",alignItems:"flex-start",justify:"space-between",children:[Object(d.jsx)(b.a,{item:!0,children:"\xa0"}),Object(d.jsx)(b.a,{item:!0,children:Object(d.jsx)(E.a,{variant:"h6",className:"title",children:"Jamal Debug"})}),Object(d.jsxs)(b.a,{item:!0,children:[Object(d.jsxs)("span",{style:{fontSize:"8pt"},children:[t,"\xa0"]}),s]})]})})},q=s(64),W=s.n(q),Y=s(92);const Q=new class{constructor(){this.url="https://raw.githubusercontent.com/verhas/jamal/master/version.jim",this.lastRelease="",W.a.get(this.url).then((e=>{for(let t of(""+e.data).split("\n"))0===t.search(/{@define\sLAST_RELEASE=(.*)}/)&&(this.lastRelease=t.substring(22,t.length-1))}))}};var X=()=>{let e;return e=i.serverVersion===Y.version?"Version: "+i.serverVersion:"Server version: "+i.serverVersion+", Client version: "+Y.version,""===Q.lastRelease||Q.lastRelease===i.serverVersion&&Q.lastRelease===Y.version||(e+=", Latest release: "+Q.lastRelease),e},G=(s(111),s(229));s(99);var K=e=>{var t;let{data:s}=e,r=0,a=0;return Object(d.jsx)("div",{style:{height:"310px"},children:Object(d.jsx)("div",{style:{height:"620px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"lightyellow"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"lightyellow"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.HeaderCell,{style:{width:"30px"},children:"n"}),Object(d.jsx)(G.a.HeaderCell,{style:{width:"30px"},children:"L"}),Object(d.jsx)(G.a.HeaderCell,{style:{width:"100px"},children:"macro"})]},0)}),Object(d.jsx)(G.a.Body,{children:((null===s||void 0===s||null===(t=s.macros)||void 0===t?void 0:t.macros)||[]).map((e=>(a++,e.macros.map((e=>(r++,Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.Cell,{style:{width:30},children:r}),Object(d.jsx)(G.a.Cell,{style:{width:30},children:a}),Object(d.jsx)(G.a.Cell,{style:{width:"100%"},children:e})]},r)))))))})]})})})};s(178);var Z=e=>{var t;let{data:s,captionSetter:r,contentSetter:a}=e;const l=[];for(let d of(null===(n=s.userDefined)||void 0===n?void 0:n.scopes)||[]){var n;for(let e of d||[]){var i,c;l.push({name:e.id,params:null!==(i=null===(c=e.parameters)||void 0===c?void 0:c.join(","))&&void 0!==i?i:"",content:e.content})}}let o=0,u=0;return Object(d.jsx)("div",{style:{height:"310px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"#d2eaff"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"#d2eaff"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.HeaderCell,{children:"n"}),Object(d.jsx)(G.a.HeaderCell,{children:"L"}),Object(d.jsx)(G.a.HeaderCell,{children:"macro"}),Object(d.jsx)(G.a.HeaderCell,{children:"parameters"}),Object(d.jsx)(G.a.HeaderCell,{children:"body"})]},0)}),Object(d.jsx)(G.a.Body,{children:((null===s||void 0===s||null===(t=s.userDefined)||void 0===t?void 0:t.scopes)||[]).map((e=>(u++,e.map((e=>{var t,s,n;return o++,Object(d.jsxs)(G.a.Row,{onClick:(n=o-1,()=>{const e=l[n],t="{@define "+e.name+"("+e.params+")="+e.content+"}";r("macro definition"),a(t)}),warning:void 0===e.content,children:[Object(d.jsx)(G.a.Cell,{style:{width:30},children:o}),Object(d.jsx)(G.a.Cell,{style:{width:30},children:u}),Object(d.jsx)(G.a.Cell,{style:{width:100},children:e.id}),Object(d.jsx)(G.a.Cell,{style:{width:200,overflowX:"auto"},children:null!==(t=null===e||void 0===e||null===(s=e.parameters)||void 0===s?void 0:s.join(","))&&void 0!==t?t:""}),Object(d.jsx)(G.a.Cell,{style:{width:"100%"},children:void 0!==e.content?e.content:e.type})]},o)})))))})]})})},$=s(130),ee=s.n($);const te=new class{constructor(e){var t=this;let s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:8080;this.port=8080,this.host="localhost",this.connection=()=>"http://"+this.host+":"+this.port,this.post=function(e){let s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return W.a.post(t.connection()+e,s)},this.get=e=>W.a.get(this.connection()+e),this.run=e=>this.post("/run",e),this.step=()=>this.post("/step"),this.stepInto=()=>this.post("/stepInto"),this.stepOut=()=>this.post("/stepOut"),this.quit=()=>this.post("/quit"),this.execute=e=>this.post("/execute",e),this.all=e=>this.get("/all?"+e),this.host=e,this.port=s}}("localhost",8080),se=ee.a.parse(window.location.search.substring(1)),re=se.port?""+se.port:new URL(window.location.href).port;te.port=+re;var ae=te;const le=()=>{ae.all("level&errors&input&output&inputBefore&processing¯os&userDefined&state&output&version").then((e=>{const t=e.data;if(t){var s,r,a,l,n,c,o,d,u;const e=+t.level,j=i.inputBeforeArray.slice(0,e-1);j.push(t.inputBefore);const p=i.outputArray.slice(0,e-1);p[e-1]=t.output,i.setInputBeforeArray(j),i.setOutputArray(p),i.setDisplayedLevel(e),i.setInputBefore(null!==(s=t.inputBefore)&&void 0!==s?s:""),i.setInputAfter(null!==(r=t.input)&&void 0!==r?r:""),i.setMacro(null!==(a=t.processing)&&void 0!==a?a:""),i.setOutput(null!==(l=t.output)&&void 0!==l?l:""),i.setStateMessage(null!==(n=t.state)&&void 0!==n?n:""),i.setLevel(null!==(c=t.level)&&void 0!==c?c:""),i.setServerVersion(null!==(o=null===(d=t.version)||void 0===d?void 0:d.version)&&void 0!==o?o:"unknown");const h=null!==(u=t.errors)&&void 0!==u?u:[];if(!i.errors.length&&h.length&&!i.wasErrorAlerted){let[e,t]=1===h.length?["is an",""]:["are ".concat(h.length),"s"];alert("There ".concat(e," error").concat(t," in the Jamal source.\n\n")+h.join("\n")+"\n\nThis is a one time only alert. When there is an error the 'ERROR' tab is visible and the level counter is red."),i.setWasErrorAlerted(!0)}i.setErrors(h),i.setData(t)}else alert("Server response contained no data.")})).catch((e=>{var t;503===(null===(t=e.response)||void 0===t?void 0:t.status)?(i.setStateMessage(U),setTimeout(le,H)):(i.setStateMessage(z),i.setInputBefore(""),i.setMacro(""),i.setOutput(""),i.setData({}),setTimeout((()=>{if(i.stateMessage===z){window.confirm("Refresh the page to retry connecting to the Jamal debugger server.\nRefresh now?")&&window.location.reload()}}),5e3))}))};var ne=le;const ie=e=>{i.setStateMessage(U),e().then(ne).catch((t=>{var s;503===(null===(s=t.response)||void 0===s?void 0:s.status)?setTimeout((()=>ie(e)),H):setTimeout(ne,H)}))},ce=e=>{i.stateMessage===J?(i.setStateMessage(U),e().then((()=>ie(e))).catch((t=>{var s;503===(null===(s=t.response)||void 0===s?void 0:s.status)?setTimeout((()=>ce(e)),H):setTimeout(ne,H)}))):ie(e)},oe=()=>ce(ae.step),de=()=>ie(ae.step),ue=()=>ie(ae.stepInto),je=()=>ie(ae.stepOut),pe=()=>ie(ae.quit);s(115);var he=s(227);var be=e=>{let{onClick:t,caption:s,color:r="grey",disabled:a=!1,children:l,style:n={}}=e;return Object(d.jsx)(d.Fragment,{children:Object(d.jsxs)(he.a,{variant:"contained",onClick:t,color:r,disabled:a||i.stateMessage===U||i.stateMessage===z,style:n,children:[l,Object(d.jsx)("div",{style:{fontSize:"8pt"},children:s})]})})};s(118);var ve=()=>{let e="";return i.errors.length&&(e="RedAsError"),Object(d.jsxs)(d.Fragment,{children:[Object(d.jsxs)("div",{style:{display:"flex",flexDirection:"row",justifyContent:"left"},children:[Object(d.jsx)("div",{className:"LevelNumber ".concat(e),children:""+i.displayedLevel}),Object(d.jsxs)("div",{children:[Object(d.jsx)("div",{className:"LevelNumber LevelUpDown LevelUp",onClick:()=>{i.displayedLevel{i.displayedLevel>1&&(i.setDisplayedLevel(i.displayedLevel-1),i.setInputBefore(i.inputBeforeArray[i.displayedLevel-2]||""),i.setOutput(i.outputArray[i.displayedLevel-2]||""))},children:Object(d.jsx)("div",{className:"LevelUpDownLabel",children:"-"})})]})]}),Object(d.jsx)("div",{style:{fontSize:"8pt"},children:"source level"})]})};var xe=e=>{let{children:t,caption:s,color:r="white",height:a=260}=e;const l=o(""+t);return Object(d.jsxs)("div",{className:"SimpleTextInput_Caption",style:{backgroundColor:r},children:[Object(d.jsx)("div",{className:"textbox_caption",style:{backgroundColor:r},children:s}),Object(d.jsx)("textarea",{readOnly:!0,className:"SimpleTextInput_TextArea",value:l,style:{width:"99%",backgroundColor:r,height:a}})]})};var Oe=()=>Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(xe,{caption:i.resultCaption,children:i.evalOutput})});var me=()=>{const e=i.errors;let t=0;return Object(d.jsx)("div",{style:{height:"310px"},children:Object(d.jsx)("div",{style:{height:"620px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"whitesmoke"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"whitesmoke"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsx)(G.a.Row,{children:Object(d.jsx)(G.a.HeaderCell,{style:{width:"100px"},children:"Error Message"})},0)}),Object(d.jsx)(G.a.Body,{children:e.map((e=>(t++,Object(d.jsx)(G.a.Row,{children:Object(d.jsx)(G.a.Cell,{style:{width:"100%"},warning:!0,verticalAlign:"top",children:e})},t))))})]})})})};var ge=()=>{var e,t,s,a;c({data:{},inputBefore:"",inputAfter:"",inputBeforeArray:[],errors:[],macro:"",output:"",outputArray:[],level:"-",displayedLevel:0,evalOutput:"",savedEvalOutput:"",resultCaption:"no result",savedResultCaption:"no result",showP:!0,stateMessage:"",serverVersion:"unknown",currentTabStop:0,wasErrorAlerted:!1}),Object(r.useEffect)((()=>{document.title="Jamal Debugger",ne()}),[]);const l=Object(r.useRef)({value:""}),n=Object(r.useRef)({value:""}),o=Object(d.jsx)(b.a,{container:!0,direction:"column",children:Object(d.jsxs)(b.a,{container:!0,direction:"row",justify:"space-around",alignContent:"center",children:[Object(d.jsx)(be,{onClick:()=>i.setShowP(!i.showP),caption:i.showP?"hide":"show",children:"\xb6"}),Object(d.jsx)(be,{onClick:ne,caption:"Refresh",children:Object(d.jsx)(C.a,{})}),Object(d.jsx)(be,{onClick:()=>(e=>{var t;return ae.run(""+(null===e||void 0===e||null===(t=e.current)||void 0===t?void 0:t.value)).then(ne)})(n),caption:"Run",children:Object(d.jsx)(g.a,{})}),Object(d.jsx)(be,{onClick:de,caption:"Fetch",disabled:i.stateMessage===F,children:"{...}"}),Object(d.jsx)(be,{onClick:oe,caption:"Step",children:Object(d.jsx)(y.a,{})}),Object(d.jsx)(be,{onClick:ue,caption:"Step In",children:Object(d.jsx)(A.a,{})}),Object(d.jsx)(be,{onClick:je,caption:"Step out",children:Object(d.jsx)(k.a,{})})]})}),u=Object(d.jsxs)(d.Fragment,{children:[Object(d.jsx)(b.a,{item:!0,xs:6,children:o}),Object(d.jsx)(b.a,{item:!0,xs:3,children:Object(d.jsx)(ve,{})}),Object(d.jsx)(b.a,{container:!0,direction:"row",xs:3,justify:"space-around",alignItems:"flex-end",alignContent:"flex-end",children:Object(d.jsx)(be,{onClick:pe,caption:"Quit",color:"red",children:Object(d.jsx)(T.a,{})})})]}),m=Object(d.jsx)(v.a,{className:"App_Paper, App_MacroList",children:Object(d.jsx)(K,{data:i.data})}),f=Object(d.jsx)(v.a,{className:"App_Paper, App_MacroList",children:Object(d.jsx)(Z,{data:i.data,captionSetter:i.setResultCaption,contentSetter:i.setEvalOutput})}),w=Object(d.jsx)(b.a,{item:!0,xs:6,children:Object(d.jsxs)(v.a,{className:"App_Paper, run_input",children:[Object(d.jsx)("div",{style:{marginLeft:"5px",fontSize:"10pt",fontWeight:"bold"},children:"input"}),Object(d.jsx)(j,{text:i.stateMessage!==F?i.inputAfter:i.inputBefore,macro:i.stateMessage!==F?"":i.macro})]})}),S=Object(d.jsxs)(v.a,{className:"App_Paper",children:[Object(d.jsx)("div",{style:{marginLeft:"5px",fontSize:"10pt",fontWeight:"bold"},children:"output"}),Object(d.jsx)(j,{text:i.output})]}),L=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(h,{caption:"evaluate",reference:l})}),R=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(h,{caption:"breakpoints",reference:n,backgroundColor:"#ffe0e0",height:585})}),N=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(me,{})});return Object(d.jsx)("div",{className:"App",children:Object(d.jsxs)("header",{className:"App-header",children:[Object(d.jsx)(b.a,{container:!0,direction:"row",children:Object(d.jsx)(V,{message:i.stateMessage})}),Object(d.jsx)(b.a,{container:!0,direction:"row",children:u}),Object(d.jsxs)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:[w,Object(d.jsxs)(b.a,{item:!0,xs:6,children:[Object(d.jsxs)(x.a,{value:i.currentTabStop,onChange:(e,t)=>{var s;i.setCurrentTabStop(t),4!==t||null!==i&&void 0!==i&&null!==(s=i.errors)&&void 0!==s&&s.length?(2===i.currentTabStop&&(i.setSavedEvalOutput(i.evalOutput),i.setSavedResultCaption(i.resultCaption)),1===t&&i.setResultCaption("macro definition"),2===t&&(i.setEvalOutput(i.savedEvalOutput),i.setResultCaption(i.savedResultCaption))):i.setCurrentTabStop(i.currentTabStop)},className:"tab_panel",centered:!0,indicatorColor:"secondary",children:[Object(d.jsx)(O.a,{value:0,label:"built-in macros",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:1,label:"user defined",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:2,label:Object(d.jsx)(d.Fragment,{children:Object(d.jsx)(be,{onClick:()=>(e=>{var t;return ae.execute(""+(null===e||void 0===e||null===(t=e.current)||void 0===t?void 0:t.value)).then((e=>{if("object"!=typeof e.data){if(0===e.data.length){i.setEvalOutput("");const e="empty evaluation result";i.setResultCaption(e),i.setSavedEvalOutput(""),i.setSavedResultCaption(e)}else{const t=""+e.data,s="result";i.setEvalOutput(t),i.setResultCaption(s),i.setSavedEvalOutput(t),i.setSavedResultCaption(s)}document.title="Jamal Debugger"}else{var t,s;i.setEvalOutput((null===e||void 0===e||null===(t=e.data)||void 0===t?void 0:t.message)+"\n"+(null===e||void 0===e||null===(s=e.data)||void 0===s?void 0:s.trace)),i.setResultCaption("error result"),document.title="Jamal Debugger (e)"}ne()}))})(l),color:"blue",caption:"Evaluate",disabled:2!==i.currentTabStop||i.stateMessage===z,children:Object(d.jsx)(d.Fragment,{})})}),disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:3,label:"breakpoints",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:4,label:(null===i||void 0===i||null===(e=i.errors)||void 0===e?void 0:e.length)>0?"error".concat(1===(null===i||void 0===i||null===(t=i.errors)||void 0===t?void 0:t.length)?"":"s"," (").concat(null===i||void 0===i||null===(s=i.errors)||void 0===s?void 0:s.length,")"):"",disabled:!(null!==i&&void 0!==i&&null!==(a=i.errors)&&void 0!==a&&a.length)||i.stateMessage===z})]}),Object(d.jsx)(p,{id:"0",hidden:0!==i.currentTabStop,other:"",children:m}),Object(d.jsx)(p,{id:"1",hidden:1!==i.currentTabStop,other:"",children:f}),Object(d.jsx)(p,{id:"2",hidden:2!==i.currentTabStop,other:"",children:L}),Object(d.jsx)(p,{id:"3",hidden:3!==i.currentTabStop,other:"",children:R}),Object(d.jsx)(p,{id:"4",hidden:4!==i.currentTabStop,other:"",children:N})]})]}),Object(d.jsxs)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:[Object(d.jsx)(b.a,{item:!0,xs:6,children:S}),Object(d.jsx)(b.a,{item:!0,xs:6,children:1===i.currentTabStop||2===i.currentTabStop?Object(d.jsx)(Oe,{}):Object(d.jsx)(d.Fragment,{})})]}),Object(d.jsx)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:Object(d.jsx)(b.a,{item:!0,xs:12,children:Object(d.jsxs)("div",{className:"App_LicenseLine",children:["Peter Verhas 2021, Apache License 2.0, ",Object(d.jsx)("a",{href:"https://github.com/verhas/jamal",children:"https://github.com/verhas/jamal"}),", "+X()]})})})]})})};n.a.render(Object(d.jsx)(a.a.StrictMode,{children:Object(d.jsx)(ge,{})}),document.getElementById("root"))},92:function(e){e.exports=JSON.parse('{"name":"jamal-debug-ui","version":"2.6.0","private":true,"dependencies":{"@material-ui/core":"^4.12.3","@material-ui/data-grid":"*","@material-ui/icons":"^4.11.2","@material/tab-bar":"^13.0.0","@testing-library/jest-dom":"^5.15.0","@testing-library/react":"^12.1.2","@testing-library/user-event":"^13.5.0","@types/jest":"^27.0.3","@types/node":"^16.11.9","@types/react":"^17.0.35","@types/react-dom":"^17.0.11","axios":"^0.24.0","material-design-icons":"^3.0.1","qs":"^6.10.1","query-string":"^7.0.1","react":"^17.0.2","react-dom":"^17.0.2","react-scripts":"4.0.3","semantic-ui-css":"^2.4.1","semantic-ui-react":"^2.0.4","typescript":"^4.5.2","web-vitals":"^2.1.2"},"scripts":{"deploy":"./deployprod","start":"react-scripts --openssl-legacy-provider start","build":"react-scripts --openssl-legacy-provider build","test":"react-scripts --openssl-legacy-provider test","eject":"react-scripts --openssl-legacy-provider eject"},"eslintConfig":{"extends":["react-app","react-app/jest"]},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]}}')}},[[188,1,2]]]); -//# sourceMappingURL=main.a4bb8b83.chunk.js.map \ No newline at end of file +(this["webpackJsonpjamal-debug-ui"]=this["webpackJsonpjamal-debug-ui"]||[]).push([[0],{102:function(e,t,s){},111:function(e,t,s){},115:function(e,t,s){},118:function(e,t,s){},152:function(e,t,s){},153:function(e,t,s){},155:function(e,t,s){},178:function(e,t,s){},188:function(e,t,s){"use strict";s.r(t);var r=s(0),a=s.n(r),l=s(24),n=s.n(l);s(152),s(153);let i={};var c=e=>{const t=r.useState;for(let s in e)[i[s],i["set"+s.charAt(0).toUpperCase()+s.slice(1)]]=t(e[s]);return i};var o=e=>i.showP?e.replaceAll("\n","\xb6\n"):e,d=s(1);const u=(e,t)=>{if(0===e.length)return Object(d.jsx)(d.Fragment,{});let s=e.split("\n");return Object(d.jsxs)(d.Fragment,{children:[s.slice(0,-1).map((e=>Object(d.jsxs)("span",{style:{color:t},children:[e,Object(d.jsx)("br",{})]}))),Object(d.jsx)("span",{style:{color:t},children:s[s.length-1]})]})};var j=e=>{let{text:t,macro:s=""}=e;const r=t.indexOf(s),a=r+s.length,l=o(-1===r?t:t.substr(0,r)),n=o(-1===r?"":s),i=o(-1===r?"":t.substr(a));return Object(d.jsxs)("div",{style:{overflow:"auto"},className:"Input_SourceCode",children:[u(l,"black"),u(n,"red"),u(i,"black")]})};var p=e=>{let{children:t,hidden:s,id:r,other:a=""}=e;return Object(d.jsx)("div",{role:"tabpanel",hidden:s,id:r,...a,children:t})};s(102);var h=e=>{let{caption:t,reference:s,backgroundColor:r="white",height:a=260}=e;return Object(d.jsxs)("div",{className:"SimpleTextInput_Caption",style:{backgroundColor:r},children:[Object(d.jsx)("div",{className:"textbox_caption",style:{backgroundColor:r},children:t}),Object(d.jsx)("textarea",{className:"SimpleTextInput_TextArea",ref:s,style:{backgroundColor:r,width:"99%",height:a},defaultValue:"",onChange:()=>{}})]})},b=s(223),v=s(225),x=s(228),O=s(226),m=s(75),g=s.n(m),f=s(76),y=s.n(f),w=s(132),C=s.n(w),S=s(133),A=s.n(S),L=s(134),k=s.n(L),R=s(135),T=s.n(R),N=s(222),E=s(224),M=s(128),_=s.n(M),B=s(121),D=s.n(B),I=s(127),P=s.n(I);const H=500,z="DISCONNECTED",F="BEFORE",J="AFTER",U="RUN";s(155);var V=e=>{let{message:t}=e;const s=Object(r.useMemo)((()=>{switch(t){case F:return Object(d.jsx)(D.a,{});case J:return Object(d.jsx)(P.a,{});case z:return Object(d.jsx)(_.a,{});case U:return Object(d.jsx)(g.a,{});default:return Object(d.jsx)(y.a,{})}}),[t]);return Object(d.jsx)(N.a,{className:"TitleBar",children:Object(d.jsxs)(b.a,{container:!0,direction:"row",alignItems:"flex-start",justify:"space-between",children:[Object(d.jsx)(b.a,{item:!0,children:"\xa0"}),Object(d.jsx)(b.a,{item:!0,children:Object(d.jsx)(E.a,{variant:"h6",className:"title",children:"Jamal Debug"})}),Object(d.jsxs)(b.a,{item:!0,children:[Object(d.jsxs)("span",{style:{fontSize:"8pt"},children:[t,"\xa0"]}),s]})]})})},q=s(64),W=s.n(q),Y=s(92);const Q=new class{constructor(){this.url="https://raw.githubusercontent.com/verhas/jamal/master/version.jim",this.lastRelease="",W.a.get(this.url).then((e=>{for(let t of(""+e.data).split("\n"))0===t.search(/{@define\sLAST_RELEASE=(.*)}/)&&(this.lastRelease=t.substring(22,t.length-1))}))}};var X=()=>{let e;return e=i.serverVersion===Y.version?"Version: "+i.serverVersion:"Server version: "+i.serverVersion+", Client version: "+Y.version,""===Q.lastRelease||Q.lastRelease===i.serverVersion&&Q.lastRelease===Y.version||(e+=", Latest release: "+Q.lastRelease),e},G=(s(111),s(229));s(99);var K=e=>{var t;let{data:s}=e,r=0,a=0;return Object(d.jsx)("div",{style:{height:"310px"},children:Object(d.jsx)("div",{style:{height:"620px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"lightyellow"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"lightyellow"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.HeaderCell,{style:{width:"30px"},children:"n"}),Object(d.jsx)(G.a.HeaderCell,{style:{width:"30px"},children:"L"}),Object(d.jsx)(G.a.HeaderCell,{style:{width:"100px"},children:"macro"})]},0)}),Object(d.jsx)(G.a.Body,{children:((null===s||void 0===s||null===(t=s.macros)||void 0===t?void 0:t.macros)||[]).map((e=>(a++,e.macros.map((e=>(r++,Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.Cell,{style:{width:30},children:r}),Object(d.jsx)(G.a.Cell,{style:{width:30},children:a}),Object(d.jsx)(G.a.Cell,{style:{width:"100%"},children:e})]},r)))))))})]})})})};s(178);var Z=e=>{var t;let{data:s,captionSetter:r,contentSetter:a}=e;const l=[];for(let d of(null===(n=s.userDefined)||void 0===n?void 0:n.scopes)||[]){var n;for(let e of d||[]){var i,c;l.push({name:e.id,params:null!==(i=null===(c=e.parameters)||void 0===c?void 0:c.join(","))&&void 0!==i?i:"",content:e.content})}}let o=0,u=0;return Object(d.jsx)("div",{style:{height:"310px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"#d2eaff"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"#d2eaff"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsxs)(G.a.Row,{children:[Object(d.jsx)(G.a.HeaderCell,{children:"n"}),Object(d.jsx)(G.a.HeaderCell,{children:"L"}),Object(d.jsx)(G.a.HeaderCell,{children:"macro"}),Object(d.jsx)(G.a.HeaderCell,{children:"parameters"}),Object(d.jsx)(G.a.HeaderCell,{children:"body"})]},0)}),Object(d.jsx)(G.a.Body,{children:((null===s||void 0===s||null===(t=s.userDefined)||void 0===t?void 0:t.scopes)||[]).map((e=>(u++,e.map((e=>{var t,s,n;return o++,Object(d.jsxs)(G.a.Row,{onClick:(n=o-1,()=>{const e=l[n],t="{@define "+e.name+"("+e.params+")="+e.content+"}";r("macro definition"),a(t)}),warning:void 0===e.content,children:[Object(d.jsx)(G.a.Cell,{style:{width:30},children:o}),Object(d.jsx)(G.a.Cell,{style:{width:30},children:u}),Object(d.jsx)(G.a.Cell,{style:{width:100},children:e.id}),Object(d.jsx)(G.a.Cell,{style:{width:200,overflowX:"auto"},children:null!==(t=null===e||void 0===e||null===(s=e.parameters)||void 0===s?void 0:s.join(","))&&void 0!==t?t:""}),Object(d.jsx)(G.a.Cell,{style:{width:"100%"},children:void 0!==e.content?e.content:e.type})]},o)})))))})]})})},$=s(130),ee=s.n($);const te=new class{constructor(e){var t=this;let s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:8080;this.port=8080,this.host="localhost",this.connection=()=>"http://"+this.host+":"+this.port,this.post=function(e){let s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return W.a.post(t.connection()+e,s)},this.get=e=>W.a.get(this.connection()+e),this.run=e=>this.post("/run",e),this.step=()=>this.post("/step"),this.stepInto=()=>this.post("/stepInto"),this.stepOut=()=>this.post("/stepOut"),this.quit=()=>this.post("/quit"),this.execute=e=>this.post("/execute",e),this.all=e=>this.get("/all?"+e),this.host=e,this.port=s}}("localhost",8080),se=ee.a.parse(window.location.search.substring(1)),re=se.port?""+se.port:new URL(window.location.href).port;te.port=+re;var ae=te;const le=()=>{ae.all("level&errors&input&output&inputBefore&processing¯os&userDefined&state&output&version").then((e=>{const t=e.data;if(t){var s,r,a,l,n,c,o,d,u;const e=+t.level,j=i.inputBeforeArray.slice(0,e-1);j.push(t.inputBefore);const p=i.outputArray.slice(0,e-1);p[e-1]=t.output,i.setInputBeforeArray(j),i.setOutputArray(p),i.setDisplayedLevel(e),i.setInputBefore(null!==(s=t.inputBefore)&&void 0!==s?s:""),i.setInputAfter(null!==(r=t.input)&&void 0!==r?r:""),i.setMacro(null!==(a=t.processing)&&void 0!==a?a:""),i.setOutput(null!==(l=t.output)&&void 0!==l?l:""),i.setStateMessage(null!==(n=t.state)&&void 0!==n?n:""),i.setLevel(null!==(c=t.level)&&void 0!==c?c:""),i.setServerVersion(null!==(o=null===(d=t.version)||void 0===d?void 0:d.version)&&void 0!==o?o:"unknown");const h=null!==(u=t.errors)&&void 0!==u?u:[];if(!i.errors.length&&h.length&&!i.wasErrorAlerted){let[e,t]=1===h.length?["is an",""]:["are ".concat(h.length),"s"];alert("There ".concat(e," error").concat(t," in the Jamal source.\n\n")+h.join("\n")+"\n\nThis is a one time only alert. When there is an error the 'ERROR' tab is visible and the level counter is red."),i.setWasErrorAlerted(!0)}i.setErrors(h),i.setData(t)}else alert("Server response contained no data.")})).catch((e=>{var t;503===(null===(t=e.response)||void 0===t?void 0:t.status)?(i.setStateMessage(U),setTimeout(le,H)):(i.setStateMessage(z),i.setInputBefore(""),i.setMacro(""),i.setOutput(""),i.setData({}),setTimeout((()=>{if(i.stateMessage===z){window.confirm("Refresh the page to retry connecting to the Jamal debugger server.\nRefresh now?")&&window.location.reload()}}),5e3))}))};var ne=le;const ie=e=>{i.setStateMessage(U),e().then(ne).catch((t=>{var s;503===(null===(s=t.response)||void 0===s?void 0:s.status)?setTimeout((()=>ie(e)),H):setTimeout(ne,H)}))},ce=e=>{i.stateMessage===J?(i.setStateMessage(U),e().then((()=>ie(e))).catch((t=>{var s;503===(null===(s=t.response)||void 0===s?void 0:s.status)?setTimeout((()=>ce(e)),H):setTimeout(ne,H)}))):ie(e)},oe=()=>ce(ae.step),de=()=>ie(ae.step),ue=()=>ie(ae.stepInto),je=()=>ie(ae.stepOut),pe=()=>ie(ae.quit);s(115);var he=s(227);var be=e=>{let{onClick:t,caption:s,color:r="grey",disabled:a=!1,children:l,style:n={}}=e;return Object(d.jsx)(d.Fragment,{children:Object(d.jsxs)(he.a,{variant:"contained",onClick:t,color:r,disabled:a||i.stateMessage===U||i.stateMessage===z,style:n,children:[l,Object(d.jsx)("div",{style:{fontSize:"8pt"},children:s})]})})};s(118);var ve=()=>{let e="";return i.errors.length&&(e="RedAsError"),Object(d.jsxs)(d.Fragment,{children:[Object(d.jsxs)("div",{style:{display:"flex",flexDirection:"row",justifyContent:"left"},children:[Object(d.jsx)("div",{className:"LevelNumber ".concat(e),children:""+i.displayedLevel}),Object(d.jsxs)("div",{children:[Object(d.jsx)("div",{className:"LevelNumber LevelUpDown LevelUp",onClick:()=>{i.displayedLevel{i.displayedLevel>1&&(i.setDisplayedLevel(i.displayedLevel-1),i.setInputBefore(i.inputBeforeArray[i.displayedLevel-2]||""),i.setOutput(i.outputArray[i.displayedLevel-2]||""))},children:Object(d.jsx)("div",{className:"LevelUpDownLabel",children:"-"})})]})]}),Object(d.jsx)("div",{style:{fontSize:"8pt"},children:"source level"})]})};var xe=e=>{let{children:t,caption:s,color:r="white",height:a=260}=e;const l=o(""+t);return Object(d.jsxs)("div",{className:"SimpleTextInput_Caption",style:{backgroundColor:r},children:[Object(d.jsx)("div",{className:"textbox_caption",style:{backgroundColor:r},children:s}),Object(d.jsx)("textarea",{readOnly:!0,className:"SimpleTextInput_TextArea",value:l,style:{width:"99%",backgroundColor:r,height:a}})]})};var Oe=()=>Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(xe,{caption:i.resultCaption,children:i.evalOutput})});var me=()=>{const e=i.errors;let t=0;return Object(d.jsx)("div",{style:{height:"310px"},children:Object(d.jsx)("div",{style:{height:"620px",width:"100%",marginTop:"10px",overflowY:"auto",backgroundColor:"whitesmoke"},children:Object(d.jsxs)(G.a,{celled:!0,size:"small",sortable:!0,striped:!0,style:{fontSize:"12px",backgroundColor:"whitesmoke"},children:[Object(d.jsx)(G.a.Header,{children:Object(d.jsx)(G.a.Row,{children:Object(d.jsx)(G.a.HeaderCell,{style:{width:"100px"},children:"Error Message"})},0)}),Object(d.jsx)(G.a.Body,{children:e.map((e=>(t++,Object(d.jsx)(G.a.Row,{children:Object(d.jsx)(G.a.Cell,{style:{width:"100%"},warning:!0,verticalAlign:"top",children:e})},t))))})]})})})};var ge=()=>{var e,t,s,a;c({data:{},inputBefore:"",inputAfter:"",inputBeforeArray:[],errors:[],macro:"",output:"",outputArray:[],level:"-",displayedLevel:0,evalOutput:"",savedEvalOutput:"",resultCaption:"no result",savedResultCaption:"no result",showP:!0,stateMessage:"",serverVersion:"unknown",currentTabStop:0,wasErrorAlerted:!1}),Object(r.useEffect)((()=>{document.title="Jamal Debugger",ne()}),[]);const l=Object(r.useRef)({value:""}),n=Object(r.useRef)({value:""}),o=Object(d.jsx)(b.a,{container:!0,direction:"column",children:Object(d.jsxs)(b.a,{container:!0,direction:"row",justify:"space-around",alignContent:"center",children:[Object(d.jsx)(be,{onClick:()=>i.setShowP(!i.showP),caption:i.showP?"hide":"show",children:"\xb6"}),Object(d.jsx)(be,{onClick:ne,caption:"Refresh",children:Object(d.jsx)(C.a,{})}),Object(d.jsx)(be,{onClick:()=>(e=>{var t;return ae.run(""+(null===e||void 0===e||null===(t=e.current)||void 0===t?void 0:t.value)).then(ne)})(n),caption:"Run",children:Object(d.jsx)(g.a,{})}),Object(d.jsx)(be,{onClick:de,caption:"Fetch",disabled:i.stateMessage===F,children:"{...}"}),Object(d.jsx)(be,{onClick:oe,caption:"Step",children:Object(d.jsx)(y.a,{})}),Object(d.jsx)(be,{onClick:ue,caption:"Step In",children:Object(d.jsx)(A.a,{})}),Object(d.jsx)(be,{onClick:je,caption:"Step out",children:Object(d.jsx)(k.a,{})})]})}),u=Object(d.jsxs)(d.Fragment,{children:[Object(d.jsx)(b.a,{item:!0,xs:6,children:o}),Object(d.jsx)(b.a,{item:!0,xs:3,children:Object(d.jsx)(ve,{})}),Object(d.jsx)(b.a,{container:!0,direction:"row",xs:3,justify:"space-around",alignItems:"flex-end",alignContent:"flex-end",children:Object(d.jsx)(be,{onClick:pe,caption:"Quit",color:"red",children:Object(d.jsx)(T.a,{})})})]}),m=Object(d.jsx)(v.a,{className:"App_Paper, App_MacroList",children:Object(d.jsx)(K,{data:i.data})}),f=Object(d.jsx)(v.a,{className:"App_Paper, App_MacroList",children:Object(d.jsx)(Z,{data:i.data,captionSetter:i.setResultCaption,contentSetter:i.setEvalOutput})}),w=Object(d.jsx)(b.a,{item:!0,xs:6,children:Object(d.jsxs)(v.a,{className:"App_Paper, run_input",children:[Object(d.jsx)("div",{style:{marginLeft:"5px",fontSize:"10pt",fontWeight:"bold"},children:"input"}),Object(d.jsx)(j,{text:i.stateMessage!==F?i.inputAfter:i.inputBefore,macro:i.stateMessage!==F?"":i.macro})]})}),S=Object(d.jsxs)(v.a,{className:"App_Paper",children:[Object(d.jsx)("div",{style:{marginLeft:"5px",fontSize:"10pt",fontWeight:"bold"},children:"output"}),Object(d.jsx)(j,{text:i.output})]}),L=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(h,{caption:"evaluate",reference:l})}),R=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(h,{caption:"breakpoints",reference:n,backgroundColor:"#ffe0e0",height:585})}),N=Object(d.jsx)(v.a,{className:"App_Paper, App_Eval",children:Object(d.jsx)(me,{})});return Object(d.jsx)("div",{className:"App",children:Object(d.jsxs)("header",{className:"App-header",children:[Object(d.jsx)(b.a,{container:!0,direction:"row",children:Object(d.jsx)(V,{message:i.stateMessage})}),Object(d.jsx)(b.a,{container:!0,direction:"row",children:u}),Object(d.jsxs)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:[w,Object(d.jsxs)(b.a,{item:!0,xs:6,children:[Object(d.jsxs)(x.a,{value:i.currentTabStop,onChange:(e,t)=>{var s;i.setCurrentTabStop(t),4!==t||null!==i&&void 0!==i&&null!==(s=i.errors)&&void 0!==s&&s.length?(2===i.currentTabStop&&(i.setSavedEvalOutput(i.evalOutput),i.setSavedResultCaption(i.resultCaption)),1===t&&i.setResultCaption("macro definition"),2===t&&(i.setEvalOutput(i.savedEvalOutput),i.setResultCaption(i.savedResultCaption))):i.setCurrentTabStop(i.currentTabStop)},className:"tab_panel",centered:!0,indicatorColor:"secondary",children:[Object(d.jsx)(O.a,{value:0,label:"built-in macros",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:1,label:"user defined",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:2,label:Object(d.jsx)(d.Fragment,{children:Object(d.jsx)(be,{onClick:()=>(e=>{var t;return ae.execute(""+(null===e||void 0===e||null===(t=e.current)||void 0===t?void 0:t.value)).then((e=>{if("object"!=typeof e.data){if(0===e.data.length){i.setEvalOutput("");const e="empty evaluation result";i.setResultCaption(e),i.setSavedEvalOutput(""),i.setSavedResultCaption(e)}else{const t=""+e.data,s="result";i.setEvalOutput(t),i.setResultCaption(s),i.setSavedEvalOutput(t),i.setSavedResultCaption(s)}document.title="Jamal Debugger"}else{var t,s;i.setEvalOutput((null===e||void 0===e||null===(t=e.data)||void 0===t?void 0:t.message)+"\n"+(null===e||void 0===e||null===(s=e.data)||void 0===s?void 0:s.trace)),i.setResultCaption("error result"),document.title="Jamal Debugger (e)"}ne()}))})(l),color:"blue",caption:"Evaluate",disabled:2!==i.currentTabStop||i.stateMessage===z,children:Object(d.jsx)(d.Fragment,{})})}),disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:3,label:"breakpoints",disabled:i.stateMessage===z}),Object(d.jsx)(O.a,{value:4,label:(null===i||void 0===i||null===(e=i.errors)||void 0===e?void 0:e.length)>0?"error".concat(1===(null===i||void 0===i||null===(t=i.errors)||void 0===t?void 0:t.length)?"":"s"," (").concat(null===i||void 0===i||null===(s=i.errors)||void 0===s?void 0:s.length,")"):"",disabled:!(null!==i&&void 0!==i&&null!==(a=i.errors)&&void 0!==a&&a.length)||i.stateMessage===z})]}),Object(d.jsx)(p,{id:"0",hidden:0!==i.currentTabStop,other:"",children:m}),Object(d.jsx)(p,{id:"1",hidden:1!==i.currentTabStop,other:"",children:f}),Object(d.jsx)(p,{id:"2",hidden:2!==i.currentTabStop,other:"",children:L}),Object(d.jsx)(p,{id:"3",hidden:3!==i.currentTabStop,other:"",children:R}),Object(d.jsx)(p,{id:"4",hidden:4!==i.currentTabStop,other:"",children:N})]})]}),Object(d.jsxs)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:[Object(d.jsx)(b.a,{item:!0,xs:6,children:S}),Object(d.jsx)(b.a,{item:!0,xs:6,children:1===i.currentTabStop||2===i.currentTabStop?Object(d.jsx)(Oe,{}):Object(d.jsx)(d.Fragment,{})})]}),Object(d.jsx)(b.a,{container:!0,direction:"row",spacing:2,style:{width:"100%"},justify:"space-around",children:Object(d.jsx)(b.a,{item:!0,xs:12,children:Object(d.jsxs)("div",{className:"App_LicenseLine",children:["Peter Verhas 2021, Apache License 2.0, ",Object(d.jsx)("a",{href:"https://github.com/verhas/jamal",children:"https://github.com/verhas/jamal"}),", "+X()]})})})]})})};n.a.render(Object(d.jsx)(a.a.StrictMode,{children:Object(d.jsx)(ge,{})}),document.getElementById("root"))},92:function(e){e.exports=JSON.parse('{"name":"jamal-debug-ui","version":"2.6.1-SNAPSHOT","private":true,"dependencies":{"@material-ui/core":"^4.12.3","@material-ui/data-grid":"*","@material-ui/icons":"^4.11.2","@material/tab-bar":"^13.0.0","@testing-library/jest-dom":"^5.15.0","@testing-library/react":"^12.1.2","@testing-library/user-event":"^13.5.0","@types/jest":"^27.0.3","@types/node":"^16.11.9","@types/react":"^17.0.35","@types/react-dom":"^17.0.11","axios":"^0.24.0","material-design-icons":"^3.0.1","qs":"^6.10.1","query-string":"^7.0.1","react":"^17.0.2","react-dom":"^17.0.2","react-scripts":"4.0.3","semantic-ui-css":"^2.4.1","semantic-ui-react":"^2.0.4","typescript":"^4.5.2","web-vitals":"^2.1.2"},"scripts":{"deploy":"./deployprod","start":"react-scripts --openssl-legacy-provider start","build":"react-scripts --openssl-legacy-provider build","test":"react-scripts --openssl-legacy-provider test","eject":"react-scripts --openssl-legacy-provider eject"},"eslintConfig":{"extends":["react-app","react-app/jest"]},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]}}')}},[[188,1,2]]]); +//# sourceMappingURL=main.d1fd25da.chunk.js.map \ No newline at end of file diff --git a/jamal-doclet/README.adoc b/jamal-doclet/README.adoc index be71a3dd..db3462fd 100644 --- a/jamal-doclet/README.adoc +++ b/jamal-doclet/README.adoc @@ -325,13 +325,13 @@ The important options are: [source] ---- --module-path -'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.0/jamal-tools-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.0/jamal-core-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.0/jamal-engine-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.0/jamal-api-2.6.0.jar' +'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.1-SNAPSHOT/jamal-tools-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.1-SNAPSHOT/jamal-core-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.1-SNAPSHOT/jamal-engine-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.1-SNAPSHOT/jamal-api-2.6.1-SNAPSHOT.jar' --patch-module jamal.doclet='${PROJECT_ROOT}/jamal/jamal-doclet/src/main/java:${PROJECT_ROOT}/jamal/jamal-doclet/target/generated-sources/annotations' -doclet 'javax0.jamal.doclet.JamalDoclet' -docletpath -'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.0/jamal-api-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.0/jamal-tools-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.0/jamal-engine-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.0/jamal-core-2.6.0.jar:$USERHOME/ +'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.1-SNAPSHOT/jamal-api-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.1-SNAPSHOT/jamal-tools-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.1-SNAPSHOT/jamal-engine-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.1-SNAPSHOT/jamal-core-2.6.1-SNAPSHOT.jar:$USERHOME/ -encoding 'UTF-8' -protected @@ -355,7 +355,7 @@ ${PROJECT_ROOT}/jamal/jamal-doclet/src/main/java -taglet 'javax0.jamal.doclet.JamalTaglet' -tagletpath -'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.0/jamal-api-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.0/jamal-tools-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.0/jamal-engine-2.6.0.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.0/jamal-core-2.6.0.jar' +'${PROJECT_ROOT}/jamal/jamal-doclet/target/jamal-doclet-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-api/2.6.1-SNAPSHOT/jamal-api-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-tools/2.6.1-SNAPSHOT/jamal-tools-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-engine/2.6.1-SNAPSHOT/jamal-engine-2.6.1-SNAPSHOT.jar:$USERHOME/.m2/repository/com/javax0/jamal/jamal-core/2.6.1-SNAPSHOT/jamal-core-2.6.1-SNAPSHOT.jar' -use -version -windowtitle diff --git a/jamal-doclet/pom.xml b/jamal-doclet/pom.xml index 51da1417..461c3a85 100644 --- a/jamal-doclet/pom.xml +++ b/jamal-doclet/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal doclet jamal-doclet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT doclet module for Jamal diff --git a/jamal-engine/pom.xml b/jamal-engine/pom.xml index ef565ffd..d9e7c094 100644 --- a/jamal-engine/pom.xml +++ b/jamal-engine/pom.xml @@ -4,11 +4,11 @@ jamal engine jar jamal-engine - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library execution engine diff --git a/jamal-extensions/pom.xml b/jamal-extensions/pom.xml index 2e9a7e8e..e1b35ae7 100644 --- a/jamal-extensions/pom.xml +++ b/jamal-extensions/pom.xml @@ -4,11 +4,11 @@ jamal extensions jar jamal-extensions - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library extra macros diff --git a/jamal-groovy/README.adoc b/jamal-groovy/README.adoc index 399828a0..ef403bf3 100644 --- a/jamal-groovy/README.adoc +++ b/jamal-groovy/README.adoc @@ -9,7 +9,7 @@ To use this module you have to add the dependency to you Maven project, as: com.javax0.jamal jamal-groovy - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -563,16 +563,16 @@ If you want to use the ScriptBasic interpreter you have to * modify the property `maven.load.include` and `maven.load.exclude` in the file `~/.jamal/settings.properties` to include the `groovy` module. For example: - maven.load.include=com.javax0.jamal:jamal-groovy:2.6.0 + maven.load.include=com.javax0.jamal:jamal-groovy:2.6.1-SNAPSHOT * add the line - {@maven:load com.javax0.jamal:jamal-groovy:2.6.0} + {@maven:load com.javax0.jamal:jamal-groovy:2.6.1-SNAPSHOT} + to the Jamal file where you want to use the ScriptBasic interpreter. * To include the resource file `groovy.jim` you have to add the line - {@import maven:com.javax0.jamal:jamal-groovy:2.6.0::groovy.jim} + {@import maven:com.javax0.jamal:jamal-groovy:2.6.1-SNAPSHOT::groovy.jim} + instead importing it as a resource. diff --git a/jamal-groovy/pom.xml b/jamal-groovy/pom.xml index 1b11e0cc..70f33191 100644 --- a/jamal-groovy/pom.xml +++ b/jamal-groovy/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal groovy jamal-groovy - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Groovy module for Jamal @@ -52,13 +52,13 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-io/README.adoc b/jamal-io/README.adoc index 151cd12f..b3870b03 100644 --- a/jamal-io/README.adoc +++ b/jamal-io/README.adoc @@ -22,7 +22,7 @@ To use this module, you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-io - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -31,7 +31,7 @@ or as an alternative your macro file can use the `maven:load` macro to load the .Jamal source [source] ---- -{@maven:load com.javax0.jamal:jamal-io:2.6.0} +{@maven:load com.javax0.jamal:jamal-io:2.6.1-SNAPSHOT} ---- before using any macro from this package for the first time. diff --git a/jamal-io/pom.xml b/jamal-io/pom.xml index d973cafb..166c6c0c 100644 --- a/jamal-io/pom.xml +++ b/jamal-io/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal io jamal-io - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT io module for Jamal @@ -51,13 +51,13 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-jamal/README.adoc b/jamal-jamal/README.adoc index f908e62f..d02c2934 100644 --- a/jamal-jamal/README.adoc +++ b/jamal-jamal/README.adoc @@ -24,7 +24,7 @@ To use this module, you have to add the dependency to your Maven project as: com.javax0.jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-jamal/pom.xml b/jamal-jamal/pom.xml index 9977acfb..9ddb0999 100644 --- a/jamal-jamal/pom.xml +++ b/jamal-jamal/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal module for Jamal @@ -51,7 +51,7 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-jar-input/pom.xml b/jamal-jar-input/pom.xml index 90160a50..a1b5e19f 100644 --- a/jamal-jar-input/pom.xml +++ b/jamal-jar-input/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal jar input jamal-jar-input - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal JAR reading plugin diff --git a/jamal-java/pom.xml b/jamal-java/pom.xml index b55a4524..317fd029 100644 --- a/jamal-java/pom.xml +++ b/jamal-java/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal java jamal-java - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal module for Java Run-Rime Compile and Load @@ -56,7 +56,7 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-json/README.adoc b/jamal-json/README.adoc index 0b9d04ef..b22aa26b 100644 --- a/jamal-json/README.adoc +++ b/jamal-json/README.adoc @@ -12,7 +12,7 @@ To use this module, you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-json - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-json/pom.xml b/jamal-json/pom.xml index 16407ddf..1aa9e6da 100644 --- a/jamal-json/pom.xml +++ b/jamal-json/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal json jamal-json - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT json module for Jamal diff --git a/jamal-kotlin-testsupport/pom.xml b/jamal-kotlin-testsupport/pom.xml index b36a290b..d3f1bdb2 100644 --- a/jamal-kotlin-testsupport/pom.xml +++ b/jamal-kotlin-testsupport/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal kotlin-testsupport jamal-kotlin-testsupport - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT kotlin-testsupport support module for Jamal diff --git a/jamal-kotlin/pom.xml b/jamal-kotlin/pom.xml index 25cd8e8c..3bc8843a 100644 --- a/jamal-kotlin/pom.xml +++ b/jamal-kotlin/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal kotlin jamal-kotlin - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Kotlin support module for Jamal diff --git a/jamal-markdown/README.adoc b/jamal-markdown/README.adoc index 391be25f..22eb3961 100644 --- a/jamal-markdown/README.adoc +++ b/jamal-markdown/README.adoc @@ -12,7 +12,7 @@ This can be done adding ---- com.javax0.jamal jamal-markdown - 2.6.0 + 2.6.1-SNAPSHOT ---- to your Maven `pom.xml`. @@ -32,7 +32,7 @@ To use this macro together with the Jamal doclet you can configure the Maven Jav com.javax0.jamal jamal-doclet - 2.6.0 + 2.6.1-SNAPSHOT --source-root @@ -44,14 +44,14 @@ To use this macro together with the Jamal doclet you can configure the Maven Jav com.javax0.jamal jamal-doclet - 2.6.0 + 2.6.1-SNAPSHOT <1> com.javax0.jamal jamal-markdown - 2.6.0 + 2.6.1-SNAPSHOT diff --git a/jamal-markdown/pom.xml b/jamal-markdown/pom.xml index 6eec2491..0fd72a17 100644 --- a/jamal-markdown/pom.xml +++ b/jamal-markdown/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal markdown jamal-markdown - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Markdown module for Jamal diff --git a/jamal-maven-extension/README.adoc b/jamal-maven-extension/README.adoc index 8df3cd78..aa91bb92 100644 --- a/jamal-maven-extension/README.adoc +++ b/jamal-maven-extension/README.adoc @@ -25,7 +25,7 @@ This directory will contain the file `extensions.xml` with the content: com.javax0.jamal jamal-maven-extension - 2.6.0 + 2.6.1-SNAPSHOT --- @@ -74,7 +74,7 @@ To automate this, the Jamal Maven plugin can be started with the command line [source] ---- -mvn -Djamalize=true com.javax0.jamal:jamal-maven-plugin:2.6.0:jamal +mvn -Djamalize=true com.javax0.jamal:jamal-maven-plugin:2.6.1-SNAPSHOT:jamal ---- from the top level project directory. diff --git a/jamal-maven-extension/pom.xml b/jamal-maven-extension/pom.xml index fece5e00..c6312e79 100644 --- a/jamal-maven-extension/pom.xml +++ b/jamal-maven-extension/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal maven extension jamal-maven-extension - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library maven extension @@ -46,82 +46,82 @@ com.javax0.jamal jamal-engine - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-api - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-tools - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-core - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-markdown - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-mock - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-yaml - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-json - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-prog - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-load - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-sql - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-input - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-jar-input - 2.6.0 + 2.6.1-SNAPSHOT org.junit.jupiter diff --git a/jamal-maven-input/pom.xml b/jamal-maven-input/pom.xml index d4501e02..771ee7c6 100644 --- a/jamal-maven-input/pom.xml +++ b/jamal-maven-input/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal maven input jamal-maven-input - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal Maven repo reading plugin diff --git a/jamal-maven-load/pom.xml b/jamal-maven-load/pom.xml index 92c4ab53..d6bd9877 100644 --- a/jamal-maven-load/pom.xml +++ b/jamal-maven-load/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal maven-load jamal-maven-load - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal module for Java Run-Rime Compile and Load @@ -56,7 +56,7 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-maven-plugin/README.adoc b/jamal-maven-plugin/README.adoc index ad290370..4c73d258 100644 --- a/jamal-maven-plugin/README.adoc +++ b/jamal-maven-plugin/README.adoc @@ -7,7 +7,7 @@ You can use the plugin configured into a project or independent of the project. You can use the plugin even without any Maven project, just executing the command line - mvn com.javax0.jamal:jamal-maven-plugin:2.6.0:jamal + mvn com.javax0.jamal:jamal-maven-plugin:2.6.1-SNAPSHOT:jamal You can also leave the version out, and the plugin will use the latest version. @@ -43,7 +43,7 @@ If you have an actual Maven project, then you can configure the plugin in the `p com.javax0.jamal jamal-maven-plugin - 2.6.0 + 2.6.1-SNAPSHOT @@ -128,7 +128,7 @@ To star the jamalization of a project, you can use the command line or - mvn com.javax0.jamal:jamal-maven-plugin:2.6.0:jamalize + mvn com.javax0.jamal:jamal-maven-plugin:2.6.1-SNAPSHOT:jamalize Jamalization will use the version of Jamal executing it. If this version is a `-SNAPSHOT` version the process will not be able to download the Asciidoctor extension. diff --git a/jamal-maven-plugin/pom.xml b/jamal-maven-plugin/pom.xml index 391d986a..363c7173 100644 --- a/jamal-maven-plugin/pom.xml +++ b/jamal-maven-plugin/pom.xml @@ -4,11 +4,11 @@ jamal maven plugin maven-plugin jamal-maven-plugin - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library maven plugin diff --git a/jamal-mock/pom.xml b/jamal-mock/pom.xml index 1458c4c8..b6547510 100644 --- a/jamal-mock/pom.xml +++ b/jamal-mock/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal mock jamal-mock - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT mock module for Jamal @@ -51,13 +51,13 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-openai/pom.xml b/jamal-openai/pom.xml index 56918d5b..2499ed90 100644 --- a/jamal-openai/pom.xml +++ b/jamal-openai/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal openai jamal-openai - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT openai module for Jamal @@ -51,25 +51,25 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-json - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-prog/README.adoc b/jamal-prog/README.adoc index 1871043f..16cafa00 100644 --- a/jamal-prog/README.adoc +++ b/jamal-prog/README.adoc @@ -12,7 +12,7 @@ To use this module, you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-prog - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-prog/pom.xml b/jamal-prog/pom.xml index d898f2af..51f35d80 100644 --- a/jamal-prog/pom.xml +++ b/jamal-prog/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal prog jamal-prog - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal module for Programmatic Extension @@ -52,19 +52,19 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-ruby/README.adoc b/jamal-ruby/README.adoc index dacc1b5d..66ca84ed 100644 --- a/jamal-ruby/README.adoc +++ b/jamal-ruby/README.adoc @@ -10,7 +10,7 @@ To use this module, you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-ruby - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -674,16 +674,16 @@ If you want to use the ScriptBasic interpreter you have to * modify the property `maven.load.include` and `maven.load.exclude` in the file `~/.jamal/settings.properties` to include the `ruby` module. For example: - maven.load.include=com.javax0.jamal:jamal-ruby:2.6.0 + maven.load.include=com.javax0.jamal:jamal-ruby:2.6.1-SNAPSHOT * add the line - {@maven:load com.javax0.jamal:jamal-ruby:2.6.0} + {@maven:load com.javax0.jamal:jamal-ruby:2.6.1-SNAPSHOT} + to the Jamal file where you want to use the ScriptBasic interpreter. * To include the resource file `ruby.jim` you have to add the line - {@import maven:com.javax0.jamal:jamal-ruby:2.6.0::ruby.jim} + {@import maven:com.javax0.jamal:jamal-ruby:2.6.1-SNAPSHOT::ruby.jim} + instead importing it as a resource. diff --git a/jamal-ruby/pom.xml b/jamal-ruby/pom.xml index 2f081ad3..2a2f9d23 100644 --- a/jamal-ruby/pom.xml +++ b/jamal-ruby/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal ruby jamal-ruby - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Ruby module for Jamal diff --git a/jamal-scriptbasic/README.adoc b/jamal-scriptbasic/README.adoc index 38be6b59..1250667f 100644 --- a/jamal-scriptbasic/README.adoc +++ b/jamal-scriptbasic/README.adoc @@ -10,7 +10,7 @@ To use this module you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-scriptbasic - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -91,16 +91,16 @@ If you want to use the ScriptBasic interpreter you have to * modify the property `maven.load.include` and `maven.load.exclude` in the file `~/.jamal/settings.properties` to include the `scriptbasic` module. For example: - maven.load.include=com.javax0.jamal:jamal-scriptbasic:2.6.0 + maven.load.include=com.javax0.jamal:jamal-scriptbasic:2.6.1-SNAPSHOT * add the line - {@maven:load com.javax0.jamal:jamal-scriptbasic:2.6.0} + {@maven:load com.javax0.jamal:jamal-scriptbasic:2.6.1-SNAPSHOT} + to the Jamal file where you want to use the ScriptBasic interpreter. * To include the resource file `scriptbasic.jim` you have to add the line - {@import maven:com.javax0.jamal:jamal-scriptbasic:2.6.0::scriptbasic.jim} + {@import maven:com.javax0.jamal:jamal-scriptbasic:2.6.1-SNAPSHOT::scriptbasic.jim} + instead importing it as a resource. \ No newline at end of file diff --git a/jamal-scriptbasic/pom.xml b/jamal-scriptbasic/pom.xml index 5f14a9db..c62cff53 100644 --- a/jamal-scriptbasic/pom.xml +++ b/jamal-scriptbasic/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal scriptbasic jamal-scriptbasic - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT ScriptBasic support for Jamal @@ -39,18 +39,18 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-api - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-engine - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-snippet/README.adoc b/jamal-snippet/README.adoc index d1e1dd22..4b90e45b 100644 --- a/jamal-snippet/README.adoc +++ b/jamal-snippet/README.adoc @@ -27,7 +27,7 @@ For example, if you want to use the latest version of Jamal Snippet macro as a d com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -151,7 +151,7 @@ If you are using Jamal programmatically or from Maven then the dependency you ha com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -533,7 +533,7 @@ The result is: [source] ---- ... -2.6.0 +2.6.1-SNAPSHOT ... ---- @@ -578,7 +578,7 @@ The result is: [source] ---- ... -2.6.0 +2.6.1-SNAPSHOT ... ---- @@ -670,7 +670,7 @@ The following example demonstrates how the result of the processing can be modif com.javax0.jamal jamal-snippet -2.6.0 +2.6.1-SNAPSHOT } my-imaginary @@ -701,7 +701,7 @@ will result com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT @@ -3548,7 +3548,7 @@ For example, 4.0.0jamal snippetjar -com.javax0.jamaljamal-snippet2.6.0 +com.javax0.jamaljamal-snippet2.6.1-SNAPSHOT } ---- @@ -3565,7 +3565,7 @@ will result jar com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -3581,7 +3581,7 @@ For example, {@define tabsize=0} 4.0.0jamal snippetjar -com.javax0.jamaljamal-snippet2.6.0 +com.javax0.jamaljamal-snippet2.6.1-SNAPSHOT } ---- @@ -3598,7 +3598,7 @@ will result jar com.javax0.jamal jamal-snippet -2.6.0 +2.6.1-SNAPSHOT ---- @@ -3620,7 +3620,7 @@ The previous example that we used before can also be formulated this way. 4.0.0jamal snippetjar -com.javax0.jamaljamal-snippet2.6.0 +com.javax0.jamaljamal-snippet2.6.1-SNAPSHOT ---- @@ -3638,7 +3638,7 @@ It will result in the same output as before: jar com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -3662,7 +3662,7 @@ project> packaging>jar groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT parent> groupId>com.javax0.jamal artifactId>jamal-parent @@ -3683,7 +3683,7 @@ will result jar com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent @@ -3716,7 +3716,7 @@ For example: packaging>jar groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT parent> groupId>com.javax0.jamal artifactId>jamal-parent @@ -3735,7 +3735,7 @@ will result jar com.javax0.jamal jamal-snippet -2.6.0 +2.6.1-SNAPSHOT com.javax0.jamal jamal-parent @@ -3769,7 +3769,7 @@ will result in the output .output [source] ---- -2024-05-11 15:20:33 +2024-05-11 20:51:45 ---- diff --git a/jamal-snippet/THINXML.adoc b/jamal-snippet/THINXML.adoc index 8ec99194..183a0f49 100644 --- a/jamal-snippet/THINXML.adoc +++ b/jamal-snippet/THINXML.adoc @@ -23,11 +23,11 @@ project> packaging>jar groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT parent> groupId>com.javax0.jamal artifactId>jamal-parent - version>2.6.0 + version>2.6.1-SNAPSHOT relativePath>../jamal-parent ---- @@ -43,11 +43,11 @@ It is the same as the standard XML in the following way: jar com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT ../jamal-parent @@ -71,11 +71,11 @@ project> parent> groupId>com.javax0.jamal artifactId>jamal-parent - version>2.6.0 + version>2.6.1-SNAPSHOT relativePath>../jamal-parent groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT ---- we get the following: @@ -91,12 +91,12 @@ we get the following: com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT ../jamal-parent com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -115,11 +115,11 @@ project> parent> groupId>com.javax0.jamal artifactId>jamal-parent - version>2.6.0 + version>2.6.1-SNAPSHOT relativePath>../jamal-parent groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT ---- we get the following: @@ -139,12 +139,12 @@ we get the following: com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT ../jamal-parent com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -167,7 +167,7 @@ project> relativePath>../jamal-parent groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT ---- will be @@ -194,7 +194,7 @@ will be ../jamal-parent com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- @@ -318,7 +318,7 @@ project name="prohibited" note="real POM XML does not have attributes"> groupId value="com.java0.jamal"> groupId>com.javax0.jamal artifactId>jamal-snippet - version>2.6.0 + version>2.6.1-SNAPSHOT ---- All the tags will have attributes surrounded with `"` characters in the output. @@ -337,7 +337,7 @@ All the tags will have attributes surrounded with `"` characters in the output. com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-snippet/pom.xml b/jamal-snippet/pom.xml index b09c782c..f9805dae 100644 --- a/jamal-snippet/pom.xml +++ b/jamal-snippet/pom.xml @@ -4,11 +4,11 @@ jamal snippet jar jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library snippet macros diff --git a/jamal-sql/demodb.mv.db b/jamal-sql/demodb.mv.db index f983b244814f9cbfde03ef663a2beab3c242cf2f..16363549bac197261b6240a4c93d9a5eeb9da21e 100644 GIT binary patch literal 20480 zcmeHP+j84P7?#qsQ3Hiu0N1LUw9Sn0?5|5=tY@MmT?d~^O=pH zJoGJ(y2fxY82L0#To)hk&z_}O0i!|Whq0?)%mm~~}q8LT7W}`TPzd*B{7`rTXG~2TiL@?28#)6pHk!B~@ z3nJ`kj^&vsu`SI_0%8$FH5P;n5r=9Cr4FK=dv`E=Tzx{S2Pa3P!H`wsu-ZEA^>%{Z zFTSL8P;YH@_4;n3)9vV$ir%R;yZZh6`bMp@k(Raf%|`34 zuHQPzFI%gvZPeHGZf&($*DH^343m zbJ365jZHYIe_sDWkev7KLGK=}=vyt}+$^n9g;tjJA`^<80nSzGwxY~w%Xe*0OynZ3Ci3))TPPGbbS2Cnde+~tM2 z#0$F23+o;)?EAcM9`M3l;f1FtbGzp8HT6B^I&522!jC3DT3XrzYjl)Xs8dv2KEUQj zhaa;Z??yj3VAZ|1c>(h@oz!m?4Vb*+I!xgAdH>*$^}EBMe+26oq{1C#myUw4$Erwd znD6rOBX)2I-v_wYJG_0|j|a`c<0>vU3D?Bm<3jvtA@|Zt{alFgl%4v;7G#_RJ-^uK zd|{ZGXY%DsaGJ6g(ixZLJ7R@jI#%xN#W5=nA+v@o^Sc0!@VIAX6`SNrrsf!!vm=WQ zdwf5DpN}dwT>jX_=AEIFzrE+*OeLzP+N!IXsx_ZZ6V-u&@`DTW>gSKXoL4mEEl!xK zfLEMM>I?~Wyl?=EQ*}SSkus(#&I*zh)=l1-3iw4Gldm|*lQ7F93|jjq>=7qqDG__- z+mM%;_H9Ca1~qe{l$xOk_=iZ%C^nA!$46=2WS;d3zX(`65-JFP)X_V{7QpLsnTwUMWqu_X`CzVl$6G2 zlr~?Cv`abCBq}3qp?{z>=1QB?5tYU&erHU!Q*g+ni9oD9X<`#uNN9SD+OWKSttiG0 zY>%HPDte@Rum#m0A3{I0fB6ndnADA|1|`%%Ug8IEy|aQ9!LQ zz8EvQxXa>1KCIh<{g21n4bY~t{qOOWkFP=EdhL|$f126H_W%>ha!YrlBKNZSc zgcRF?(&*pQA6Uta9cllIUI}UcOZz`_6G;0X9Q2uYB=`PH`(N7sqNnA`$%VB4FWVNA z@+1P6jlfy^TeSb_#Qu*1u>ZYRX#YtuY|G)AKlK)8j{|6cWe=XzxzrTw3|4_#NW&FPfq4F$w?_%Qr z>YpE*^U8t{bYNmYfu290F!mT1fuADra^f-0V*Y6oX5lfO5%Yh3I%X;65Atl?D$q#QY(|G{b+Kan*77JZp}_=lR(p se4aPY5kCJ`#{VzdV3P7A0&frk6Z^lgzs2>~n%Mu4YaY<>!tMXR0O)s1T>t<8 literal 20480 zcmeHOPgC1Q6qg7Dg_Jahv}eTu5@uA7w5$KqPHMmjPK{w~!;llRlGcQYu^D41w3qbM zYo{Nex1M@SE62e)x#?eB?#0gY0ld5+8wpKtLcM5D*9m1Ox&C0fB%(Kp-Fx5C{ka-U$M$!vB9K zxC^EN0fB%(Kp-Fx5C{ka1Ofs9fq+0jARrKUn+Ob({6uThIK_WJcIlySY5U~Fr?w9C zz_&c?XuWQ?@0$@NE>s8T$n-p<_4oFnT7X!V?O{Dv06?@3J&CIV`rXhEB3Heb4-^qh zUdJ=i#0_cMz=-N$s2EP_quG(fKFwx(^}H1sf1Y&~khA5m;4GF%!titX7g9T`ZmDJ2oLL&a_x z9tjOkaR4N}Wm}5dBFI9zsZbJ79XY1bGEGM}J@;0(w_ALKiu=ch{cevIqo7zjYPYvY z`-rZPK53pF(2sSDHnR5qNpUNw7oiaYAYT03JrV*kr}HC&0jPTS`wXIN)Z|q1OBo&A zhbI-6PW!af>yguJ)*BFD;!-TY$NI+3vo3YyMKS2B-Og@?IvN=OZ?f7A8t{_gm{}tS zb4%@RP^T^0qn(h>#hc)(^GsQzeZoddlKdz7Tb`Pd@fnCh2wpp!e$ybf_wen80yxlCQ%d4e&X}Jkwwo3JfmD>F~$g&n^7U$HPv-Onq zM!m8IU#j1gA99@2yE|}q$0(@lHSW7{QpEx-&a3mYKgqCGV0ezD01PYY@_Mb&te0Rd z9Eah}m^mlm9mWS%zEa-i#^sQ>Mqr=DoBC?jfz3N;!v_9>-R~aIPP0ckhj5NTDcoT)wNHXJE$Vy+f6m7D z>HY!y9^hHmSpTRKb*tUoqLJ?+CW*hpnE0bi7UHRX%0zoiPyI{${VZB3)$$Q!y@abhx(5 zwY}+mIGl=m(dF1;DjEqv39+uQn=ylD^3eEl(jrWhGs2*^cT6{!K^7ZgC%z4Jnen|f zXpb??yf8M+^bqV1-ZV3icGNjKjO#WtQ!VM2`rHN}Ue17XnB`^#rq&I^qXW_jPkkNp zLc6KZc1~#XjL-zE$QKArn9N3iJv}FM_zFV1OlUVSc%fUo&|WIElM~uFBQ$<7(!^v^ zqcD#&GG0Mwj|q)UhZowAjcWsAI|c_0yE?G7hg}2fmd(|D+y&CaS;dz1l~3RLluzu-+UE4(FRrYE!#5*4y=oDqqC>X z4Ecv62V$mfz--F<|4{WGf8sNUKd-TyQy*dC|0f4B{I5X9@il4e|1V%)l4j1OiaE7R zxOVWVsc4*gxgUs%1~Iva)O)C+f9EVXlG+tkPH5;2EI4xzQp=2?;N`+=<7_sP`_Yjs z+QwNDhR&Nm!C0H^EVf|YywGM#3{5x#%-k7Zj+j4g+Rq!BK~Cs^32hoSC$#?h<`10Y z+LrMD`KW~O|Aqgbgb9TI4*~ilI+8~Jh5s-7e?HP8{QtM@3JHD!flm&Bv;H^l|A#~W zpL!N?F53N9IsZQzaa>~mKN{zt1T6F!=l^r@S_ohAqDP7UZzUdyagqN2bv!Hb{~uZ% z!5c`wi~RpPuON9(^8f#c{Qn1;|9|o(^8dcb|BL*88&c&-@!rMc|K)%0{x~U3^GOFj zp%A`8LLrM7=X3si#5l?M$3>V~#CS~3|M}&Zxtu?kXXE0>Va{k98$Zsa&%-o+oKGm6 zjUWF{p~CZXNG~sRn8c5xaq08KRvo0zlkOmWo_?F9&(rQpq|bj5`TtMOV-pJ&2wWTj YL;pYXzw=J?ApdU=2mp8&9RQg54+%n1MgRZ+ diff --git a/jamal-sql/pom.xml b/jamal-sql/pom.xml index 3fd6c8f4..a9c2c56a 100644 --- a/jamal-sql/pom.xml +++ b/jamal-sql/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal sql jamal-sql - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT SQL module for Jamal @@ -51,25 +51,25 @@ com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-json - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT test com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT test diff --git a/jamal-test/pom.xml b/jamal-test/pom.xml index 01e98453..b89df1f7 100644 --- a/jamal-test/pom.xml +++ b/jamal-test/pom.xml @@ -4,11 +4,11 @@ jamal test jar jamal-test - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library integration tests diff --git a/jamal-testsupport/pom.xml b/jamal-testsupport/pom.xml index 038471f1..91b8e106 100644 --- a/jamal-testsupport/pom.xml +++ b/jamal-testsupport/pom.xml @@ -4,11 +4,11 @@ jamal testsupport jar jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library macro test supporting classes diff --git a/jamal-tools/pom.xml b/jamal-tools/pom.xml index 9e6f43cb..d49ceea3 100644 --- a/jamal-tools/pom.xml +++ b/jamal-tools/pom.xml @@ -4,11 +4,11 @@ jamal tools jar jamal-tools - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT -in Jamal macro library support tools diff --git a/jamal-word/README.adoc b/jamal-word/README.adoc index 90388ba6..59c232f9 100644 --- a/jamal-word/README.adoc +++ b/jamal-word/README.adoc @@ -76,7 +76,7 @@ This can be done adding ---- com.javax0.jamal jamal-word - 2.6.0 + 2.6.1-SNAPSHOT ---- to your Maven `pom.xml`. diff --git a/jamal-word/pom.xml b/jamal-word/pom.xml index 30390e77..b459195b 100644 --- a/jamal-word/pom.xml +++ b/jamal-word/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal word jamal-word - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Microsoft Word module for Jamal diff --git a/jamal-word/src/test/resources/demoConverted.docx b/jamal-word/src/test/resources/demoConverted.docx index 08c6ba1055daa47fe1ff6612d0635c30a855d32f..490ee22dd84562415ac656017d7b90181e18638d 100644 GIT binary patch delta 3245 zcmZ9PWmJ^i8iwB)YG{F>29)lUA*B(dkuGVZK@bp-@Et;s20`*8WoQH)73rZB5Tv9V zBqXF$I3J#M⁣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 QVcaRLx4G~a1+P#41@-&r%>V!Z delta 3100 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 delta 199 zcmeC_W9sQ+;tB9(W)WfF;NW0bTeXpACL`0@s?Ez8rNH!Irte^S4@(i4Heie91j+aE zdxH5l1XP(o{Qp8%LV)yS12*x^Z_?khfyD0S?dAc|v#M`^`6W%AAU%`+H`{|KhZb`X vRoP+#qPDl#f~ap0%Cyx3#H(+$15x{1oj??G8(4``n>ARj%@IT$YV!gB2vJXr diff --git a/jamal-word/src/test/resources/pictureConverted.docx b/jamal-word/src/test/resources/pictureConverted.docx index 25dfde17db0af9331699b4d6bcdd05c850920f0e..b6694bbfd725b928e7a3184590da65d816b03bcb 100644 GIT binary patch delta 270 zcmaF6it+6#MxFp~W)=|!4h{~6-entkE-*6nF57&MF#t>(F#m(ltfgRjIa?B#=H_VS z0I8cK5DMnM6r9Qg;x~v0Nr31nI&Q2W`i>zp8;E{rexC!5FZd#5fTofE`|hvDCJNu0G@eiO8@`> delta 270 zcmaF6it+6#MxFp~W)=|!4h{~6wN)E=E-*5!t=fE#F#t>(F#m(ltfgRjIa?B#=H_VS z0I8cK5DMnM6r9Qg;x~v0Nr31nI&Q2W`i>zp8;E{rexC!5FZd#5fTofE`|hvDCJNu0NZ|Nvj6}9 diff --git a/jamal-word/src/test/resources/sampleConverted.docx b/jamal-word/src/test/resources/sampleConverted.docx index 0b2673347ae6f412de40005259efd2b8b5236cba..063e068d462713d870cb4c9f25e7648b3226dfae 100644 GIT binary patch delta 2304 zcmYk;dpy(M9|v$lL)4hd$bICuwDe6ZkxO$KKlhMCN~OLo8xoV~gWR>0xi;fBA|`xU zE0>y-$Pl^T86mfkp}Ezs`Tg@d|2!YBb9q0`<8dC3bIu}ze}%y>=3p%#D8(l%EX+qJ zt`cho@e_(^y`UreuJZr-pMs%0iR0oh8UP;S=gsjHxw~(#XzIS+hw=N4i+4!y#>?Tw z`)gg)ZT9;MHF}+SHP~@5+LQZHygpt%;;{!1Ab8|8^nr21hr$6R3}2#XX=yi$Zr6T@YB@Dr>QArARMulLPptM%;1Pb znrgu6Y^XZN2RN;BBj3C8cGowr8nbT`aPHzLn7Q`-H(JLfPX-(2FCA+bbOJS0e;u0u z)UE4N8KuhM_lAo}tp~)MQ8ajtJqqjIS=^&B^c{{HccyEBJY0$s-MPN~J#Z9$WLvv5 zSszF9&b+0>`tnQ(l!2fIC;GWXY`EP zXZ41kQmECKWd?h{9)0Gg9}u7qX}u6u3M>7DHedlPa?vCd)PJZv|cdxB;4sYdYEuQr^fo?ok6GY&3|#4uWvrS^s%*SN0TQB^pnW7r zAt>oYkRRiyVY2EYk2BBK5^tlv9HU)WC!N*ZW9+N#y@v}p3PW^Zq(=EPndHB(k zpIsdqao5|*ULj2^*4!!)ViGSD$Q49bDyN@0kTH;{2QM-y zOIc>Bpieh#W<11vIUFWcz!*|ZLZ%BC6lh`Y(bU?0e9hMXM^_?UQRqwY!H%#5ZB}9J zw6HYeug5Vu=J$d}an>yoiI9qENppwL-1l&9-o_eZ`9nqAVvTcH*yB2zAAB<%z%tc% zfpk1ErL!d@DPWpW>nx%(j68({=B1w znw7#^O-xz>*T?We%%#8CW`VPkf5)30mJ)pxZx$H(!7o7Spz-^bq~`!kujRg@P$RY^ zJ0vwjxnpplq8Ik*KdhEd-8X-Hvi)?z=Zi``-vQNq?@W9+w9?lbQEXcei0e$1=*(_OPR4S` z#Ybzm>OCG^_Vzz~yX!SzW4vV3*^`vF_cE^R_U~_jia%Wk8I@Wm_sXJ|)X$`_!>IvN zbxOF}HeIs)n*Tc=AN(mS%l!zc{#Voc#r%>1Svh?O}f#0PPh>r->v0 zlWV16k)zl84ME(yF+}Ot=wuqy1g3V_F{o>AhZoluVvQvasp|lwn*PRB@PT=kLow5Z z&cRir`2?9u*0j(&UwhpyH$lcyhMq86#_vUxyk2&VG(kc;8bpKHQHmb^daO19)B3fYJUi;U)RG|xbUP+WFte=|g% pJk9oflN|6+n?hqx^q?!6d#v?Z3MIbGrZl delta 2390 zcmYk;dpHwp8vyV*yyleSP+>)4rgECZm|B>^@KTgh!rzXoGGKZN%?^mwb zn>A<3p_Vx&!<-LEOkv8g@qY7N-*xr;^Skc*e(vXa{(J7_W_gxX({hz{7e6uEGlxR4SaY6nbFR_Sy2P6pl`btIbJ0a68%db<^ zpYQix(y-glmue2U@bj2^x%`-aR+e_0G%j@Xyc?r6pq;O=*wIVN})Lg;jTR76Yt{;4}&6 z^2i+5{0jEY&gcF@-uBGj-s||m2vyNhyn$!qmxZm7J{H6L7WR31Vadi(<5F;qRE8bi;=y!h5uS!c(o`smrr z#5cmbUd(>zu!}VsWe0@A!moUJK^eu4|AgYPO+C(cem#RN)uh2+T1M9E*s~5C>!E1B zO|B29!F)p4&yubRt)$`^Z}M^NK3D8`>+M@f3*Q6t&2Pov?=>NPI0LUw3Rj=d1g0VEC*+xTWlTklEc06 z#y`zoZJK&B8&1PWpCz(5zJJ3ZviNF!EB%4o*LsIDgWn9hdA1Ts8VTqq5983_@x0gG z_xnD&OxXr7TVl+=5>F&Y`9*GDs|u^Aczo*~rb6Ng@G&med^BmqC>DBNa!L-Vd9@B1TTT%(V1#i(-RhW_|OM$Ia>Xm5R86EZ|Ej-KJ| zZ0vc`BlgsM*$Fwy&1(_<#&c#Pb5wTcT^el39;>28Pk!!x8ly1SFyS-v!@?oOJ18JO zdX&4{cUBa>$#G5Ao&KjUSfb@nNu2Qg9EO=;lnb4*K0B9-BX%Md#4HQ~2C=RY8(8|% zqR2KPK(wxeakSk1fJW5&Q_6+NnAZBmAWu79)pq1~qGQHMP+IAGN0I|&t`-$BwJIIEa%FdtPjVwMKr6&7G)G$Upf5=c0ZVe_c5uA4&n)(K6RTWJ&N918Tg9qelgt(z+B=nbzPY#elTy0H6}Zs^D{^Ci zwR%JA$MDx%gd&+_d^Wy}Xg? zK8s^UJ5JWhX&~p@o^Fc+$4d3B4$T!k0e^Qdt0nZH&I;rM#(JFZ5k}APm8je@Gq#;lk{lq+O1dTN+v>K0!c2#i3N4aLbGLFDnh@ zIz70Vq70QL6ezE1SjXP+(Yg)+h9G0oxnDH9BtAaF{$peUfrAU|6^N@~vbyCRhCFna zc}Bb+G}pbhb5a#`6j6)*3IX~u@Xr#KuXs<^#17NLR7oj-UMCV1Om5tY{fWZGt|iXS zuC2yuMTAerln5UVw#Z2(xZC>MI8F+xo5c)C9<+xLQ}16(Mb69DYDj&Q6hmf&d1yU{ zA|t14GNw3MpIgiQo1~t~fQg}MPgINb4+wRr#uR+Gepf-lXKu~k>6-XY&jk@6kc_q_N!%70+y5ZckS@6TOO$a<(@}44sWT_`@B{!@m%Jf%P zm8LRNKkLU`b;u4oNQ8?OYzY(9Qi1OTDQaQ`g)1ZZ?doYO;c|y8CsuJ@1Lwn(p-McT zId?dHTj!^hNx;K;54MN**m`f?S~G)*5XKly>(DAGCa9bSmavys`dRnI5}T>p#sWQ% zUT$@27uH{?W+Vh1MKC`B?e5zC(s6lD(03`cdcx>feNFu#D$`l1b<4?+TJMT6=@=ak zFu8SU1l&{X`Lqf18YkqSgRTi~nwdt69Tu*L(UN1>SRefqbwZnN)$Fet^xb3QZ z+enAoU44xA?sYvE-MMFZ+b1FJxSN}o1aJ%;c-?Px{4MTl=&(v&A}ipGxdTd z+Q6ja^NL%Pf7(gzqQI#!XId_mQ}Uk;%?8A@cZ#*#2qnZ0hHE}|4$CT?+JvyY%uaPN zq})2WAyFSsV=gZeczE_RCSxKIG0^ax)@(i)9fGLov&aII4t^nNOKa~cd2iRef+a_I zfSIg?4$jusyBRg({jib6%4+%bwRqWyH_pvVdvh(Qx|v7fijNiIQ>HIbl)dzheqZh~ z?W1(050^o$tXUT3z@B9?$)k0_pe{nqLRSb`(s_2f{k~y%7(n?J{LlVUzA>Nld^0{>`R05i z3ii2JV8xFz3Q&AT3eNITDcrBQ7uxWn@g~>vav_u5+`MG}qFW`GI diff --git a/jamal-yaml/README.adoc b/jamal-yaml/README.adoc index 78a2e4b3..44bdd7da 100644 --- a/jamal-yaml/README.adoc +++ b/jamal-yaml/README.adoc @@ -11,7 +11,7 @@ To use this module, you have to add the dependency to your Maven project, as: com.javax0.jamal jamal-yaml - 2.6.0 + 2.6.1-SNAPSHOT ---- diff --git a/jamal-yaml/pom.xml b/jamal-yaml/pom.xml index 1366f95f..56e8a963 100644 --- a/jamal-yaml/pom.xml +++ b/jamal-yaml/pom.xml @@ -3,11 +3,11 @@ 4.0.0 jamal yaml jamal-yaml - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT yaml module for Jamal diff --git a/jamal.sh b/jamal.sh index 85a75247..61184141 100755 --- a/jamal.sh +++ b/jamal.sh @@ -20,17 +20,17 @@ function download() { CLASSPATH=$CLASSPATH:$HOME/.m2/repository/$DIR/$2/$3/$2-$3.jar } -download "com/javax0/jamal" "jamal-cmd" "2.6.0" +download "com/javax0/jamal" "jamal-cmd" "2.6.1-SNAPSHOT" -download "com.javax0.jamal" "jamal-engine" "2.6.0" +download "com.javax0.jamal" "jamal-engine" "2.6.1-SNAPSHOT" download "com.javax0" "levenshtein" "1.0.0" -download "com.javax0.jamal" "jamal-api" "2.6.0" -download "com.javax0.jamal" "jamal-tools" "2.6.0" -download "com.javax0.jamal" "jamal-core" "2.6.0" -download "com.javax0.jamal" "jamal-assertions" "2.6.0" -download "com.javax0.jamal" "jamal-jamal" "2.6.0" -download "com.javax0.jamal" "jamal-markdown" "2.6.0" +download "com.javax0.jamal" "jamal-api" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-tools" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-core" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-assertions" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-jamal" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-markdown" "2.6.1-SNAPSHOT" download "com.vladsch.flexmark" "flexmark-all" "0.64.8" download "com.vladsch.flexmark" "flexmark" "0.64.8" download "com.vladsch.flexmark" "flexmark-ext-abbreviation" "0.64.8" @@ -92,28 +92,28 @@ download "com.vladsch.flexmark" "flexmark-util-options" "0.64.8" download "com.vladsch.flexmark" "flexmark-util-sequence" "0.64.8" download "com.vladsch.flexmark" "flexmark-util-visitor" "0.64.8" download "com.vladsch.flexmark" "flexmark-youtrack-converter" "0.64.8" -download "com.javax0.jamal" "jamal-mock" "2.6.0" -download "com.javax0.jamal" "jamal-snippet" "2.6.0" +download "com.javax0.jamal" "jamal-mock" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-snippet" "2.6.1-SNAPSHOT" download "com.javax0.javaLex" "javaLex" "1.0.2" download "com.javax0.sourcebuddy" "SourceBuddy" "2.5.0" download "com.javax0" "refi" "1.0.1" download "org.ow2.asm" "asm" "9.7" download "org.ow2.asm" "asm-tree" "9.7" -download "com.javax0.jamal" "jamal-yaml" "2.6.0" +download "com.javax0.jamal" "jamal-yaml" "2.6.1-SNAPSHOT" download "org.yaml" "snakeyaml" "2.2" download "ognl" "ognl" "3.4.3" download "org.javassist" "javassist" "3.30.2-GA" -download "com.javax0.jamal" "jamal-json" "2.6.0" +download "com.javax0.jamal" "jamal-json" "2.6.1-SNAPSHOT" download "org.json" "json" "20240303" -download "com.javax0.jamal" "jamal-prog" "2.6.0" -download "com.javax0.jamal" "jamal-maven-load" "2.6.0" +download "com.javax0.jamal" "jamal-prog" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-maven-load" "2.6.1-SNAPSHOT" download "com.javax0.mavenDownload" "mavenDownloader" "1.1.0" -download "com.javax0.jamal" "jamal-sql" "2.6.0" +download "com.javax0.jamal" "jamal-sql" "2.6.1-SNAPSHOT" download "com.github.jsqlparser" "jsqlparser" "4.9" -download "com.javax0.jamal" "jamal-maven-input" "2.6.0" -download "com.javax0.jamal" "jamal-extensions" "2.6.0" -download "com.javax0.jamal" "jamal-jar-input" "2.6.0" -download "com.javax0.jamal" "jamal-word" "2.6.0" +download "com.javax0.jamal" "jamal-maven-input" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-extensions" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-jar-input" "2.6.1-SNAPSHOT" +download "com.javax0.jamal" "jamal-word" "2.6.1-SNAPSHOT" download "org.apache.poi" "poi-ooxml" "5.2.5" download "org.apache.poi" "poi" "5.2.5" download "commons-codec" "commons-codec" "1.16.0" @@ -126,7 +126,7 @@ download "commons-io" "commons-io" "2.15.0" download "com.github.virtuald" "curvesapi" "1.08" download "org.apache.logging.log4j" "log4j-api" "2.21.1" download "org.apache.commons" "commons-collections4" "4.4" -download "com.javax0.jamal" "jamal-testsupport" "2.6.0" +download "com.javax0.jamal" "jamal-testsupport" "2.6.1-SNAPSHOT" java -cp "$CLASSPATH" javax0.jamal.cmd.JamalMain $* \ No newline at end of file diff --git a/pom.xml b/pom.xml index c3aca33c..8a3c181a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ pom com.javax0.jamal jamal-parent - 2.6.0 + 2.6.1-SNAPSHOT Jamal macro library to process text files jamal-engine @@ -188,177 +188,177 @@ com.javax0.jamal jamal-engine - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-api - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-tools - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-core - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-assertions - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-jamal - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-markdown - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-mock - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-snippet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-yaml - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-json - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-prog - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-load - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-sql - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-groovy - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-io - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-openai - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-ruby - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-scriptbasic - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-word - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-java - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-plugin - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-extension - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-cmd - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-doclet - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-asciidoc - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-debug - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-maven-input - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-jar-input - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-test - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-testsupport - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-extensions - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-all - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-kotlin - 2.6.0 + 2.6.1-SNAPSHOT com.javax0.jamal jamal-kotlin-testsupport - 2.6.0 + 2.6.1-SNAPSHOT org.junit.jupiter diff --git a/version.jim b/version.jim index d15fd31f..ca782bca 100644 --- a/version.jim +++ b/version.jim @@ -43,7 +43,7 @@ $x -- -------------------------------------------------------------------------------------------------------------------- -VERSION=2.6.0 -- https://repo.maven.apache.org/maven2/com/javax0/jamal/ +VERSION=2.6.1-SNAPSHOT -- https://repo.maven.apache.org/maven2/com/javax0/jamal/ GROUPID=com.javax0.jamal -- the project groupId.