@rws-framework/client 2.20.1 → 2.20.3

package/cfg/tsconfigSetup.js

@@ -1,147 +1,147 @@
-const md5 = require('md5');
-const chalk = require('chalk');
-const tools = require('../_tools');
-const { rwsPath } = require('@rws-framework/console');
-const path = require('path');
-const fs = require('fs');
-
-function setupTsConfig(tsConfigPath, executionDir, pkgPath, userAliases = {}) {
-
-    if (!fs.existsSync(tsConfigPath)) {
-        throw new Error(`Typescript config file "${tsConfigPath}" does not exist`);
-    }
-
-    const tsConfigContents = fs.readFileSync(tsConfigPath, 'utf-8');
-
-    try {
-        let tsConfig = JSON.parse(tsConfigContents);
-
-        const declarationsPath = path.resolve(pkgPath, 'types') + '/declarations.d.ts';
-        const foundationPath = path.resolve(pkgPath, 'foundation');
-        const testsPath = path.resolve(pkgPath, 'tests');
-
-
-        const relativeDeclarationsPath = path.relative(path.dirname(tsConfigPath), declarationsPath);
-        const relativeTestsPath = path.relative(path.dirname(tsConfigPath), testsPath);
-        const relativeFoundationPath = path.relative(path.dirname(tsConfigPath), foundationPath);
-
-        const includedMD5 = [];
-        const srcPath = 'src/index.ts';
-
-        let changed = false;
-
-        if (!Object.keys(tsConfig).includes('include')) {
-            tsConfig['include'] = [];
-        } else {
-            tsConfig['include'] = tsConfig['include'].filter((inc) => {
-                if (inc === srcPath) {
-                    return true;
-                }
-
-                return fs.existsSync(rwsPath.relativize(inc, executionDir));
-            })
-        }
-
-
-        if (!tsConfig['include'].includes(srcPath)) {
-            console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS project typescript code to project tsconfig.json');
-            tsConfig['include'].unshift(srcPath);
-            changed = true;
-        }
-
-        if (!Object.keys(tsConfig).includes('exclude')) {
-            tsConfig['exclude'] = [];
-            changed = true;
-        }
-
-        const excludeString = '**/*.debug.ts';
-
-        if (!tsConfig['exclude'].includes(excludeString)) {
-            tsConfig['exclude'].push(excludeString);
-            changed = true;
-        }
-
-        let probablyLinked = false;
-
-        tsConfig['include'].forEach(element => {
-            if (element !== 'src' && element.indexOf('declarations.d.ts') > -1 && md5(fs.readFileSync(rwsPath.relativize(element, executionDir), 'utf-8')) === md5(fs.readFileSync(declarationsPath, 'utf-8'))) {
-                probablyLinked = true;
-            }
-        });
-
-        if (!tsConfig['include'].includes(relativeDeclarationsPath) && !probablyLinked) {
-            console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript declarations to project tsconfig.json');
-            tsConfig['include'].push(relativeDeclarationsPath);
-            includedMD5.push(md5(fs.readFileSync(declarationsPath, 'utf-8')));
-            changed = true;
-        }
-
-        if(!tsConfig.compilerOptions){
-            throw new Error(`${tsConfigPath} needs "compilerOptions" section`)
-        }
-
-        if (Object.keys(userAliases).length) {
-            const tsPaths = tsConfig.compilerOptions?.paths || {};
-
-            // console.log({tsPaths})            
-            let changedPaths = false;
-
-            Object.keys(userAliases).forEach((alias) => {
-                const aliasPath = userAliases[alias];
-                if(!tsPaths[alias]){
-        
-                    tsPaths[alias] = [path.relative(executionDir, aliasPath)];
-
-                    changedPaths = true;                    
-                }
-            });
-
-            if(changedPaths){                
-                console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding user aliases as paths to project tsconfig.json');
-
-                tsConfig.compilerOptions.paths = tsPaths;
-                changed = true;
-            }
-        }
-
-
-        if (changed) {
-            fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
-            console.log(chalk.yellowBright('Typescript config file'), `"${chalk.blueBright(tsConfigPath)}"`, chalk.yellowBright('has been changed'));
-        }
-
-        return true;
-    } catch (e) {
-        const tsConfigFileContent = fs.readFileSync(tsConfigPath, 'utf-8');
-        try {
-            console.log(chalk.blueBright('TSConfig (parsed)'), JSON.parse(tsConfigFileContent));
-        } catch (e) {
-            console.log(chalk.yellow('TSConfig (unparsed)'), tsConfigFileContent);
-
-        }
-        console.log(chalk.redBright('Error in tsconfig.json:'));
-        console.error(chalk.red(e.stack));
-
-        return false;
-    }
-}
-
-function getPartedModeVendorsBannerParams(partedDirUrlPrefix, partedPrefix) {
-    return {
-        banner: `if(!window.RWS_PARTS_LOADED){         
-              const script = document.createElement('script');
-              script.src = '${partedDirUrlPrefix}/${partedPrefix}.vendors.js';        
-              script.type = 'text/javascript';
-              document.body.appendChild(script);
-              window.RWS_PARTS_LOADED = true;
-              console.log('[RWS INIT SCRIPT]', 'vendors injected...');
-            }`.replace('\n', ''),
-        raw: true,
-        entryOnly: true,
-        include: `${partedPrefix}.client.js`
-    };
-}
-
-module.exports = {
-    setupTsConfig
+const md5 = require('md5');
+const chalk = require('chalk');
+const tools = require('../_tools');
+const { rwsPath } = require('@rws-framework/console');
+const path = require('path');
+const fs = require('fs');
+
+function setupTsConfig(tsConfigPath, executionDir, pkgPath, userAliases = {}) {
+
+    if (!fs.existsSync(tsConfigPath)) {
+        throw new Error(`Typescript config file "${tsConfigPath}" does not exist`);
+    }
+
+    const tsConfigContents = fs.readFileSync(tsConfigPath, 'utf-8');
+
+    try {
+        let tsConfig = JSON.parse(tsConfigContents);
+
+        const declarationsPath = path.resolve(pkgPath, 'types') + '/declarations.d.ts';
+        const foundationPath = path.resolve(pkgPath, 'foundation');
+        const testsPath = path.resolve(pkgPath, 'tests');
+
+
+        const relativeDeclarationsPath = path.relative(path.dirname(tsConfigPath), declarationsPath);
+        const relativeTestsPath = path.relative(path.dirname(tsConfigPath), testsPath);
+        const relativeFoundationPath = path.relative(path.dirname(tsConfigPath), foundationPath);
+
+        const includedMD5 = [];
+        const srcPath = 'src/index.ts';
+
+        let changed = false;
+
+        if (!Object.keys(tsConfig).includes('include')) {
+            tsConfig['include'] = [];
+        } else {
+            tsConfig['include'] = tsConfig['include'].filter((inc) => {
+                if (inc === srcPath) {
+                    return true;
+                }
+
+                return fs.existsSync(rwsPath.relativize(inc, executionDir));
+            })
+        }
+
+
+        if (!tsConfig['include'].includes(srcPath)) {
+            console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS project typescript code to project tsconfig.json');
+            tsConfig['include'].unshift(srcPath);
+            changed = true;
+        }
+
+        if (!Object.keys(tsConfig).includes('exclude')) {
+            tsConfig['exclude'] = [];
+            changed = true;
+        }
+
+        const excludeString = '**/*.debug.ts';
+
+        if (!tsConfig['exclude'].includes(excludeString)) {
+            tsConfig['exclude'].push(excludeString);
+            changed = true;
+        }
+
+        let probablyLinked = false;
+
+        tsConfig['include'].forEach(element => {
+            if (element !== 'src' && element.indexOf('declarations.d.ts') > -1 && md5(fs.readFileSync(rwsPath.relativize(element, executionDir), 'utf-8')) === md5(fs.readFileSync(declarationsPath, 'utf-8'))) {
+                probablyLinked = true;
+            }
+        });
+
+        if (!tsConfig['include'].includes(relativeDeclarationsPath) && !probablyLinked) {
+            console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding RWS typescript declarations to project tsconfig.json');
+            tsConfig['include'].push(relativeDeclarationsPath);
+            includedMD5.push(md5(fs.readFileSync(declarationsPath, 'utf-8')));
+            changed = true;
+        }
+
+        if(!tsConfig.compilerOptions){
+            throw new Error(`${tsConfigPath} needs "compilerOptions" section`)
+        }
+
+        if (Object.keys(userAliases).length) {
+            const tsPaths = tsConfig.compilerOptions?.paths || {};
+
+            // console.log({tsPaths})            
+            let changedPaths = false;
+
+            Object.keys(userAliases).forEach((alias) => {
+                const aliasPath = userAliases[alias];
+                if(!tsPaths[alias]){
+        
+                    tsPaths[alias] = [path.relative(executionDir, aliasPath)];
+
+                    changedPaths = true;                    
+                }
+            });
+
+            if(changedPaths){                
+                console.log(chalk.blueBright('[RWS TS CONFIG]'), 'adding user aliases as paths to project tsconfig.json');
+
+                tsConfig.compilerOptions.paths = tsPaths;
+                changed = true;
+            }
+        }
+
+
+        if (changed) {
+            fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2));
+            console.log(chalk.yellowBright('Typescript config file'), `"${chalk.blueBright(tsConfigPath)}"`, chalk.yellowBright('has been changed'));
+        }
+
+        return true;
+    } catch (e) {
+        const tsConfigFileContent = fs.readFileSync(tsConfigPath, 'utf-8');
+        try {
+            console.log(chalk.blueBright('TSConfig (parsed)'), JSON.parse(tsConfigFileContent));
+        } catch (e) {
+            console.log(chalk.yellow('TSConfig (unparsed)'), tsConfigFileContent);
+
+        }
+        console.log(chalk.redBright('Error in tsconfig.json:'));
+        console.error(chalk.red(e.stack));
+
+        return false;
+    }
+}
+
+function getPartedModeVendorsBannerParams(partedDirUrlPrefix, partedPrefix) {
+    return {
+        banner: `if(!window.RWS_PARTS_LOADED){         
+              const script = document.createElement('script');
+              script.src = '${partedDirUrlPrefix}/${partedPrefix}.vendors.js';        
+              script.type = 'text/javascript';
+              document.body.appendChild(script);
+              window.RWS_PARTS_LOADED = true;
+              console.log('[RWS INIT SCRIPT]', 'vendors injected...');
+            }`.replace('\n', ''),
+        raw: true,
+        entryOnly: true,
+        include: `${partedPrefix}.client.js`
+    };
+}
+
+module.exports = {
+    setupTsConfig
 }

