leptris 1.9.321.0-aarch64-linux → 1.9.322.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9055121618343dff8b5e698e7c92d47dbd434db73fe6d8339dc46a0be73c82
-  data.tar.gz: 3e7cf86ffa532fff238034f21f55dbc7117a85398fd1aed4bf3ade5d0c7c3b4e
+  metadata.gz: 7cff747c994e40643b0cc1a8ac9eed34824664b6e88888195ec4a2f4191dca78
+  data.tar.gz: bbd9e7ed63e8e24d383368399d0da9fc401e664b9377411ffaecb646486e70a3
 SHA512:
-  metadata.gz: 3a625fa0c0ef2ac0e64244b09872d64e6f2f6c9a0610c8b65a1c931b69006755e7ce6afe380a0a0a4c8980916e2aeb57dfebbf9b0fde1baf7a5d298dfb866c36
-  data.tar.gz: 4607ae9d6d1952a36f2d9b100417e97c77bca875aeee0dafa5736168d3b6a2966f6ead5a59d1384d8f8ec3adebd542ff05e41ce2fc632767fa466fcf539538cb
+  metadata.gz: dfd0aa551baa98ecdd243f7bf8ba3d88583ebb1ae1b880fad72e9337963971cd46898550b0aea73da6c6f4299d350a04f2a92f8d835f068624a3ca234c344e65
+  data.tar.gz: 6bf7ecfe8511c5567a17643220f651fb2c560f5d8f178e1fd3af370e40f52d1bad67ad7eb102175525f9192a810872ad8a85a0f9cec0a92a8c995765e3528849

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.9.322.0] - 2026-10-08
+
+### Engine sync (libleptris 1.9.322)
+
+- `leptris validate --xsd FILE` rides the CLI's validate command
+  (compile error detail, every accumulated instance error,
+  non-zero exit) — CLI-only, no binding surface; audit 381/380
+  unchanged. The inline-anonymous complexType capture fix
+  (leptris#1592, engine PR #1596) merged after this tag and ships
+  with the engine's next release — the binding pin follows there.
+
 ## [1.9.321.0] - 2026-10-08
 
 ### Added — engine sync (libleptris 1.9.321)

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec)
 # Pin for `rake compile` and the platform-gem builds. Keep in lockstep
 # with .github/workflows/build.yml (which calls `rake compile`) and the
 # CHANGELOG when libleptris releases.
-LIBLEPTRIS_VERSION = "1.9.321"
+LIBLEPTRIS_VERSION = "1.9.322"
 # Vendored alongside libleptris for fn:normalize-unicode (TODO
 # .restructure/20): built per platform with a RELOCATABLE @rpath
 # install name, loaded by ffi.rb before libleptris so the

data/lib/leptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leptris
-  VERSION = "1.9.321.0"
+  VERSION = "1.9.322.0"
 end

data/vendor-src/README.md

@@ -1,7 +1,7 @@
 Sources vendored in this gem (recompile rights; the ruby
 variant builds them at install via extconf.rb):
 
-- libleptris v1.9.321
+- libleptris v1.9.322
 - utf8proc v2.11.0
 
 Rebuild by hand:

