@stxt-lang/core 0.7.1 → 0.8.1

package/out/core/InlineNode.js

@@ -37,7 +37,7 @@ class InlineNode extends Node_1.Node {
      * @param value new value, or null/undefined for none. It is trimmed.
      */
     setValue(value) {
-        this.value = (value ?? "").trim();
+        this.value = StringUtils_1.StringUtils.trim(value);
     }
     getText() {
         return this.value;

package/out/core/Line.d.ts

@@ -24,6 +24,6 @@ export declare class Line {
      * @param indentLength number of characters the indentation took up.
      */
     constructor(level: number, content: string, isComment: boolean, isBlock: boolean, indentLength: number);
-    /** @returns true if the line has no content beyond whitespace. */
+    /** @returns true if the line has no content beyond blanks (space/tab only, spec 4). */
     isEmpty(): boolean;
 }

package/out/core/Line.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Line = void 0;
+const StringUtils_1 = require("./StringUtils");
 /**
  * A source line already split into its indentation and its content, as produced by
  * {@link parseLine}. It is what tells the {@link Parser} whether the line opens a node, continues
@@ -23,9 +24,9 @@ class Line {
         this.isBlock = isBlock;
         this.indentLength = indentLength;
     }
-    /** @returns true if the line has no content beyond whitespace. */
+    /** @returns true if the line has no content beyond blanks (space/tab only, spec 4). */
     isEmpty() {
-        return this.content.trim() === "";
+        return StringUtils_1.StringUtils.trim(this.content) === "";
     }
 }
 exports.Line = Line;

package/out/core/LineParser.js

@@ -84,6 +84,7 @@ function parseLine(line, lastNodeBlock, lastLevel, numLine, validate = true) {
         throw new ParseException_1.ParseException(numLine, "INDENTATION_LEVEL_NOT_VALID", `Level of indent incorrect: ${level}`);
     }
     // General case: return the line without the indentation already consumed
-    return new Line_1.Line(level, line.substring(pointer).trim(), false, false, pointer);
+    // Blank-only trim (spec 4): an NBSP after the value is part of it
+    return new Line_1.Line(level, StringUtils_1.StringUtils.trim(line.substring(pointer)), false, false, pointer);
 }
 //# sourceMappingURL=LineParser.js.map

package/out/core/NameNamespaceParser.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NameNamespaceParser = void 0;
 const ParseException_1 = require("../exceptions/ParseException");
 const NameNamespace_1 = require("./NameNamespace");