package/docs/assets/26e93147f10415a0ed4a.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg fill="none" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
-<title>TypeScript logo</title>
- <rect width="512" height="512" rx="50" fill="#3178c6"/>
- <path d="m317 407v50c8.1 4.2 18 7.3 29 9.4s23 3.1 35 3.1c12 0 23-1.1 34-3.4 11-2.3 20-6.1 28-11 8.1-5.3 15-12 19-21s7.1-19 7.1-32c0-9.1-1.4-17-4.1-24s-6.6-13-12-18c-5.1-5.3-11-10-18-14s-15-8.2-24-12c-6.6-2.7-12-5.3-18-7.9-5.2-2.6-9.7-5.2-13-7.8-3.7-2.7-6.5-5.5-8.5-8.4-2-3-3-6.3-3-10 0-3.4 0.89-6.5 2.7-9.3s4.3-5.1 7.5-7.1c3.2-2 7.2-3.5 12-4.6 4.7-1.1 9.9-1.6 16-1.6 4.2 0 8.6 0.31 13 0.94 4.6 0.63 9.3 1.6 14 2.9 4.7 1.3 9.3 2.9 14 4.9 4.4 2 8.5 4.3 12 6.9v-47c-7.6-2.9-16-5.1-25-6.5s-19-2.1-31-2.1c-12 0-23 1.3-34 3.8s-20 6.5-28 12c-8.1 5.4-14 12-19 21-4.7 8.4-7 18-7 30 0 15 4.3 28 13 38 8.6 11 22 19 39 27 6.9 2.8 13 5.6 19 8.3s11 5.5 15 8.4c4.3 2.9 7.7 6.1 10 9.5 2.5 3.4 3.8 7.4 3.8 12 0 3.2-0.78 6.2-2.3 9s-3.9 5.2-7.1 7.2-7.1 3.6-12 4.8c-4.7 1.1-10 1.7-17 1.7-11 0-22-1.9-32-5.7-11-3.8-21-9.5-30-17zm-84-123h64v-41h-179v41h64v183h51z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd" style="fill:#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg fill="none" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+<title>TypeScript logo</title>
+ <rect width="512" height="512" rx="50" fill="#3178c6"/>
+ <path d="m317 407v50c8.1 4.2 18 7.3 29 9.4s23 3.1 35 3.1c12 0 23-1.1 34-3.4 11-2.3 20-6.1 28-11 8.1-5.3 15-12 19-21s7.1-19 7.1-32c0-9.1-1.4-17-4.1-24s-6.6-13-12-18c-5.1-5.3-11-10-18-14s-15-8.2-24-12c-6.6-2.7-12-5.3-18-7.9-5.2-2.6-9.7-5.2-13-7.8-3.7-2.7-6.5-5.5-8.5-8.4-2-3-3-6.3-3-10 0-3.4 0.89-6.5 2.7-9.3s4.3-5.1 7.5-7.1c3.2-2 7.2-3.5 12-4.6 4.7-1.1 9.9-1.6 16-1.6 4.2 0 8.6 0.31 13 0.94 4.6 0.63 9.3 1.6 14 2.9 4.7 1.3 9.3 2.9 14 4.9 4.4 2 8.5 4.3 12 6.9v-47c-7.6-2.9-16-5.1-25-6.5s-19-2.1-31-2.1c-12 0-23 1.3-34 3.8s-20 6.5-28 12c-8.1 5.4-14 12-19 21-4.7 8.4-7 18-7 30 0 15 4.3 28 13 38 8.6 11 22 19 39 27 6.9 2.8 13 5.6 19 8.3s11 5.5 15 8.4c4.3 2.9 7.7 6.1 10 9.5 2.5 3.4 3.8 7.4 3.8 12 0 3.2-0.78 6.2-2.3 9s-3.9 5.2-7.1 7.2-7.1 3.6-12 4.8c-4.7 1.1-10 1.7-17 1.7-11 0-22-1.9-32-5.7-11-3.8-21-9.5-30-17zm-84-123h64v-41h-179v41h64v183h51z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd" style="fill:#fff"/>
+</svg>