data/vendor-src/libleptris/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.9.322] - 2026-10-08
+
+### Added
+
+- **`leptris validate --xsd FILE` (#1075, PR #1593).** The compiled
+  XSD surface rides the same validate command as `--dtd`/`--rng`/
+  `--schematron`: compile failures report the schema's own error
+  detail (compile returns error-carrying handles — the status keys
+  the failure); invalid documents print every accumulated error and
+  exit non-zero.
+
+
+
 ## [1.9.321] - 2026-10-08
 
 ### Added

data/vendor-src/libleptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(leptris
-    VERSION 1.9.321
+    VERSION 1.9.322
     DESCRIPTION "Fast XML parser and XPath evaluator in pure C"
     LANGUAGES C CXX
 )

data/vendor-src/libleptris/cli/commands/validate.c

@@ -156,6 +156,7 @@ static int run_schematron(const char* path, const char* phase,
 
 static cli_result_t validate_execute(int argc, char** argv) {
     const char* rng_path = NULL;
+    const char* xsd_path = NULL;
     const char* sch_path = NULL;
     const char* dtd_path = NULL;
     const char* phase = NULL;
@@ -164,6 +165,8 @@ static cli_result_t validate_execute(int argc, char** argv) {
     for (int i = 1; i < argc; i++) {
         if (strcmp(argv[i], "--rng") == 0 && i + 1 < argc) {
             rng_path = argv[++i];
+        } else if (strcmp(argv[i], "--xsd") == 0 && i + 1 < argc) {
+            xsd_path = argv[++i];
         } else if ((strcmp(argv[i], "--schematron") == 0 ||
                     strcmp(argv[i], "-s") == 0) &&
                    i + 1 < argc) {
@@ -184,6 +187,7 @@ static cli_result_t validate_execute(int argc, char** argv) {
             printf("Options:\n");
             printf("  --dtd FILE          External DTD\n");
             printf("  --rng FILE          RELAX NG schema\n");
+            printf("  --xsd FILE          W3C XML Schema (XSD)\n");
             printf("  --schematron FILE   ISO Schematron schema\n");
             printf("  --phase ID          Schematron phase to");
             printf(" select\n");
@@ -205,8 +209,8 @@ static cli_result_t validate_execute(int argc, char** argv) {
         cli_error("validate requires an XML document");
         return CLI_ERROR_ARGS;
     }
-    if (!rng_path && !sch_path && !dtd_path) {
-        cli_error("validate needs --dtd and/or --rng and/or --schematron");
+    if (!rng_path && !sch_path && !dtd_path && !xsd_path) {
+        cli_error("validate needs --dtd/--rng/--schematron/--xsd");
         return CLI_ERROR_ARGS;
     }
     LeptrisDocument doc = read_doc(xml_path);
@@ -261,6 +265,43 @@ static cli_result_t validate_execute(int argc, char** argv) {
         }
         leptris_rng_free(rng);
     }
+    if (xsd_path) {
+        size_t xsd_len = 0;
+        char* xsd_content = read_file(xsd_path, &xsd_len);
+        if (!xsd_content) {
+            cli_error("cannot read XSD: %s", xsd_path);
+            leptris_document_free(doc);
+            return CLI_ERROR_IO;
+        }
+        LeptrisStatus st = LEPTRIS_OK;
+        LeptrisXsdSchema xsd =
+            leptris_xsd_compile(xsd_content, xsd_len, &st);
+        free(xsd_content);
+        /* compile returns an error-carrying handle on failure — the
+         * status, not the pointer, says whether it succeeded. */
+        if (st != LEPTRIS_OK) {
+            const char* detail =
+                xsd ? leptris_xsd_error(xsd)
+                    : leptris_status_string(st);
+            cli_error("XSD compile failed: %s",
+                      detail ? detail : leptris_status_string(st));
+            if (xsd) leptris_xsd_free(xsd);
+            leptris_document_free(doc);
+            return CLI_ERROR_IO;
+        }
+        if (leptris_xsd_validate(xsd, doc)) {
+            printf("xsd: valid\n");
+        } else {
+            printf("xsd: invalid\n");
+            size_t n = leptris_xsd_error_count(xsd);
+            for (size_t i = 0; i < n; i++) {
+                const char* e = leptris_xsd_error_at(xsd, i);
+                if (e) printf("  %s\n", e);
+            }
+            invalid = 1;
+        }
+        leptris_xsd_free(xsd);
+    }
     if (sch_path) {
         cli_result_t r = run_schematron(
             sch_path, phase, want_svrl, doc, &invalid);
@@ -276,7 +317,8 @@ static cli_result_t validate_execute(int argc, char** argv) {
 
 static cli_command_t validate_command = {
     .name = "validate",
-    .description = "Validate XML against RELAX NG / Schematron",
+    .description =
+        "Validate XML against RELAX NG / Schematron / XSD",
     .execute = validate_execute,
     .print_help = NULL
 };

data/vendor-src/libleptris/test/cli/test_cli.cpp

@@ -552,3 +552,37 @@ TEST(CliValidate, MissingDtdIsIoError) {
 }
 
 #endif  /* !_WIN32 */
+
+// ---- validate --xsd (#1075 slice 5) ---------------------------------
+// The compiled XSD surface rides the same validate command as
+// dtd/rng/schematron. Windows runners: same harness limitation as
+// CliDiff (path + tmp semantics).
+#ifndef _WIN32
+TEST(CliValidateXsd, ValidDocumentExitsZero) {
+    write_file("leptris_cli_xsd.tmp",
+               "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+               "<xs:element name=\"r\" type=\"xs:integer\"/></xs:schema>");
+    auto r = run_cli({"validate", "--xsd", "leptris_cli_xsd.tmp",
+                      "-"}, "<r>7</r>");
+    EXPECT_EQ(r.exit_code, 0) << "stderr: " << r.err;
+    EXPECT_NE(r.out.find("xsd: valid"), std::string::npos);
+}
+
+TEST(CliValidateXsd, InvalidDocumentReportsAndExitsNonzero) {
+    write_file("leptris_cli_xsd2.tmp",
+               "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+               "<xs:element name=\"r\" type=\"xs:integer\"/></xs:schema>");
+    auto r = run_cli({"validate", "--xsd", "leptris_cli_xsd2.tmp",
+                      "-"}, "<r>nope</r>");
+    EXPECT_NE(r.exit_code, 0);
+    EXPECT_NE(r.out.find("xsd: invalid"), std::string::npos);
+}
+
+TEST(CliValidateXsd, CompileFailureIsReported) {
+    write_file("leptris_cli_xsd3.tmp", "<not-a-schema/>");
+    auto r = run_cli({"validate", "--xsd", "leptris_cli_xsd3.tmp",
+                      "-"}, "<r>7</r>");
+    EXPECT_NE(r.exit_code, 0);
+    EXPECT_NE(r.err.find("XSD compile failed"), std::string::npos);
+}
+#endif

data/vendor-src/libleptris/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "leptris",
-  "version": "1.9.321",
+  "version": "1.9.322",
   "description": "High-performance XML parser and XPath 1.0 engine in C (libleptris)",
   "homepage": "https://github.com/leptris/leptris",
   "license": "MIT",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.321.0
+  version: 1.9.322.0
 platform: aarch64-linux
 authors:
 - Ribose Inc.