lumos-language 1.0.4 → 1.0.6

package/.github/workflows/release-package.yml

@@ -0,0 +1,33 @@
+name: Release lumos-language
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+      - run: npm test
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://npm.pkg.github.com/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/LICENSE

@@ -1,21 +1,13 @@
-The LICENSE file for any project gives credit to the creator/author of the 
-project, copyright information for the project, and the legal terms under 
-which it's being shared. In other words, this is us using an MIT license to
-say "we wrote this and you can do whatever you want with it."
-
-******************************************************************************
-~glitch-hello-website
-******************************************************************************
 MIT License
 
-Copyright (c) 2021, Glitch, Inc.
+Copyright (c) 2025 Hirotoshi Uchida
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+of the "lumos-language" software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -28,27 +20,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+---
 
+Third-Party Component:
 
-
-******************************************************************************
-
-THIRD-PARTY SOFTWARE
-This is all the software we used to build this starter project. All of these
-licenses are compatible with the license above. We've included links so you
-can learn more if you want. 
-
-1. HK Grotesk: The font we're using. 
-
-
-******************************************************************************
-1. HK Grotesk
-URL: https://hanken.co/products/hk-grotesk
-******************************************************************************
-HK Grotesk was designed by Hanken Design Co. It is shared using a SIL OFL
-license. Full license text can be found at:
-
+The font “HK Grotesk” used in this project is designed by Hanken Design Co.
+and is licensed separately under the SIL Open Font License (OFL). Complete
+terms for HK Grotesk can be found here:
 https://hanken.co/pages/web-fonts-eula
-******************************************************************************
-END, HK Grotesk
-******************************************************************************

package/README.md

@@ -1,4 +1,4 @@
-# Lumos
+# Lumos Language
 
 [![npm version](https://img.shields.io/npm/v/lumos-language.svg)](https://www.npmjs.com/package/lumos-language)
 
@@ -37,7 +37,7 @@ Lumos is influenced by
 - Conditional branch:
   <ul>
     <li><code>if (x == 10) {  let status = "Done"  } else {  let status = "Not yet"  }</code></li>
-    <li><code>if (let x == 10) { let status = "Done" } elsif (let x == 20) { let status = "Already" } else { let status = "Not yet" }</code></li>
+    <li><code>if (x == 10) { let status = "Done" } elsif (x == 20) { let status = "Already" } else { let status = "Not yet" }</code></li>
   </ul>
 - Break and Continue:
   <ul>
@@ -49,6 +49,9 @@ Lumos is influenced by
 
 - Please write the code in a single line and don't execute it while writing.
 
+## Change
+- You can refer to [npm](https://www.npmjs.com/package/lumos-language) or [GitHub Releases](https://github.com/Uchida16104/Lumos-Language/releases).
+
 ## More Info
 Get from <strong><a href="https://cdn.glitch.global/a6e15949-0cae-4ce8-a653-5883a6d0adc5/Lumos.pdf?v=1748869028196">pdf</a></strong>.
 

package/index.html

@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta charset="UTF-8" />
-    <title>Lumos</title>
+    <title>Lumos Language</title>
     <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.glitch.global/a6e15949-0cae-4ce8-a653-5883a6d0adc5/Lumos.png" />
     <link rel="icon" type="image/x-icon" href="https://cdn.glitch.global/a6e15949-0cae-4ce8-a653-5883a6d0adc5/Lumos.ico" />
     <style>
@@ -57,15 +57,25 @@
       #compileButton:hover {
         background: #005f9e;
       }
-      h5 {
+      h5, #logo {
         text-align: center;
       }
+      .github {
+        mix-blend-mode: darken;
+      }
+      .npm {
+        mix-blend-mode: color;
+      }
+      .github, .npm {
+        width: 100px;
+        height: 100px;
+      }
     </style>
   </head>
   <body>
     <div class="header">
       <img src="https://cdn.glitch.global/a6e15949-0cae-4ce8-a653-5883a6d0adc5/Lumos.png?v=1748865997035" />
-      <h1>Lumos</h1>
+      <h1>Lumos Language</h1>
     </div>
     <input type="text" id="input" placeholder="Enter command..." />
     <button id="compileButton">Compile</button>
@@ -265,6 +275,10 @@
       });
     </script>
     <footer>