package/docs/assets/75c9471662e97ee24f29.svg

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <g id="#007bffff">
-        <path fill="#007bff" opacity="1.00"
-              d=" M 9.84 70.86 C 18.37 59.93 32.07 53.35 45.93 53.48 C 99.29 53.43 152.64 53.50 206.00 53.45 C 209.00 53.53 212.11 53.12 215.03 53.98 C 218.18 55.70 220.05 58.98 222.42 61.57 C 234.68 76.00 246.64 90.69 259.08 104.97 C 328.06 105.05 397.05 104.97 466.04 105.01 C 475.98 104.92 485.90 108.15 493.81 114.18 C 504.16 121.79 510.49 133.96 512.00 146.61 L 512.00 403.41 C 510.94 415.48 505.32 427.15 496.01 435.00 C 489.04 441.00 480.20 444.79 471.05 445.68 C 466.04 446.17 461.01 445.97 456.00 446.00 C 323.00 446.00 190.00 446.00 57.00 446.00 C 50.54 445.94 44.03 446.33 37.64 445.23 C 24.25 442.94 12.17 434.24 5.68 422.33 C 2.40 416.54 0.74 410.00 0.00 403.44 L 0.00 95.59 C 1.03 86.67 4.14 77.89 9.84 70.86 Z"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g id="#007bffff">
+        <path fill="#007bff" opacity="1.00"
+              d=" M 9.84 70.86 C 18.37 59.93 32.07 53.35 45.93 53.48 C 99.29 53.43 152.64 53.50 206.00 53.45 C 209.00 53.53 212.11 53.12 215.03 53.98 C 218.18 55.70 220.05 58.98 222.42 61.57 C 234.68 76.00 246.64 90.69 259.08 104.97 C 328.06 105.05 397.05 104.97 466.04 105.01 C 475.98 104.92 485.90 108.15 493.81 114.18 C 504.16 121.79 510.49 133.96 512.00 146.61 L 512.00 403.41 C 510.94 415.48 505.32 427.15 496.01 435.00 C 489.04 441.00 480.20 444.79 471.05 445.68 C 466.04 446.17 461.01 445.97 456.00 446.00 C 323.00 446.00 190.00 446.00 57.00 446.00 C 50.54 445.94 44.03 446.33 37.64 445.23 C 24.25 442.94 12.17 434.24 5.68 422.33 C 2.40 416.54 0.74 410.00 0.00 403.44 L 0.00 95.59 C 1.03 86.67 4.14 77.89 9.84 70.86 Z"/>
+    </g>
+</svg>

