exprify 1.0.1 → 1.0.3

package/src/parser/evaluator.js

@@ -1,3 +1,5 @@
+import { unwrapDenseMatrix, wrapDenseMatrix } from "../utils/matrix.js";
+
 export function evaluateAST(node, context = {}) {
 
   const vars = context.variables;
@@ -30,6 +32,7 @@ export function evaluateAST(node, context = {}) {
   };
 
   const normalizeMatrix = (value) => {
+    value = unwrapDenseMatrix(value);
     if (isMatrix(value)) return value.map((row) => [...row]);
     if (Array.isArray(value)) return [value];
     throw new Error("Expected matrix-compatible value");
@@ -202,6 +205,16 @@ export function evaluateAST(node, context = {}) {
   const simplifyComplex = (value) =>
     value.im === 0 ? value.re : value;
 
+  const createFunctionScope = (params, args) => {
+    const scopedValues = {};
+
+    params.forEach((param, index) => {
+      scopedValues[param] = args[index];
+    });
+
+    return scopedValues;
+  };
+
   const evalComplexBinary = (operator, left, right) => {
     const a = toComplex(left);
     const b = toComplex(right);
@@ -257,6 +270,9 @@ export function evaluateAST(node, context = {}) {
 
       if (node.left.type === "Identifier") {
         vars.set(node.left.name, value);
+        if (node.right.type === "ArrayExpression") {
+          return wrapDenseMatrix(unwrapDenseMatrix(value));
+        }
         return value;
       }
 
@@ -270,6 +286,20 @@ export function evaluateAST(node, context = {}) {
       throw new Error("Invalid assignment target");
     }
 
+    case "FunctionAssignmentExpression": {
+      if (node.operator !== "=") {
+        throw new Error(`Operator ${node.operator} is not supported for function definitions`);
+      }
+
+      const fn = (...args) => {
+        const scopedContext = context.withScope(createFunctionScope(node.params, args));
+        return evaluateAST(node.right, scopedContext);
+      };
+
+      fns.register(node.left.name, fn);
+      return fn;
+    }
+
     /* ===== UNARY ===== */
     case "UnaryExpression": {
       const val = evaluateAST(node.argument, context);
@@ -290,7 +320,7 @@ export function evaluateAST(node, context = {}) {
       let left = evaluateAST(node.left, context);
       let right = evaluateAST(node.right, context);
 
-      // 🔥 UNIT handling
+      // UNIT handling
       if (isUnitObj(left) || isUnitObj(right)) {
 
         if (!units) throw new Error("Unit system not available");

package/src/utils/matrix.js

@@ -0,0 +1,53 @@
+export const isDenseMatrixWrapper = (value) =>
+  value &&
+  typeof value === "object" &&
+  value.exprify === "DenseMatrix" &&
+  "data" in value &&
+  "size" in value;
+
+export const cloneMatrixData = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(cloneMatrixData);
+  }
+
+  return value;
+};
+
+export const getMatrixSize = (data) => {
+  if (Array.isArray(data) && data.every(Array.isArray)) {
+    return [data.length, data[0]?.length || 0];
+  }
+
+  if (Array.isArray(data)) {
+    return [data.length];
+  }
+
+  throw new Error("Matrix data must be an array");
+};
+
+export const wrapDenseMatrix = (data) => ({
+  exprify: "DenseMatrix",
+  data: cloneMatrixData(data),
+  size: getMatrixSize(data)
+});
+
+export const unwrapDenseMatrix = (value) =>
+  isDenseMatrixWrapper(value) ? cloneMatrixData(value.data) : value;
+
+export const serializeExprifyValue = (value) => {
+  if (isDenseMatrixWrapper(value)) {
+    return JSON.stringify(value);
+  }
+
+  if (Array.isArray(value) || (value && typeof value === "object")) {
+    return JSON.stringify(value, (_, current) => {
+      if (isDenseMatrixWrapper(current)) {
+        return current;
+      }
+
+      return current;
+    });
+  }
+
+  return value;
+};

package/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

package/.github/workflows/ci.yml

@@ -1,40 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-      - master
-  pull_request:
-    branches:
-      - main
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version:
-          - 20
-          - 22
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build package
-        run: npm run build
-
-      - name: Run tests
-        run: npm test

package/.github/workflows/npm-publish.yml

@@ -1,38 +0,0 @@
-name: Publish Package
-
-on:
-  release:
-    types:
-      - published
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          registry-url: https://registry.npmjs.org/
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build package
-        run: npm run build
-
-      - name: Run tests
-        run: npm test
-
-      - name: Publish to npm
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/security-audit.yml

@@ -1,34 +0,0 @@
-name: Security Audit
-
-on:
-  push:
-    branches:
-      - main
-      - master
-  pull_request:
-    branches:
-      - main
-      - master
-  schedule:
-    - cron: "0 6 * * 1"
-  workflow_dispatch:
-
-jobs:
-  audit:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run npm audit
-        run: npm audit --audit-level=high

package/CHANGELOG.md

@@ -1,11 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on Keep a Changelog, and this project follows semantic versioning.
-
-## [1.0.1] - 2026-04-05
-
-### Fixed
-- Corrected the import path in `src/index.js` to match the actual filename casing of `src/core/Exprify.js`.
-- Resolved a cross-platform build issue where Rollup failed on Linux-based CI environments because of case-sensitive path resolution.

package/doc/tokenType.txt

@@ -1,48 +0,0 @@
-ALL TOKEN TYPES (FINAL DESIGN)
-
-// LITERALS
-{ type: "Number", value: 10 }
-{ type: "BigInt", value: 10n }
-{ type: "Boolean", value: true }
-{ type: "String", value: "hello" }
-
-{ type: "Unit", value: "cm" }
-{ type: "NumberWithUnit", value: 12.7, unit: "cm" }
-{ type: "UnknownUnit", value: 5, unit: "abc" }
-
-// IDENTIFIERS
-{ type: "Identifier", value: "x" }
-
-// FUNCTIONS
-{ type: "Function", value: "max" }
-
-// OPERATORS
-{ type: "Operator", value: "+" }
-{ type: "Operator", value: ">=" }
-{ type: "Operator", value: "&&" }
-{ type: "Operator", value: "|>" }
-
-// UNARY
-{ type: "UnaryOperator", value: "-" }
-{ type: "UnaryOperator", value: "!" }
-
-// LOGIC / TERNARY
-{ type: "Ternary", value: "?" }
-{ type: "Ternary", value: ":" }
-
-// STRUCTURE
-{ type: "Parenthesis", value: "(" }
-{ type: "Parenthesis", value: ")" }
-{ type: "ArrayStart" }
-{ type: "ArrayEnd" }
-{ type: "BlockStart" }
-{ type: "BlockEnd" }
-{ type: "Colon" }
-{ type: "Comma" }
-{ type: "Dot" }
-
-// KEYWORDS
-{ type: "Keyword", value: "to" }
-{ type: "Keyword", value: "if" }
-
-

package/rollup.config.js

@@ -1,80 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-import resolve from "@rollup/plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
-
-import terser from "@rollup/plugin-terser";
-import pkg from "./package.json";
-
-const short_banner = `/*! ${pkg.name} v${pkg.version} | * (c) ${new Date().getFullYear()} ${pkg.author} and contributors | ${pkg.license} License*/`;
-
-const banner = `/*!
-* ${pkg.name} v${pkg.version}
-* (c) ${new Date().getFullYear()} ${pkg.author} and other contributors
-*
-* Released under the ${pkg.license} License
-* Date: ${new Date().toISOString().split('T')[0]}
-*/`;
-
-function removeComment() {
-  return {
-    name: "remove-sourcemap-comment",
-    writeBundle(outputOptions, bundle) {
-      for (const fileName in bundle) {
-        if (fileName.endsWith(".js")) {
-          const filePath = path.join(
-            outputOptions.dir || path.dirname(outputOptions.file),
-            fileName
-          );
-
-          let code = fs.readFileSync(filePath, "utf-8");
-
-          code = code.replace(/\/\/# sourceMappingURL=.*$/gm, "");
-
-          fs.writeFileSync(filePath, code);
-        }
-      }
-    }
-  };
-}
-
-export default [
-  {
-    input: "src/index.js",
-    output: [
-      {
-        file: "dist/exprify.esm.js",
-        format: "esm",
-        sourcemap: true
-      },
-      {
-        file: "dist/exprify.cjs.js",
-        format: "cjs",
-        sourcemap: true,
-        exports: "default"
-      },
-      {
-        file: "dist/exprify.js",
-        format: "umd",
-        name: "Exprify",
-        banner: banner,
-        sourcemap: true,
-        indent: true,
-        exports: "default"
-      }
-    ],
-    plugins: [resolve(), commonjs(), removeComment()]
-  },
-  {
-    input: "src/index.js",
-    output: {
-      file: "dist/exprify.min.js",
-      format: "umd",
-      name: "Exprify",
-      sourcemap: true,
-      banner: short_banner
-    },
-    plugins: [resolve(), commonjs(), terser(), removeComment()]
-  }
-];

package/test/browser.html

@@ -1,23 +0,0 @@
-<script src="../dist/exprify.js"></script>
-<script>
-  const expr = new Exprify();   // ✅ no namespace needed (usually)
-  // console.log(expr.parse("5 + 7 * 2")); // 19
-  // console.log(expr.evaluate("5 + 7 * 2")); // 19
-  console.log(expr.parse("max(5, 2)")); // 19
-  // console.log(expr.evaluate("max('5' + 7 * 2)")); // 19
-
-
-// const exprify = new Exprify();
-// const exprFn = exprify.compile("or(a, b)");
-// console.log(exprFn({ a: true, b: false })); // 22
-// console.log(exprFn({ a: 7, b: 3 }));  // 17
-
-console.log(expr.parse("5 px to em")); // 19
-console.log(expr.evaluate("5 px to em")); // 19
-
-// console.log(expr.parse("value |> double |> sqrt")); // 19
-// console.log(expr.evaluate("value |> double |> sqrt")); // 19
-
-
-  
-</script>

package/test/exprify.test.js

@@ -1,140 +0,0 @@
-import Exprify from "../src/core/Exprify.js";
-
-describe("Exprify Engine - Extended Tests", () => {
-  let expr;
-
-  beforeEach(() => {
-    expr = new Exprify();
-  });
-
-  /* ================= BASIC ================= */
-  test("addition", () => {
-    expect(expr.evaluate("2 + 3 + 5")).toBe(10);
-  });
-
-  test("operator precedence", () => {
-    expect(expr.evaluate("2 + 3 * 4")).toBe(14);
-  });
-
-  test("parentheses override precedence", () => {
-    expect(expr.evaluate("(2 + 3) * 4")).toBe(20);
-  });
-
-  test("mixed parentheses", () => {
-    expect(expr.evaluate("(1 + 2) * (3 + 4)")).toBe(21);
-  });
-
-  /* ================= NESTED ================= */
-  test("nested parentheses", () => {
-    expect(expr.evaluate("((2 + 3) * (4 + 1))")).toBe(25);
-  });
-
-  test("deep nesting", () => {
-    expect(expr.evaluate("(((1 + 1) + 1) + 1)")).toBe(4);
-  });
-
-  /* ================= UNARY ================= */
-  test("unary minus", () => {
-    expect(expr.evaluate("-5 + 10")).toBe(5);
-  });
-
-  test("double unary", () => {
-    expect(expr.evaluate("--5")).toBe(5);
-  });
-
-  /* ================= POWER ================= */
-  test("power operator", () => {
-    expect(expr.evaluate("2 ^ 3")).toBe(8);
-  });
-
-  test("power precedence", () => {
-    expect(expr.evaluate("2 + 2 ^ 3")).toBe(10);
-  });
-
-  /* ================= LOGICAL ================= */
-  test("logical AND", () => {
-    expect(expr.evaluate("true && false")).toBe(false);
-  });
-
-  test("logical OR", () => {
-    expect(expr.evaluate("true || false")).toBe(true);
-  });
-
-  /* ================= FUNCTION ================= */
-  test("function call", () => {
-    expect(expr.evaluate("max(2, 5, 3)")).toBe(5);
-  });
-
-  test("nested function", () => {
-    expect(expr.evaluate("max(2, min(5, 3))")).toBe(3);
-  });
-
-  test("matrix determinant with semicolon rows", () => {
-    expect(expr.evaluate("det([-1, 2; 3, 1])")).toBe(-7);
-  });
-
-  /* ================= STRING ================= */
-  test("string concat", () => {
-    expect(expr.evaluate('"Hello " + "World"')).toBe("Hello World");
-  });
-
-  /* ================= BIGINT ================= */
-  test("bigint power", () => {
-    expect(expr.evaluate("11n ^ 2n")).toBe(121n);
-  });
-
-  /* ================= UNIT ================= */
-  test("unit conversion", () => {
-    expect(expr.evaluate("2 inch to cm")).toBe("5.08 cm");
-  });
-
-  test("unit addition", () => {
-    expect(expr.evaluate("5 cm + 2 inch")).toBe("10.08 cm");
-  });
-
-  /* ================= EDGE CASE ================= */
-  test("division", () => {
-    expect(expr.evaluate("10 / 2")).toBe(5);
-  });
-
-  test("modulus", () => {
-    expect(expr.evaluate("10 % 3")).toBe(1);
-  });
-
-  test("invalid expression", () => {
-    expect(() => expr.evaluate("(2 + 3")).toThrow();
-  });
-
-  
-  test("set and use variable", () => {
-    expr.setVariable("x", 5);
-    expr.setVariable("y", 3);
-    expect(expr.evaluate("x + y")).toBe(8);
-    expect(expr.evaluate("x * y + 2")).toBe(17); // 5*3=15 +2=17
-  });
-
-    test("variable in parentheses", () => {
-    expr.setVariable("a", 2);
-    expr.setVariable("b", 4);
-    expect(expr.evaluate("(a + b) * 3")).toBe(18); // (2+4)*3=18
-  });
-
-  test("add and use external function", () => {
-    // Example: double(n) returns n*2
-    expr.addFunction("double", (n) => n * 2);
-    expect(expr.evaluate("double(4)")).toBe(8);
-    expect(expr.evaluate("2 + double(5)")).toBe(12); // 2+10=12
-  });
-
-  test("external function with multiple arguments", () => {
-    expr.addFunction("sumThree", (a, b, c) => a + b + c);
-    expect(expr.evaluate("sumThree(2, 3, 5)")).toBe(10);
-  });
-
-  test("nested function calls", () => {
-    expr.addFunction("double", (n) => n * 2);
-    expr.addFunction("addTen", (n) => n + 10);
-    expect(expr.evaluate("addTen(double(5))")).toBe(20); // double(5)=10 → addTen(10)=20
-  });
-  
-});