yini-parser 1.4.2-beta → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.4.3 - 2026 Apr
+- **Fixed:** Rebuilt the project and reduced reported vulnerabilities from 4 to 0.
+  
+## 1.4.3-beta - 2026 Mar
+- **Fixed:** Error messages and thrown parse errors now include correct line and column information again.
+- **Improved:** Syntax and string-related parse errors are now clearer and more consistent.
+- **Improved:** Reduced some duplicate follow-up errors during recovery after invalid input.
+- **Added:** Regression tests for diagnostics, thrown errors, and line/column reporting.
+
 ## 1.4.2-beta - 2026 Mar
 - **Fixed:** Error messages now include line and column information again. This was unintentionally missing after the previous update.
 - **Added:** Test cases to help ensure line and column information is preserved in future updates.

package/README.md

@@ -1,145 +1,68 @@
-# YINI Parser for Node.js
-> **Readable configuration without YAML foot-guns or JSON noise.**  
+# yini-parser
+> **Readable configuration for Node.js and TypeScript — without YAML foot-guns or JSON noise.**  
 
-The official TypeScript / Node.js parser for **YINI** (by the YINI-lang project) — an INI-inspired, human-readable text format for structured information.  
+The official TypeScript / Node.js parser for **YINI** (by the YINI-lang project) — a human-friendly configuration format with real structure, nested sections, comments, and predictable parsing.
+
+YINI is designed for applications, tools, and services that need configuration that stays readable for humans without becoming vague, fragile, or hard to maintain.  
 
 [![npm version](https://img.shields.io/npm/v/yini-parser.svg)](https://www.npmjs.com/package/yini-parser) [![All Test Suites](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-all-tests.yml/badge.svg)](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-all-tests.yml) [![All Regression Tests](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-regression-tests.yml/badge.svg)](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-regression-tests.yml) [![Grammar Drift Check](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-grammar-drift-check.yml/badge.svg)](https://github.com/YINI-lang/yini-parser-typescript/actions/workflows/run-grammar-drift-check.yml) [![npm downloads](https://img.shields.io/npm/dm/yini-parser)](https://www.npmjs.com/package/yini-parser)
 
-Designed to bring structure, clarity, and predictable behavior to real-world configuration needs. Well suited for applications, tools, and services that need readable yet structured configuration.
+## Quick Start
 
 ```sh
 npm install yini-parser
 ```
 
-```ts
-import YINI from 'yini-parser'
-const config = YINI.parseFile('./config.yini')
-```
-
-```sh
-npm run test
-```
-
-➡️ See full [documentation or YINI format specification](https://github.com/YINI-lang/YINI-spec)
-
----
-
-## Example of YINI code
-> A basic YINI configuration example, showing a section, nested section, comments:  
-![YINI Config Example](./samples/basic.yini.png)
-Source: [basic.yini](./samples/basic.yini)
-
-## YINI Parser – (source code in TypeScript)
-
-A runtime parser for the official [YINI configuration file format](https://github.com/YINI-lang/YINI-spec).  
-
-The parser follows the official YINI specification and is implemented in TypeScript.
-
----
-
-## Quick Start
-
-A small example using YINI in TypeScript/JavaScript:
 ```ts
 import YINI from 'yini-parser'
 
 const config = YINI.parse(`
-    // YINI is a simple, human-readable configuration file format.
-
-    // Note: In YINI, spaces and tabs never change meaning.
-    // Indentation is only for readability.
+^ App
+name = 'My App'
+darkMode = true
 
-    ^ App                      // Definition of section (group) "App" 
-      name     = 'My Title'    // Keys and values are written as key = value
-      items    = 25
-      darkMode = true          // "ON" and "YES" works too
-
-        // Sub-section of the "App" section
-        ^^ Special
-           primaryColor = #336699   // Hex number format
-           isCaching    = false     // "OFF" and "NO" works too
+    ^^ Features
+    caching = on
 `)
 
-// To parse from a file instead:
-// const config = YINI.parseFile('./config.yini')
-
-console.log(config.App.name)                // My Title
-console.log(config.App.Special.isCaching)   // false
-console.log()
-console.log(config)
-```
-
-**Output:**
-```js
-My Title
-false
-
-{
-    App: {
-        name: 'My Title',
-        items: 25,
-        darkMode: true,
-        Special: { 
-            primaryColor: 3368601,
-            isCaching: false
-        }
-    }
-}
+console.log(config.App.name)              // My App
+console.log(config.App.Features.caching)  // true
 ```
 
-That's it!
-
-- ▶️ Link to [Demo Apps](https://github.com/YINI-lang/yini-demo-apps/tree/main) with complete basic usage.
-
----
-
-## Example 2
-> A real-world YINI configuration example, showing sections, nesting, comments, and multiple data types:  
-![YINI Config Example](./samples/config.yini.png)
-Source: [config.yini](./samples/config.yini)
-
-## 📂 More Examples
-
-- ▶️ Explore more [YINI examples](https://yini-lang.org/learn-yini/examples/?utm_source=yini-parser-ts&utm_medium=github&utm_campaign=repo-link&utm_content=readme).
-
----
-
-### Who is this for?
-
-YINI is designed as an ideal option for application developers, platform teams, DevOps engineers, and anyone maintaining complex configuration at scale.
+➡️ Learn more in the [YINI specification and documentation](https://yini-lang.org/refs/specification).
 
 ---
 
-## 🙋‍♀️ Why YINI?
-- **Indentation-independent structure:** The YINI config format is indentation-independent, meaning spaces and tabs never affect meaning.
-- **Explicit nesting for easy refactoring & large configs:** It uses clear header markers (`^`, `^^`, `^^^`) to define hierarchy (like in Markdown), without long dotted keys.
-- **Multiple data types:** Supports boolean literals (`true` / `false`, `Yes` / `No`, etc), numbers, arrays (lists), and JS-style objects natively, with explicit string syntax.
-- **Comments support:** YINI supports multiple comment styles (`#`, `//`, `/* ... */`, and `;`). Allows you to document configuration directly in the file.
-- **Predictable parsing rules:** Fewer production surprises, well-defined rules with optional strict and lenient modes, for different use cases.
+## 🙋‍♀️ Why try YINI?
 
+- **Readable by humans** — Less noisy than JSON, less fragile than indentation-driven formats.
+- **Structured enough for real configuration** — Sections, nested sections, lists, objects, booleans, and null.
+- **Predictable parsing** — Explicit syntax with clear rules.
+- **Easy to use from TypeScript/Node.js** — Parse from strings or files in a few lines.
+  
 ---
 
-## ✨ Features
-- Simple syntax (supports both strict and lenient modes).
-- Familiar config file style (inspired by INI, JSON, Python, and Markdown).
-- Easy programmatic usage.
-- Only the `YINI` class is exported; all internal details are private.
-- Arrays/Lists (bracketed): `list = [10, 20, 30]`
-- JavaScript-style objects (inline maps).
+## What YINI looks like in practice
+> A basic YINI configuration example, showing a section, nested section, comments:  
+![YINI Config Example](./samples/basic.yini.png)
+Source: [basic.yini](./samples/basic.yini)
 
-⭐ If you find this useful, please consider starring the project on GitHub.
+- ▶️ Link to [Demo Apps](https://github.com/YINI-lang/yini-demo-apps/tree/main) with complete basic usage.
 
 ---
 
-## 🧪 Stability & Guarantees
-
-This parser is continuously validated through comprehensive regression and smoke tests, ensuring deterministic parsing behavior across default, strict, and metadata-enabled modes.
+## Why YINI works well for configuration
+- **Indentation-independent structure:** Spaces and tabs never change meaning, so files can be reformatted without changing structure.
+- **Explicit nesting:** Hierarchy is defined with section markers like `^`, `^^`, and `^^^`, making large configurations easier to scan and refactor.
+- **Multiple data types:** Supports booleans (`true` / `false`, `yes` / `no`, etc.), numbers, lists, and inline objects, with explicit string syntax.
+- **Comment support:** YINI supports multiple comment styles (`#`, `//`, `/* ... */`, and `;`), making it easier to document configuration directly in the file.
+- **Predictable parsing:** Clear rules with optional strict and lenient modes for different use cases.
 
 ---
 
 ## Usage
 
-### Installation
+### Install with your package manager
 
 With **npm**:
 ```sh
@@ -160,8 +83,7 @@ pnpm add yini-parser
 **Note:** Only a default export (YINI) is provided. Named imports are not supported.
 ```js
 const YINI = require('yini-parser').default;
-// (!) If you get undefined, try:
-// (Some Node.js setups require the .default property, others don't, due to ESM/CommonJS interop quirks.)
+// If your setup handles default interop differently, try:
 // const YINI = require('yini-parser');
 
 // Parse from string.
@@ -206,54 +128,50 @@ const configFromFile = YINI.parseFile('./config.yini');
 
 ---
 
-## 🛠 Roadmap
-
-1. **Improve existing functionality** — Ongoing improvements to core parsing, richer diagnostics, and expanded QA for areas not yet fully covered.
-2. **Full spec compliance** — Complete support for all features in the YINI Specification v1.0.0 (and the latest RCs).
-   - Progress and current status are tracked in [FEATURE-CHECKLIST.md](https://github.com/YINI-lang/yini-parser-typescript/blob/main/FEATURE-CHECKLIST.md).
-3. **Schema validation (future)** — Possible future expansion to support schema/contract validation for stricter type-safe configs.
-4. **Ecosystem integration** - Broader and additional support for tooling, and other ecosystem projects.
+## 📂 More Examples
 
-### Planned & Upcoming Features
-Some advanced YINI features are still evolving and are tracked transparently.
+- ▶️ Explore more [YINI examples](https://yini-lang.org/learn-yini/examples/?utm_source=yini-parser-ts&utm_medium=github&utm_campaign=repo-link&utm_content=readme).
 
-You can follow progress in the [YINI parser FEATURE-CHECKLIST](https://github.com/YINI-lang/yini-parser-typescript/blob/main/FEATURE-CHECKLIST.md). Contributions and feature requests are welcome!
+### Example 2
+> A real-world YINI configuration example, showing sections, nesting, comments, and multiple data types:  
+![YINI Config Example](./samples/config.yini.png)
+Source: [config.yini](./samples/config.yini)
 
 ---
 
-## 🤝 Contributing
-We welcome feedback, bug reports, feature requests, and code contributions!
-- [Open an Issue](https://github.com/YINI-lang/yini-parser-typescript/issues)
-- [Start a Discussion](https://github.com/YINI-lang/yini-parser-typescript/discussions)
-  
-
-If this library is useful to you, a GitHub star helps guide future development.
-
----
+## 🧪 Testing and Stability
 
-## 📚 Documentation
-- [Project Setup](https://github.com/YINI-lang/yini-parser-typescript/blob/main/docs/Project-Setup.md) — How to run, test, and build the project, etc.
-- [Conventions](https://github.com/YINI-lang/yini-parser-typescript/blob/main/docs/Conventions.md) — Project conventions, naming patterns, etc.
+This parser is continuously validated through comprehensive regression and smoke tests, ensuring deterministic parsing behavior across default, strict, and metadata-enabled modes.
 
 ---
 
 ## Links
-- ➡️ [Read the YINI Specification](https://github.com/YINI-lang/YINI-spec/tree/production/YINI-Specification.md#table-of-contents)  
-  *Full formal spec for the YINI format, including syntax and features.*
+- ➡️ [YINI Homepage](https://yini-lang.org)  
+  *Tutorials, guides, and examples.*
 
 - ➡️ [YINI CLI on GitHub](https://github.com/YINI-lang/yini-cli)  
-  *TypeScript source code, issue tracker, and contributing guide.*
+  *CLI tooling for working with YINI files.*
 
 - ➡️ [YINI Project](https://github.com/YINI-lang)  
-  *YINI home on GitHub.*
+  *Repositories and related ecosystem projects.*
 
-- ➡️ [YINI Homepage](https://yini-lang.org)  
-  *Tutorials & Docs.*
+---
+
+## 🤝 Contributing
+We welcome feedback, bug reports, feature requests, and code contributions!
+- [Open an Issue](https://github.com/YINI-lang/yini-parser-typescript/issues)
+- [Start a Discussion](https://github.com/YINI-lang/yini-parser-typescript/discussions)
+  
+If this library is useful to you, a GitHub star helps more people discover the project and supports future development.
+
+### Documentation
+- [Project Setup](https://github.com/YINI-lang/yini-parser-typescript/blob/main/docs/Project-Setup.md) — How to run, test, and build the project, etc.
+- [Conventions](https://github.com/YINI-lang/yini-parser-typescript/blob/main/docs/Conventions.md) — Project conventions, naming patterns, etc.
 
 ---
 
 ## License
-This project is licensed under the Apache-2.0 license - see the [LICENSE](<./LICENSE>) file for details.
+This project is licensed under the Apache-2.0 license — see the [LICENSE](./LICENSE) file for details.
 
 In this project on GitHub, the `libs` directory contains third party software and each is licensed under its own license which is described in its own license file under the respective directory under `libs`.
 
@@ -264,4 +182,4 @@ In this project on GitHub, the `libs` directory contains third party software an
 > 
 > Predictable configuration with clear rules.  
 
-[yini-lang.org](https://yini-lang.org/?utm_source=github&utm_medium=referral&utm_campaign=yini_parser_ts&utm_content=readme_footer) · [YINI on GitHub](https://github.com/YINI-lang)  
+[yini-lang.org](https://yini-lang.org/?utm_source=github&utm_medium=referral&utm_campaign=yini_parser_ts&utm_content=readme_footer) · [YINI-lang on GitHub](https://github.com/YINI-lang)  

package/dist/core/astBuilder.js

@@ -386,16 +386,39 @@ class ASTBuilder extends YiniParserVisitor_1.default {
                 }
             }
             const resultKey = (0, string_1.trimBackticks)(rawKey);
+            const rawMemberText = ctx.getText();
             const rawValue = ctx.value?.()?.getText();
             (0, print_1.debugPrint)(`visitMember(..): rawValue = ` + ctx.value?.()?.getText());
+            (0, print_1.debugPrint)(`visitMember(..): rawMemberText = ` + rawMemberText);
+            /* NOTE:
+                ctx.value() can be missing after parser recovery, even when the user did type something after ""=".
+    
+                Example:
+                    port = 54_32
+    
+                ANTLR may reject 54_32, and then ctx.value() may not exist in the AST as you expect.
+                So rawValue alone is not enough to know whether this was:
+                    * truly empty: port =
+                    * malformed: port = 54_32
+                    * rawMemberText lets one inspect the whole member text.
+             */
             let valueContext = ctx.value?.();
             let valueNode;
-            if (!rawValue) {
-                // treatEmptyValueAsNull = 'allow' (default in lenient mode, empty value => Null in lenient mode)
-                // if (!this.isStrict) {
+            const hasEquals = rawMemberText.includes('=');
+            // const hasTextAfterEquals = hasEquals
+            //     ? rawMemberText.split('=').slice(1).join('=').trim().length > 0
+            //     : false
+            const eqIndex = rawMemberText.indexOf('=');
+            const hasTextAfterEquals = eqIndex >= 0 && rawMemberText.slice(eqIndex + 1).trim().length > 0;
+            if (!valueContext || !rawValue) {
+                // Case 1: there is text after '=' but parser could not form a valid value.
+                // Parser-level syntax error has likely already been reported.
+                if (hasTextAfterEquals) {
+                    return makeScalarValue('Undefined', undefined, 'Parser syntax error already reported');
+                }
+                // Case 2: truly empty value.
                 switch (this.options.rules.treatEmptyValueAsNull) {
                     case 'allow':
-                        // Lenient mode: implicit null, no warning (treatEmptyValueAsNull = 'allow').
                         valueNode = makeScalarValue('Null', null, 'Implicit null (empty value)');
                         break;
                     case 'allow-with-warning':
@@ -403,41 +426,56 @@ class ASTBuilder extends YiniParserVisitor_1.default {
                         this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Warning', `Empty value treated as null for key '${resultKey}'.`, `An empty value after '=' was encountered. Per 'treatEmptyValueAsNull = allow-with-warning', interpreted as null.`, `If you intended null, write it explicitly: ${resultKey} = null. Otherwise provide a non-empty value or set 'treatEmptyValueAsNull' to 'disallow'.`);
                         break;
                     case 'disallow':
-                        // treatEmptyValueAsNull = 'disallow' (default in strict mode)
-                        // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
-                        this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', `Missing value for key '${resultKey}'.`, `Expected a value after '=' but found none. Implicit nulls are disallowed by 'treatEmptyValueAsNull = disallow'.`, `Write 'null' explicitly (${resultKey} = null) if that is intended, or provide a concrete value.`);
-                        break;
+                        this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', `Missing value for key '${resultKey}'`, `Expected a value after '=' but found none. Implicit nulls are disallowed by 'treatEmptyValueAsNull = disallow'.`, `Write 'null' explicitly (${resultKey} = null) if that is intended, or provide a concrete value.`);
+                        return makeScalarValue('Undefined', undefined, 'Missing value already reported');
                 }
             }
             else {
-                valueNode = this.visitValue?.(valueContext);
+                valueNode = this.visitValue(valueContext);
             }
             (0, print_1.debugPrint)('visitMember(..): valueNode:');
             if ((0, env_1.isDebug)()) {
                 (0, print_1.printObject)(valueNode);
             }
-            // if (!valueNode || valueNode.type === 'Undefined') {
-            //     // Note, after pushing processing may continue or exit, depending on the error and/or the bail threshold.
-            //     this.errorHandler!.pushOrBail(
-            //         toErrorLocation(ctx),
-            //         'Syntax-Error',
-            //         'Invalid value',
-            //         `Invalid value for key '${resultKey} in member (<key> = <value> pair)'.`,
-            //         `Got '${rawValue}', but expected a valid value/literal (string, number, boolean, null, list, or object). Optionally with a single leading minus sign '-'.`,
-            //     )
-            // }
+            /*
+            if (!valueNode) {
+                this.errorHandler!.pushOrBail(
+                    toErrorLocation(ctx),
+                    'Syntax-Error',
+                    'Invalid value',
+                    `Invalid value for key '${resultKey}' in member (<key> = <value> pair).`,
+                    `Got '${rawValue}', but expected a valid value/literal (string, number, boolean, null, list, or object). Optionally with a single leading minus sign '-'.`,
+                )
+            } else if (
+                valueNode.type === 'Undefined' &&
+                valueNode.tag !== 'Invalid string literal already reported'
+            ) {
+                this.errorHandler!.pushOrBail(
+                    toErrorLocation(ctx),
+                    'Syntax-Error',
+                    'Invalid value',
+                    `Invalid value for key '${resultKey}' in member (<key> = <value> pair).`,
+                    `Got '${rawValue}', but expected a valid value/literal (string, number, boolean, null, list, or object). Optionally with a single leading minus sign '-'.`,
+                )
+            }*/
             if (!valueNode) {
                 this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Invalid value', `Invalid value for key '${resultKey}' in member (<key> = <value> pair).`, `Got '${rawValue}', but expected a valid value/literal (string, number, boolean, null, list, or object). Optionally with a single leading minus sign '-'.`);
             }
             else if (valueNode.type === 'Undefined' &&
-                valueNode.tag !== 'Invalid string literal already reported') {
+                valueNode.tag !== 'Invalid string literal already reported' &&
+                valueNode.tag !== 'Missing value already reported' &&
+                valueNode.tag !== 'Parser syntax error already reported') {
                 this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Invalid value', `Invalid value for key '${resultKey}' in member (<key> = <value> pair).`, `Got '${rawValue}', but expected a valid value/literal (string, number, boolean, null, list, or object). Optionally with a single leading minus sign '-'.`);
             }
+            // It keeps the sentinel tags useful for control flow inside visitMember(..),
+            // but prevents them from leaking into the final parsed structure.
             const current = this.sectionStack[this.sectionStack.length - 1];
-            if (valueNode !== undefined) {
-                this.putMember(this.errorHandler, ctx, current, resultKey, valueNode, 
-                // this.ast,
-                this.onDuplicateKey);
+            const shouldSkipMemberInsertion = valueNode?.type === 'Undefined' &&
+                (valueNode.tag === 'Invalid string literal already reported' ||
+                    valueNode.tag === 'Missing value already reported' ||
+                    valueNode.tag === 'Parser syntax error already reported');
+            if (!shouldSkipMemberInsertion && valueNode !== undefined) {
+                this.putMember(this.errorHandler, ctx, current, resultKey, valueNode, this.onDuplicateKey);
             }
             return valueNode;
         };
@@ -491,48 +529,104 @@ class ASTBuilder extends YiniParserVisitor_1.default {
          * @param ctx the parse tree
          * @return the visitor result
          */
-        this.visitString_literal = (ctx) => {
-            let text = '';
+        /*
+        visitString_literal = (ctx: String_literalContext): any => {
+            let text = ''
+    
             const pieces = [
                 ctx.STRING(),
                 ...(ctx.string_concat_list()?.map((c) => c.STRING()) ?? []),
-            ];
+            ]
+    
             try {
                 for (const token of pieces) {
-                    const tokenText = token.getText();
-                    const parsed = this.extractStringKindAndValue(tokenText);
-                    // text += parseStringLiteral(parsed)
-                    let txt = '';
+                    const tokenText = token.getText()
+                    const parsed = this.extractStringKindAndValue(tokenText)
+    
                     try {
-                        text += (0, parseString_1.default)(parsed);
-                    }
-                    catch (err) {
-                        const msg = '' + err?.message;
-                        this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Parse error in string', `${msg}`);
+                        text += parseStringLiteral(parsed)
+                    } catch (err: unknown) {
+                        const msg = '' + (<any>err)?.message
+                        this.errorHandler!.pushOrBail(
+                            toErrorLocation(ctx),
+                            'Syntax-Error',
+                            'Parse error in string',
+                            `${msg}`,
+                        )
                     }
                 }
-                return makeScalarValue('String', text);
-            }
-            catch (err) {
-                const msg = err instanceof Error ? err.message : String(err);
-                let msgWhat = 'Invalid string literal';
-                let msgWhy = msg;
-                let msgHint = '';
-                if (err instanceof parseString_1.CYiniStringParseError) {
-                    msgWhat = 'Invalid escape sequence in string';
-                    msgWhy = msg;
+    
+                return makeScalarValue('String', text)
+            } catch (err: unknown) {
+                const msg = err instanceof Error ? err.message : String(err)
+    
+                let msgWhat = 'Invalid string literal'
+                let msgWhy = msg
+                let msgHint = ''
+    
+                if (err instanceof CYiniStringParseError) {
+                    msgWhat = 'Invalid escape sequence in string'
+                    msgWhy = msg
+    
                     if (/Invalid escape sequence \\\\/.test(msg)) {
                         msgHint =
-                            'Use double backslashes (\\\\) in C-strings, or use a raw string for file paths.';
-                    }
-                    else if (/end of string/i.test(msg)) {
+                            'Use double backslashes (\\\\) in C-strings, or use a raw string for file paths.'
+                    } else if (/end of string/i.test(msg)) {
                         msgHint =
-                            'Check that all escape sequences in the C-string are complete and valid.';
+                            'Check that all escape sequences in the C-string are complete and valid.'
                     }
                 }
-                this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', msgWhat, msgWhy, msgHint);
-                return makeScalarValue('Undefined', undefined, 'Invalid string literal');
+    
+                this.errorHandler!.pushOrBail(
+                    toErrorLocation(ctx),
+                    'Syntax-Error',
+                    msgWhat,
+                    msgWhy,
+                    msgHint,
+                )
+    
+                return makeScalarValue(
+                    'Undefined',
+                    undefined,
+                    'Invalid string literal',
+                )
             }
+        }
+        */
+        this.visitString_literal = (ctx) => {
+            let text = '';
+            const pieces = [
+                ctx.STRING(),
+                ...(ctx.string_concat_list()?.map((c) => c.STRING()) ?? []),
+            ];
+            for (const token of pieces) {
+                const tokenText = token.getText();
+                const parsed = this.extractStringKindAndValue(tokenText);
+                try {
+                    text += (0, parseString_1.default)(parsed);
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    let msgWhat = 'Parse error in string';
+                    let msgWhy = msg;
+                    let msgHint = '';
+                    if (err instanceof parseString_1.CYiniStringParseError) {
+                        if (/Invalid escape sequence/i.test(msg)) {
+                            msgWhat = 'Invalid escape sequence in string';
+                            msgHint =
+                                'Use double backslashes (\\\\) in C-strings, or use a raw string if escapes are not needed.';
+                        }
+                        else if (/end of string/i.test(msg)) {
+                            msgWhat = 'Incomplete escape sequence in string';
+                            msgHint =
+                                'Check that all escape sequences in the C-string are complete and valid.';
+                        }
+                    }
+                    this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', msgWhat, msgWhy, msgHint);
+                    return makeScalarValue('Undefined', undefined, 'Invalid string literal already reported');
+                }
+            }
+            return makeScalarValue('String', text);
         };
         /**
          * Visit a parse tree produced by `YiniParser.number_literal`.
@@ -741,17 +835,37 @@ class ASTBuilder extends YiniParserVisitor_1.default {
          * @param ctx the parse tree
          * @return the visitor result
          */
+        /*
+        visitString_concat = (ctx: String_concatContext): any => {
+            const rawText = ctx.STRING().getText() // The token text.
+            const parsedInput = this.extractStringKindAndValue(rawText)
+            // return parseStringLiteral(parsedInput)
+    
+            let txt = ''
+            try {
+                txt = parseStringLiteral(parsedInput)
+            } catch (err) {
+                const msg = '' + (<any>err)?.message
+                this.errorHandler!.pushOrBail(
+                    toErrorLocation(ctx),
+                    'Syntax-Error',
+                    'Parse error in string',
+                    `${msg}`,
+                )
+            }
+        }
+        */
+        //@ todo (?) Check that this function actually works, not sure this function is finished.
         this.visitString_concat = (ctx) => {
-            const rawText = ctx.STRING().getText(); // The token text.
+            const rawText = ctx.STRING().getText();
             const parsedInput = this.extractStringKindAndValue(rawText);
-            // return parseStringLiteral(parsedInput)
-            let txt = '';
             try {
-                txt = (0, parseString_1.default)(parsedInput);
+                return (0, parseString_1.default)(parsedInput);
             }
             catch (err) {
-                const msg = '' + err?.message;
-                this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Parse error in string', `${msg}`);
+                const msg = err instanceof Error ? err.message : String(err);
+                this.errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Parse error in string', msg);
+                return undefined;
             }
         };
         /**