package/docs/assets/db90e4df2373980c497d.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<svg viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <g id="#007bffff">
-        <path fill="#007bff" opacity="1.00"
-              d=" M 0.00 80.69 C 0.22 64.54 15.05 50.95 30.99 51.04 C 71.66 50.97 112.33 51.00 153.00 51.02 C 163.06 50.98 173.05 55.84 178.96 64.04 C 190.23 79.65 201.34 95.39 212.61 111.00 C 275.09 111.02 337.57 110.96 400.05 111.03 C 415.75 110.89 430.55 124.04 431.08 139.96 C 431.29 154.12 431.11 168.29 431.16 182.46 C 324.50 182.48 217.83 182.44 111.17 182.48 C 95.16 182.41 79.32 191.83 72.51 206.44 C 48.34 257.13 24.13 307.80 0.00 358.51 L 0.00 80.69 Z"/>
-        <path fill="#007bff" opacity="1.00"
-              d=" M 91.02 234.95 C 97.86 220.76 113.28 211.54 128.94 211.48 C 241.97 211.45 355.00 211.49 468.03 211.46 C 474.47 211.32 480.96 212.47 486.89 215.04 C 501.07 220.92 511.34 235.20 512.00 250.60 L 512.00 254.16 C 511.61 259.88 510.10 265.50 507.48 270.60 C 482.86 319.94 458.24 369.28 433.63 418.62 C 431.10 423.61 428.85 428.84 425.20 433.15 C 417.67 442.38 405.95 447.99 394.03 447.99 C 274.35 448.02 154.68 447.98 35.01 448.01 C 19.82 449.24 4.46 438.96 0.84 423.98 C 30.92 360.98 60.93 297.95 91.02 234.95 Z"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g id="#007bffff">
+        <path fill="#007bff" opacity="1.00"
+              d=" M 0.00 80.69 C 0.22 64.54 15.05 50.95 30.99 51.04 C 71.66 50.97 112.33 51.00 153.00 51.02 C 163.06 50.98 173.05 55.84 178.96 64.04 C 190.23 79.65 201.34 95.39 212.61 111.00 C 275.09 111.02 337.57 110.96 400.05 111.03 C 415.75 110.89 430.55 124.04 431.08 139.96 C 431.29 154.12 431.11 168.29 431.16 182.46 C 324.50 182.48 217.83 182.44 111.17 182.48 C 95.16 182.41 79.32 191.83 72.51 206.44 C 48.34 257.13 24.13 307.80 0.00 358.51 L 0.00 80.69 Z"/>
+        <path fill="#007bff" opacity="1.00"
+              d=" M 91.02 234.95 C 97.86 220.76 113.28 211.54 128.94 211.48 C 241.97 211.45 355.00 211.49 468.03 211.46 C 474.47 211.32 480.96 212.47 486.89 215.04 C 501.07 220.92 511.34 235.20 512.00 250.60 L 512.00 254.16 C 511.61 259.88 510.10 265.50 507.48 270.60 C 482.86 319.94 458.24 369.28 433.63 418.62 C 431.10 423.61 428.85 428.84 425.20 433.15 C 417.67 442.38 405.95 447.99 394.03 447.99 C 274.35 448.02 154.68 447.98 35.01 448.01 C 19.82 449.24 4.46 438.96 0.84 423.98 C 30.92 360.98 60.93 297.95 91.02 234.95 Z"/>
+    </g>
+</svg>