+      <div id="logo">
+        <a href="https://github.com/Uchida16104/Lumos-Language"><img class="github" src="https://icon2.cleanpng.com/20180530/ywr/kisspng-github-computer-icons-directory-5b0ec64b102792.7107546015276949230662.jpg" /></a>
+        <a href="https://www.npmjs.com/package/lumos-language"><img class="npm" src="https://icon2.cleanpng.com/20180618/hxa/aa6nx3pxr.webp" /></a>
+      </div>
       <h5>2025 © Hirotoshi Uchida</h5>
     </footer>
   </body>

package/index.js

@@ -1,153 +1,157 @@
 #!/usr/bin/env node
 
+const fs = require("fs");
 const readline = require("readline");
 
-class BreakException {}
-class ContinueException {}
-
 const vars = {};
 const functions = {};
 
-function evaluateExpression(expr) {
-  try {
-    return Function(...Object.keys(vars), `return (${expr})`)(...Object.values(vars));
-  } catch (e) {
-    throw new Error("Invalid expression: " + expr);
-  }
-}
-
-function preprocessCommand(command) {
-  command = command.replace(/\r\n/g, "\n");
-
-  const timesRegex = /^(\d+)\.times\s+do\s+\|([a-zA-Z_][a-zA-Z0-9_]*)\|([\s\S]+?)end$/;
-  const timesMatch = command.match(timesRegex);
-  if (timesMatch) {
-    const count = parseInt(timesMatch[1]);
-    const varName = timesMatch[2];
-    const body = timesMatch[3].trim();
-    let result = "";
-    for (let i = 0; i < count; i++) {
-      vars[varName] = i;
-      result += interpret(body) + "\n";
+function evaluateExpression(expr, scope = vars) {
+  expr = expr.trim();
+  if (/^".*"$/.test(expr)) return expr.slice(1, -1);
+  if (expr in scope) return scope[expr];
+  if (!isNaN(expr)) return Number(expr);
+
+  let m;
+
+  if ((m = expr.match(/^(.+?)\s*(==|!=|<=|>=|<|>)\s*(.+)$/))) {
+    const a = evaluateExpression(m[1], scope);
+    const b = evaluateExpression(m[3], scope);
+    switch (m[2]) {
+      case "==": return a == b;
+      case "!=": return a != b;
+      case "<=": return a <= b;
+      case ">=": return a >= b;
+      case "<":  return a < b;
+      case ">":  return a > b;
     }
-    return result.trim();
   }
 
-  const ifElseRegex = /^if\s*\((.+?)\)\s*\{([\s\S]+?)\}(?:\s*elsif\s*\((.+?)\)\s*\{([\s\S]+?)\})?(?:\s*else\s*\{([\s\S]+?)\})?$/;
-  const ifElseMatch = command.match(ifElseRegex);
-  if (ifElseMatch) {
-    const [, cond1, body1, cond2, body2, body3] = ifElseMatch;
-    if (evaluateExpression(cond1)) return interpret(body1.trim());
-    if (cond2 && evaluateExpression(cond2)) return interpret(body2.trim());
-    if (body3) return interpret(body3.trim());
-    return "If condition was false.";
+  if ((m = expr.match(/^(.+?)\s*([+\-*/%])\s*(.+)$/))) {
+    const a = evaluateExpression(m[1], scope);
+    const b = evaluateExpression(m[3], scope);
+    switch (m[2]) {
+      case "+": return a + b;
+      case "-": return a - b;
+      case "*": return a * b;
+      case "/": return a / b;
+      case "%": return a % b;
+    }
   }
 
-  return null;
+  throw new Error("Invalid expression: " + expr);
 }
 
-function interpret(command) {
-  const preprocessed = preprocessCommand(command);
-  if (preprocessed !== null) return preprocessed;
+function interpret(cmd) {
+  let m;
 
-  command = command.trim();
-
-  if (/^let\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/.test(command)) {
-    const [, name, value] = command.match(/^let\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/);
-    vars[name] = evaluateExpression(value);
-    return `${name} = ${vars[name]}`;
+  if ((m = cmd.match(/^let\s+(\w+)\s*=\s*(.+)$/))) {
+    const name = m[1], value = evaluateExpression(m[2]);
+    vars[name] = value;
+    return `${name} = ${value}`;
   }
 
-  if (/^def\s+([a-zA-Z_][a-zA-Z0-9_]*)\(([^)]*)\)\s*\{([\s\S]*)\}$/.test(command)) {
-    const [, name, args, body] = command.match(/^def\s+([a-zA-Z_][a-zA-Z0-9_]*)\(([^)]*)\)\s*\{([\s\S]*)\}$/);
-    functions[name] = {
-      args: args.split(",").map((s) => s.trim()).filter((s) => s),
-      body: body.trim(),
-    };
+  if ((m = cmd.match(/^def\s+(\w+)\(([^)]*)\)\s*{([\s\S]+)}$/))) {
+    const name = m[1];
+    const params = m[2].split(",").map(s => s.trim()).filter(Boolean);
+    const body = m[3].trim();
+    functions[name] = { params, body };
     return `Function ${name} defined.`;
   }
 
-  if (/^([a-zA-Z_][a-zA-Z0-9_]*)\((.*)\)$/.test(command)) {
-    const [, name, argstr] = command.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\((.*)\)$/);
-    if (!functions[name]) throw new Error("Undefined function: " + name);
-    const func = functions[name];
-    const argValues = argstr.split(",").map((s) => evaluateExpression(s.trim()));
-    const localVars = {};
-    func.args.forEach((arg, i) => (localVars[arg] = argValues[i]));
-
-    const prevVars = Object.assign({}, vars);
-    Object.assign(vars, localVars);
-
-    let result;
-    try {
-      result = interpret(func.body);
-    } finally {
-      Object.assign(vars, prevVars);
-    }
-    return result;
+  if ((m = cmd.match(/^(\w+)\((.*)\)$/)) && functions[m[1]]) {
+    const func = functions[m[1]];
+    const args = m[2] ? m[2].split(",").map(s => s.trim()) : [];
+    const localScope = { ...vars };
+    func.params.forEach((p, i) => {
+      localScope[p] = evaluateExpression(args[i], vars);
+    });
+    const letm = func.body.match(/^let\s+(\w+)\s*=\s*(.+)$/);
+    if (!letm) throw new Error("Invalid function body");
+    const res = evaluateExpression(letm[2], localScope);
+    vars[letm[1]] = res;
+    return `${letm[1]} = ${res}`;
   }
 
-  let loopMatch = command.match(/^for\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+?)\s+to\s+(.+?)\s*\{([\s\S]+)\}$/);
-  if (loopMatch) {
-    const vname = loopMatch[1];
-    const start = evaluateExpression(loopMatch[2]);
-    const end = evaluateExpression(loopMatch[3]);
-    const body = loopMatch[4];
+  if ((m = cmd.match(/^for\s+(\w+)\s*=\s*(\d+)\s+to\s+(\d+)\s*{([\s\S]+)}$/))) {
+    const [_, v, s, e, body] = m;
+    for (let i = +s; i <= +e; i++) {
+      vars[v] = i;
+      interpret(body.trim());
+    }
+    return `Looped ${v} from ${s} to ${e}`;
+  }
 
-    for (let i = start; i <= end; i++) {
-      vars[vname] = i;
-      try {
-        interpret(body.trim());
-      } catch (e) {
-        if (e instanceof BreakException) break;
-        if (e instanceof ContinueException) continue;
-        throw e;
-      }
+  if ((m = cmd.match(/^while\s*\((.+?)\)\s*{([\s\S]+)}$/))) {
+    const cond = m[1], body = m[2].trim();
+    let count = 0;
+    while (evaluateExpression(cond)) {
+      interpret(body);
+      if (++count > 10000) throw new Error("Infinite loop detected");
     }
-    return `Looped ${vname} from ${start} to ${end}`;
+    return "While loop executed.";
   }
 
-  let whileMatch = command.match(/^while\s*\((.+?)\)\s*\{([\s\S]+)\}$/);
-  if (whileMatch) {
-    const condition = whileMatch[1];
-    const body = whileMatch[2];
+  if ((m = cmd.match(/^if\s*\((.+?)\)\s*{([\s\S]+?)}(?:\s*elsif\s*\((.+?)\)\s*{([\s\S]+?)})?(?:\s*else\s*{([\s\S]+?)})?$/))) {
+    if (evaluateExpression(m[1])) return interpret(m[2].trim());
+    else if (m[3] && evaluateExpression(m[3])) return interpret(m[4].trim());
+    else if (m[5]) return interpret(m[5].trim());
+    return "If condition was false.";
+  }
 
-    while (evaluateExpression(condition)) {
-      try {
-        interpret(body.trim());
-      } catch (e) {
-        if (e instanceof BreakException) break;
-        if (e instanceof ContinueException) continue;
-        throw e;
-      }
+  if ((m = cmd.match(/^(\d+)\.times\s+do\s+\|(\w+)\|\s*{([\s\S]+)}\s*end$/))) {
+    const [_, n, v, body] = m;
+    let out = [];
+    for (let i = 0; i < +n; i++) {
+      vars[v] = i;
+      out.push(interpret(body.trim()));
     }
-    return "While loop executed.";
+    return out.join("\n");
   }
 
-  if (command === "break") throw new BreakException();
-  if (command === "continue") throw new ContinueException();
+  if (vars.hasOwnProperty(cmd)) {
+    return vars[cmd];
+  }
 
-  return evaluateExpression(command);
+  throw new Error("Unrecognized command: " + cmd);
 }
 
-// CLI 入力受付
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout,
-  prompt: "Lumos> ",
-});
-
-console.log("Welcome to Lumos CLI!");
-rl.prompt();
-
-rl.on("line", (line) => {
-  const command = line.trim();
-  try {
-    const result = interpret(command);
-    console.log("> " + result);
-  } catch (err) {
-    console.error("! " + err.message);
-  }
+function runFile(fn) {
+  const lines = fs.readFileSync(fn, "utf8").split(/\r?\n/);
+  lines.filter(line => line.trim()).forEach(line => {
+    const res = interpret(line.trim());
+    console.log("> " + res);
+  });
+}
+
+function startREPL() {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    prompt: "Lumos> ",
+  });
+  console.log("Welcome to Lumos CLI (type exit)");
   rl.prompt();
-});
 
+  rl.on("line", line => {
+    if (line.trim() === "exit") return rl.close();
+    if (line.trim()) {
+      try {
+        const res = interpret(line.trim());
+        console.log("> " + res);
+      } catch (e) {
+        console.error("! " + e.message);
+      }
+    }
+    rl.prompt();
+  });
+
+  rl.on("close", () => {
+    console.log("Goodbye!");
+    process.exit(0);
+  });
+}
+
+const args = process.argv.slice(2);
+if (args.length) runFile(args[0]);
+else startREPL();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lumos-language",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Lumos - Interactive CLI",
   "main": "index.js",
   "bin": {
@@ -8,13 +8,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Uchida16104/Lumos.git"
+    "url": "git+https://github.com/Uchida16104/Lumos-Language.git"
   },
   "publishConfig": {
-  "@Uchida16104:registry": "https://npm.pkg.github.com"
+    "@Uchida16104:registry": "https://npm.pkg.github.com"
   },
   "bugs": {
-    "url": "https://github.com/Uchida16104/Lumos/issues"
+    "url": "https://github.com/Uchida16104/Lumos-Language/issues"
   },
   "homepage": "https://lumos-language.glitch.me",
   "author": "Hirotoshi Uchida",
@@ -25,5 +25,8 @@
   },
   "keywords": [
     "programming-language"
-  ]
+  ],
+  "dependencies": {
+    "lumos-language": "^1.0.6"
+  }
 }