+const StringUtils_1 = require("./StringUtils");
 /** Extracts the name and the namespace `(a.b.c)` from the left-hand side of an STXT line. */
 class NameNamespaceParser {
     constructor() {
@@ -21,7 +22,7 @@ class NameNamespaceParser {
         if (rawName === null || rawName === undefined) {
             throw new ParseException_1.ParseException(lineNumber, "INVALID_LINE", `Line not valid: ${fullLine}`);
         }
-        rawName = rawName.trim();
+        rawName = StringUtils_1.StringUtils.trim(rawName);
         const startIndex = rawName.indexOf("(");
         const endIndex = rawName.indexOf(")");
         let name;
@@ -31,7 +32,7 @@ class NameNamespaceParser {
             if (startIndex > endIndex || endIndex !== rawName.length - 1) {
                 throw new ParseException_1.ParseException(lineNumber, "INVALID_NAMESPACE", `Line not valid: ${fullLine}`);
             }
-            name = rawName.substring(0, startIndex).trim();
+            name = StringUtils_1.StringUtils.trim(rawName.substring(0, startIndex));
             // No trim: the grammar (STXT-SPEC 7/16) does not allow spaces inside '( )'
             namespace = rawName.substring(startIndex + 1, endIndex);
             if (namespace.length === 0) {

package/out/core/NodeCreator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNode = createNode;
+const StringUtils_1 = require("./StringUtils");
 const NameNamespaceParser_1 = require("./NameNamespaceParser");
 const InlineNode_1 = require("./InlineNode");
 const TextNode_1 = require("./TextNode");
@@ -47,7 +48,7 @@ function createNode(lineIndent, lineNumber) {
         name = line.substring(0, nodeIndex);
         value = line.substring(nodeIndex + Constants_1.Constants.SEP_NODE.length);
     }
-    if (textNode && value.trim().length > 0) {
+    if (textNode && StringUtils_1.StringUtils.trim(value).length > 0) {
         throw new ParseException_1.ParseException(lineNumber, "INLINE_VALUE_NOT_VALID", `Line not valid: ${line}`);
     }
     // The namespace the line declares, if any (empty when it inherits)

package/out/core/Parser.js

@@ -90,6 +90,12 @@ class Parser {
             // Parse the line
             const line = (0, LineParser_1.parseLine)(lineString, lastNodeText, lastLevel, lineNumber);
             if (line.isComment) {
+                // A comment at the level of an open block node (or shallower) closes the block
+                // (spec 6.1 and 9.1): a block is a literal and cannot be commented from inside.
+                // Only the block closes; the comment does not touch the rest of the hierarchy.
+                if (lastNodeText) {
+                    this.closeToLevel(stack, stack.length - 1, result);
+                }
                 // Hand it over to the observers
                 this.observers.forEach(observer => {
                     observer.onComment(lineNumber, lineString);

package/out/core/StringUtils.d.ts

@@ -1,12 +1,30 @@
 /** String normalization helpers used for names, namespaces and values. */
 export declare class StringUtils {
     private static readonly NODE_NAME;
+    private static readonly NODE_NAME_LETTER_OR_DIGIT;
+    private static readonly LEADING_BLANKS;
+    private static readonly TRAILING_BLANKS;
+    private static readonly BLANK_RUN;
     private constructor();
     /**
-     * Removes the trailing whitespace of a string.
+     * Tells whether a character is an STXT blank (STXT-SPEC 4): space or tab.
      *
-     * @param s string to strip the trailing spaces from.
-     * @returns the string without trailing whitespace; null/undefined is treated as the empty string.
+     * @param c single character.
+     * @returns true for U+0020 and U+0009 only.
+     */
+    static isBlank(c: string): boolean;
+    /**
+     * Removes the leading and trailing blanks (space and tab only, STXT-SPEC 4) of a string.
+     *
+     * @param s string to trim.
+     * @returns the trimmed string; null/undefined is treated as the empty string.
+     */
+    static trim(s: string | null | undefined): string;
+    /**
+     * Removes the trailing blanks (space and tab only, STXT-SPEC 4, 10.2) of a string.
+     *
+     * @param s string to strip the trailing blanks from.
+     * @returns the string without trailing blanks; null/undefined is treated as the empty string.
      */
     static rightTrim(s: string | null | undefined): string;
     /**
@@ -24,10 +42,10 @@ export declare class StringUtils {
      */
     static lowerCase(input: string | null | undefined): string;
     /**
-     * Trims a string and collapses its inner whitespace.
+     * Trims a string and collapses its inner runs of blanks (space and tab only).
      *
      * @param s string to compact.
-     * @returns the string with the outer spaces trimmed and the inner ones collapsed into a single one; null/undefined is treated as the empty string.
+     * @returns the string with the outer blanks trimmed and the inner runs collapsed into a single space; null/undefined is treated as the empty string.
      */
     static compactSpaces(s: string | null | undefined): string;
     /**

package/out/core/StringUtils.js

@@ -5,20 +5,33 @@ exports.StringUtils = void 0;
 class StringUtils {
     constructor() {
     }
+    /**
+     * Tells whether a character is an STXT blank (STXT-SPEC 4): space or tab.
+     *
+     * @param c single character.
+     * @returns true for U+0020 and U+0009 only.
+     */
+    static isBlank(c) {
+        return c === " " || c === "\t";
+    }
+    /**
+     * Removes the leading and trailing blanks (space and tab only, STXT-SPEC 4) of a string.
+     *
+     * @param s string to trim.
+     * @returns the trimmed string; null/undefined is treated as the empty string.
+     */
+    static trim(s) {
+        return (s ?? "").replace(this.LEADING_BLANKS, "").replace(this.TRAILING_BLANKS, "");
+    }
     // Used for name>> nodes
     /**
-     * Removes the trailing whitespace of a string.
+     * Removes the trailing blanks (space and tab only, STXT-SPEC 4, 10.2) of a string.
      *
-     * @param s string to strip the trailing spaces from.
-     * @returns the string without trailing whitespace; null/undefined is treated as the empty string.
+     * @param s string to strip the trailing blanks from.
+     * @returns the string without trailing blanks; null/undefined is treated as the empty string.
      */
     static rightTrim(s) {
-        const value = s ?? "";
-        let i = value.length - 1;
-        while (i >= 0 && /\s/.test(value.charAt(i))) {
-            i--;
-        }
-        return value.substring(0, i + 1);
+        return (s ?? "").replace(this.TRAILING_BLANKS, "");
     }
     // Used for BASE64 and HEXADECIMAL nodes
     /**
@@ -43,13 +56,13 @@ class StringUtils {
     }
     // Used for the name of the nodes
     /**
-     * Trims a string and collapses its inner whitespace.
+     * Trims a string and collapses its inner runs of blanks (space and tab only).
      *
      * @param s string to compact.
-     * @returns the string with the outer spaces trimmed and the inner ones collapsed into a single one; null/undefined is treated as the empty string.
+     * @returns the string with the outer blanks trimmed and the inner runs collapsed into a single space; null/undefined is treated as the empty string.
      */
     static compactSpaces(s) {
-        return (s ?? "").trim().replace(/\s+/g, " ");
+        return this.trim(s).replace(this.BLANK_RUN, " ");
     }
     /**
      * Tells whether a value is a valid STXT node name.
@@ -62,7 +75,7 @@ class StringUtils {
      */
     static isValidNodeName(input) {
         const nfc = this.compactSpaces(input).normalize("NFC");
-        return this.NODE_NAME.test(nfc) && this.normalize(nfc).length > 0;
+        return this.NODE_NAME.test(nfc) && this.NODE_NAME_LETTER_OR_DIGIT.test(nfc);
     }
     // Used for the normalized name of the nodes (STXT-SPEC 4.3): NFC + lower case,
     // keeping diacritics and non-Latin alphabets (IDN model)
@@ -73,21 +86,29 @@ class StringUtils {
      * @returns the canonical name of a node: NFC + lower case, with separators collapsed into '-'; null/undefined is treated as the empty string.
      */
     static normalize(input) {
-        let s = (input ?? "").trim();
+        let s = this.trim(input);
         if (s.length === 0) {
             return "";
         }
         s = s.normalize("NFC");
         s = s.toLowerCase();
-        // every run of separators ('-', '_', spaces) => a single '-'
-        s = s.replace(/[-_\s]+/g, "-");
+        // every run of separators ('-', '_', blanks) => a single '-'
+        s = s.replace(/[-_ \t]+/g, "-");
         // trim the '-'
         s = s.replace(/^-+|-+$/g, "");
         return s;
     }
 }
 exports.StringUtils = StringUtils;
-// STXT-SPEC 4.2 / 4.3: validate the logical name after NFC so that a
+// STXT-SPEC 4.2 / 4.3: letters, decimal digits, combining marks (Mn, Mc) and the three
+// separators, with at least one letter or digit. Validated after NFC so that a
 // decomposed spelling such as "e" + combining acute is accepted as "é".
-StringUtils.NODE_NAME = /^[\p{L}\p{Nd}\-_ ]+$/u;
+StringUtils.NODE_NAME = /^[\p{L}\p{Nd}\p{Mn}\p{Mc}\-_ ]+$/u;
+StringUtils.NODE_NAME_LETTER_OR_DIGIT = /[\p{L}\p{Nd}]/u;
+// STXT-SPEC 4: a blank is exactly U+0020 or U+0009. Every trim in the core works on
+// these two characters only; String.prototype.trim and /\s/ are deliberately avoided
+// because they also remove NBSP, U+3000, U+2028... which STXT treats as content.
+StringUtils.LEADING_BLANKS = /^[ \t]+/;
+StringUtils.TRAILING_BLANKS = /[ \t]+$/;
+StringUtils.BLANK_RUN = /[ \t]+/g;
 //# sourceMappingURL=StringUtils.js.map

package/out/runtime/ConditionalValidator.d.ts

@@ -5,6 +5,10 @@ import { ValidationException } from "../exceptions/ValidationException";
 /**
  * Wrapper around a {@link SchemaValidator} that only validates namespaced nodes, so that a
  * document mixing schema-bound and free nodes does not report the free ones as unknown.
+ *
+ * @deprecated since 0.8.0: {@link SchemaValidator} applies this rule itself (STXT-SCHEMA-SPEC 5,
+ * the empty namespace is never validated), so the wrapper adds nothing. Register the
+ * `SchemaValidator` directly. Kept for compatibility; to be removed in 1.0.
  */
 export declare class ConditionalValidator implements Validator {
     private readonly schemaValidator;

package/out/runtime/ConditionalValidator.js

@@ -4,6 +4,10 @@ exports.ConditionalValidator = void 0;
 /**
  * Wrapper around a {@link SchemaValidator} that only validates namespaced nodes, so that a
  * document mixing schema-bound and free nodes does not report the free ones as unknown.
+ *
+ * @deprecated since 0.8.0: {@link SchemaValidator} applies this rule itself (STXT-SCHEMA-SPEC 5,
+ * the empty namespace is never validated), so the wrapper adds nothing. Register the
+ * `SchemaValidator` directly. Kept for compatibility; to be removed in 1.0.
  */
 class ConditionalValidator {
     /**

package/out/schema/SchemaValidator.js

@@ -26,6 +26,18 @@ class SchemaValidator {
         const errors = [];
         // Get the namespace
         const namespace = node.getNamespace();
+        // The empty namespace is never validated (STXT-SCHEMA-SPEC 5): a node that neither
+        // declares nor inherits a namespace is valid by definition, no schema is looked up for
+        // it and SCHEMA_NOT_FOUND is never reported for it. Its children are still walked when
+        // recursive, because one of them may declare a namespace of its own.
+        if (namespace === "") {
+            if (this.recursiveValidation && node instanceof InlineNode_1.InlineNode) {
+                for (const childNode of node.getChildren()) {
+                    errors.push(...this.validate(childNode));
+                }
+            }
+            return errors;
+        }
         const schema = this.schemaProvider.getSchema(namespace);
         if (!schema) {
             errors.push(new ValidationException_1.ValidationException(node.getLine(), "SCHEMA_NOT_FOUND", `Not found schema: ${namespace}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stxt-lang/core",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Parser and schema validator for STXT, an indentation-based structured-text format.",
   "main": "out/all.js",
   "types": "out/all.d.ts",