package/docs/assets/highlight.css

@@ -1,127 +1,127 @@
-:root {
-    --light-hl-0: #795E26;
-    --dark-hl-0: #DCDCAA;
-    --light-hl-1: #000000;
-    --dark-hl-1: #D4D4D4;
-    --light-hl-2: #A31515;
-    --dark-hl-2: #CE9178;
-    --light-hl-3: #001080;
-    --dark-hl-3: #9CDCFE;
-    --light-hl-4: #0070C1;
-    --dark-hl-4: #4FC1FF;
-    --light-hl-5: #008000;
-    --dark-hl-5: #6A9955;
-    --light-hl-6: #0000FF;
-    --dark-hl-6: #569CD6;
-    --light-hl-7: #0451A5;
-    --dark-hl-7: #9CDCFE;
-    --light-hl-8: #267F99;
-    --dark-hl-8: #4EC9B0;
-    --light-hl-9: #AF00DB;
-    --dark-hl-9: #C586C0;
-    --light-hl-10: #098658;
-    --dark-hl-10: #B5CEA8;
-    --light-hl-11: #800000;
-    --dark-hl-11: #808080;
-    --light-hl-12: #800000;
-    --dark-hl-12: #569CD6;
-    --light-hl-13: #E50000;
-    --dark-hl-13: #9CDCFE;
-    --light-hl-14: #0000FF;
-    --dark-hl-14: #CE9178;
-    --light-code-background: #FFFFFF;
-    --dark-code-background: #1E1E1E;
-}
-
-@media (prefers-color-scheme: light) { :root {
-    --hl-0: var(--light-hl-0);
-    --hl-1: var(--light-hl-1);
-    --hl-2: var(--light-hl-2);
-    --hl-3: var(--light-hl-3);
-    --hl-4: var(--light-hl-4);
-    --hl-5: var(--light-hl-5);
-    --hl-6: var(--light-hl-6);
-    --hl-7: var(--light-hl-7);
-    --hl-8: var(--light-hl-8);
-    --hl-9: var(--light-hl-9);
-    --hl-10: var(--light-hl-10);
-    --hl-11: var(--light-hl-11);
-    --hl-12: var(--light-hl-12);
-    --hl-13: var(--light-hl-13);
-    --hl-14: var(--light-hl-14);
-    --code-background: var(--light-code-background);
-} }
-
-@media (prefers-color-scheme: dark) { :root {
-    --hl-0: var(--dark-hl-0);
-    --hl-1: var(--dark-hl-1);
-    --hl-2: var(--dark-hl-2);
-    --hl-3: var(--dark-hl-3);
-    --hl-4: var(--dark-hl-4);
-    --hl-5: var(--dark-hl-5);
-    --hl-6: var(--dark-hl-6);
-    --hl-7: var(--dark-hl-7);
-    --hl-8: var(--dark-hl-8);
-    --hl-9: var(--dark-hl-9);
-    --hl-10: var(--dark-hl-10);
-    --hl-11: var(--dark-hl-11);
-    --hl-12: var(--dark-hl-12);
-    --hl-13: var(--dark-hl-13);
-    --hl-14: var(--dark-hl-14);
-    --code-background: var(--dark-code-background);
-} }
-
-:root[data-theme='light'] {
-    --hl-0: var(--light-hl-0);
-    --hl-1: var(--light-hl-1);
-    --hl-2: var(--light-hl-2);
-    --hl-3: var(--light-hl-3);
-    --hl-4: var(--light-hl-4);
-    --hl-5: var(--light-hl-5);
-    --hl-6: var(--light-hl-6);
-    --hl-7: var(--light-hl-7);
-    --hl-8: var(--light-hl-8);
-    --hl-9: var(--light-hl-9);
-    --hl-10: var(--light-hl-10);
-    --hl-11: var(--light-hl-11);
-    --hl-12: var(--light-hl-12);
-    --hl-13: var(--light-hl-13);
-    --hl-14: var(--light-hl-14);
-    --code-background: var(--light-code-background);
-}
-
-:root[data-theme='dark'] {
-    --hl-0: var(--dark-hl-0);
-    --hl-1: var(--dark-hl-1);
-    --hl-2: var(--dark-hl-2);
-    --hl-3: var(--dark-hl-3);
-    --hl-4: var(--dark-hl-4);
-    --hl-5: var(--dark-hl-5);
-    --hl-6: var(--dark-hl-6);
-    --hl-7: var(--dark-hl-7);
-    --hl-8: var(--dark-hl-8);
-    --hl-9: var(--dark-hl-9);
-    --hl-10: var(--dark-hl-10);
-    --hl-11: var(--dark-hl-11);
-    --hl-12: var(--dark-hl-12);
-    --hl-13: var(--dark-hl-13);
-    --hl-14: var(--dark-hl-14);
-    --code-background: var(--dark-code-background);
-}
-
-.hl-0 { color: var(--hl-0); }
-.hl-1 { color: var(--hl-1); }
-.hl-2 { color: var(--hl-2); }
-.hl-3 { color: var(--hl-3); }
-.hl-4 { color: var(--hl-4); }
-.hl-5 { color: var(--hl-5); }
-.hl-6 { color: var(--hl-6); }
-.hl-7 { color: var(--hl-7); }
-.hl-8 { color: var(--hl-8); }
-.hl-9 { color: var(--hl-9); }
-.hl-10 { color: var(--hl-10); }
-.hl-11 { color: var(--hl-11); }
-.hl-12 { color: var(--hl-12); }
-.hl-13 { color: var(--hl-13); }
-.hl-14 { color: var(--hl-14); }
-pre, code { background: var(--code-background); }
+:root {
+    --light-hl-0: #795E26;
+    --dark-hl-0: #DCDCAA;
+    --light-hl-1: #000000;
+    --dark-hl-1: #D4D4D4;
+    --light-hl-2: #A31515;
+    --dark-hl-2: #CE9178;
+    --light-hl-3: #001080;
+    --dark-hl-3: #9CDCFE;
+    --light-hl-4: #0070C1;
+    --dark-hl-4: #4FC1FF;
+    --light-hl-5: #008000;
+    --dark-hl-5: #6A9955;
+    --light-hl-6: #0000FF;
+    --dark-hl-6: #569CD6;
+    --light-hl-7: #0451A5;
+    --dark-hl-7: #9CDCFE;
+    --light-hl-8: #267F99;
+    --dark-hl-8: #4EC9B0;
+    --light-hl-9: #AF00DB;
+    --dark-hl-9: #C586C0;
+    --light-hl-10: #098658;
+    --dark-hl-10: #B5CEA8;
+    --light-hl-11: #800000;
+    --dark-hl-11: #808080;
+    --light-hl-12: #800000;
+    --dark-hl-12: #569CD6;
+    --light-hl-13: #E50000;
+    --dark-hl-13: #9CDCFE;
+    --light-hl-14: #0000FF;
+    --dark-hl-14: #CE9178;
+    --light-code-background: #FFFFFF;
+    --dark-code-background: #1E1E1E;
+}
+
+@media (prefers-color-scheme: light) { :root {
+    --hl-0: var(--light-hl-0);
+    --hl-1: var(--light-hl-1);
+    --hl-2: var(--light-hl-2);
+    --hl-3: var(--light-hl-3);
+    --hl-4: var(--light-hl-4);
+    --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
+    --hl-8: var(--light-hl-8);
+    --hl-9: var(--light-hl-9);
+    --hl-10: var(--light-hl-10);
+    --hl-11: var(--light-hl-11);
+    --hl-12: var(--light-hl-12);
+    --hl-13: var(--light-hl-13);
+    --hl-14: var(--light-hl-14);
+    --code-background: var(--light-code-background);
+} }
+
+@media (prefers-color-scheme: dark) { :root {
+    --hl-0: var(--dark-hl-0);
+    --hl-1: var(--dark-hl-1);
+    --hl-2: var(--dark-hl-2);
+    --hl-3: var(--dark-hl-3);
+    --hl-4: var(--dark-hl-4);
+    --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
+    --hl-8: var(--dark-hl-8);
+    --hl-9: var(--dark-hl-9);
+    --hl-10: var(--dark-hl-10);
+    --hl-11: var(--dark-hl-11);
+    --hl-12: var(--dark-hl-12);
+    --hl-13: var(--dark-hl-13);
+    --hl-14: var(--dark-hl-14);
+    --code-background: var(--dark-code-background);
+} }
+
+:root[data-theme='light'] {
+    --hl-0: var(--light-hl-0);
+    --hl-1: var(--light-hl-1);
+    --hl-2: var(--light-hl-2);
+    --hl-3: var(--light-hl-3);
+    --hl-4: var(--light-hl-4);
+    --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
+    --hl-8: var(--light-hl-8);
+    --hl-9: var(--light-hl-9);
+    --hl-10: var(--light-hl-10);
+    --hl-11: var(--light-hl-11);
+    --hl-12: var(--light-hl-12);
+    --hl-13: var(--light-hl-13);
+    --hl-14: var(--light-hl-14);
+    --code-background: var(--light-code-background);
+}
+
+:root[data-theme='dark'] {
+    --hl-0: var(--dark-hl-0);
+    --hl-1: var(--dark-hl-1);
+    --hl-2: var(--dark-hl-2);
+    --hl-3: var(--dark-hl-3);
+    --hl-4: var(--dark-hl-4);
+    --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
+    --hl-8: var(--dark-hl-8);
+    --hl-9: var(--dark-hl-9);
+    --hl-10: var(--dark-hl-10);
+    --hl-11: var(--dark-hl-11);
+    --hl-12: var(--dark-hl-12);
+    --hl-13: var(--dark-hl-13);
+    --hl-14: var(--dark-hl-14);
+    --code-background: var(--dark-code-background);
+}
+
+.hl-0 { color: var(--hl-0); }
+.hl-1 { color: var(--hl-1); }
+.hl-2 { color: var(--hl-2); }
+.hl-3 { color: var(--hl-3); }
+.hl-4 { color: var(--hl-4); }
+.hl-5 { color: var(--hl-5); }
+.hl-6 { color: var(--hl-6); }
+.hl-7 { color: var(--hl-7); }
+.hl-8 { color: var(--hl-8); }
+.hl-9 { color: var(--hl-9); }
+.hl-10 { color: var(--hl-10); }
+.hl-11 { color: var(--hl-11); }
+.hl-12 { color: var(--hl-12); }
+.hl-13 { color: var(--hl-13); }
+.hl-14 { color: var(--hl-14); }
+pre, code { background: var(--code-background); }