Merge branch 'dev'

2 years ago · ac2a0f9283
3 changed files with 26 additions and 17 deletions
--- a/README.md
+++ b/README.md
@ -40,13 +40,17 @@ module.exports = {
				@@ -40,13 +40,17 @@ module.exports = {
 Options
 -------
 ```
-| Option  | Description                                                   |
-| ======= | ============================================================= |
-| doctype | The document type at the top of the markup. `html` by default |
-| ------- | ------------------------------------------------------------- |
-| expr    | A Scheme expression that processes your markup.               |
-|         | Insert `SXML_LOADER_CONTENT` where you want to process        |
-|         | the markup list.                                              |
+| Option         | Description                                            |
+| ============== | ====================================================== |
+| doctype        | The document type at the top of the markup.            |
+|                | `html` by default                                      |
+| -------------- | ------------------------------------------------------ |
+| expr           | A Scheme expression that processes your markup.        |
+|                | Insert `SXML_LOADER_CONTENT` where you want to process |
+|                | the markup list.                                       |
+| -------------- | ------------------------------------------------------ |
+| afterTranslate | A hook called after the SXML to HTML translation       |
+|                | is complete. `afterTranslate(markup: string): string`  |
 ```

 License
--- a/loader.js
+++ b/loader.js
@ -1,5 +1,6 @@
				@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright 2022 Ivan Polyakov
+
 const { spawn } = require('child_process');
 const { validate } = require('schema-utils');

@ -8,12 +9,15 @@ const schema = {
				@@ -8,12 +9,15 @@ const schema = {
    properties: {
        expr: {
            type: 'string',
-            default: '(use-modules (sxml simple))(sxml->xml SXML_LOADER_CONTENT)',
+            default: '(define loader-context \"SXML_LOADER_CONTEXT\")(use-modules (sxml simple))(sxml->xml SXML_LOADER_CONTENT)',
        },
        doctype: {
            type: 'string',
            default: '<!DOCTYPE html>',
        },
+        afterTranslate: {
+            instanceOf: 'Function',
+        },
    },
 };

@ -32,10 +36,16 @@ module.exports = function(content, map, meta) {
				@@ -32,10 +36,16 @@ module.exports = function(content, map, meta) {
    if (options.expr)
        expr = options.expr;
    expr = expr.replace('SXML_LOADER_CONTENT', content);
+    expr = expr.replace('SXML_LOADER_CONTEXT', this.context + '/');

    const cb = this.async();
    runScheme('guile', ['-c', expr]).then(data => {
-        cb(null, `${doctype}\n${data}`, map, meta);
+        let markup = `${doctype}\n${data}`;
+        if (options.afterTranslate) {
+            markup = options.afterTranslate(markup);
+        }
+
+        cb(null, markup, map, meta);
    }).catch(code => {
        console.error(`Guile exited with code ${code}`);
    });
@ -45,15 +55,10 @@ function runScheme(interpreter, flags) {
				@@ -45,15 +55,10 @@ function runScheme(interpreter, flags) {
    return new Promise((resolve, reject) => {
        const scheme = spawn(interpreter, flags);

-        scheme.stdout.on('data', (data) => {
-            resolve(data);
-        });
+        scheme.stdout.on('data', resolve);
        scheme.stderr.on('data', (data) => {
            console.error(data.toString());
        });
-        scheme.on('exit', (code) => {
-            if (code)
-                reject(code);
-        });
+        scheme.on('exit', reject);
    });
 }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 {
    "name": "sxml-loader",
-    "version": "0.3.2",
+    "version": "0.3.3",
    "description": "Scheme XML loader for webpack",
    "main": "loader.js",
    "bugs": "http://git.vilor.one/vilor/sxml-loader/issues",