@lango-project/lango-js 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lango-project/lango-js",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -16,6 +16,7 @@
   },
   "files": [
     "src/*.mjs",
+    "src/vendor/**",
     "src/template/**",
     "README.md",
     "LICENSE",

package/src/compiler.mjs

@@ -231,7 +231,7 @@ function formatLine(line) {
 
 class Parser {
   constructor(source, name) {
-    this.lines = source.split(/\r?\n/).map((line) => stripComment(line).trimEnd());
+    this.lines = normalizeKebabIdentifiers(source).split(/\r?\n/).map((line) => stripComment(line).trimEnd());
     this.name = name;
     this.i = 0;
   }
@@ -518,7 +518,16 @@ class Parser {
           `expected ${indent} spaces`,
         );
       const line = this.line();
-      const text = line.text.slice(indent);
+      const initialText = line.text.slice(indent);
+      const text = /^([A-Za-z_]\w*) = \{$/.test(initialText)
+        ? initialText
+        : this.continuedStatement(initialText, line, indent);
+      if (text === "else")
+        this.fail(
+          line,
+          "LNG1259",
+          "else must be indented 2 spaces more than its if",
+        );
       if (text.startsWith("assert ")) {
         body.push({
           type: "assert",
@@ -540,7 +549,16 @@ class Parser {
         this.blank();
         let elseBody = null;
         if (this.peek() === `${" ".repeat(indent + 2)}else`) {
+          const elseLine = { text: this.peek(), number: this.i + 1 };
           this.i += 1;
+          this.blank();
+          const elseStart = this.peek();
+          if (!elseStart || spaces(elseStart) !== indent + 6)
+            this.fail(
+              elseStart ? { text: elseStart, number: this.i + 1 } : elseLine,
+              "LNG1260",
+              "else body must be indented 4 spaces more than else",
+            );
           elseBody = this.block(indent + 6);
         }
         body.push({
@@ -739,6 +757,52 @@ class Parser {
         });
       else if (/^[A-Za-z_]\w*\+\+$/.test(text))
         body.push({ type: "increment", name: text.slice(0, -2) });
+      else if (/^(\$?[A-Za-z_]\w*) = new ([A-Za-z_]\w*(?:[./][A-Za-z_]\w*)*)\(\(([^)]*)\)$/.test(text)) {
+        const [, name, constructor, parameters] =
+          /^(\$?[A-Za-z_]\w*) = new ([A-Za-z_]\w*(?:[./][A-Za-z_]\w*)*)\(\(([^)]*)\)$/.exec(text);
+        const closure = {
+          type: "closure",
+          parameters: this.parameters(parameters, line),
+          captures: this.captures(),
+          line: line.number,
+          body: this.block(indent + 4),
+        };
+        this.blank();
+        if (this.peek() !== `${" ".repeat(indent)})`)
+          this.fail(line, "LNG1263", "constructor callback requires a closing parenthesis");
+        this.i += 1;
+        body.push({
+          type: "assign",
+          name,
+          value: { type: "new", name: constructor, arguments: [closure], line: line.number },
+        });
+      }
+      else if (/^(.+)\.([A-Za-z_]\w*)\((.*), \(([^)]*)\)$/.test(text)) {
+        const [, receiver, name, argumentsText, parameters] =
+          /^(.+)\.([A-Za-z_]\w*)\((.*), \(([^)]*)\)$/.exec(text);
+        const closure = {
+          type: "closure",
+          parameters: this.parameters(parameters, line),
+          captures: this.captures(),
+          line: line.number,
+          body: this.block(indent + 4),
+        };
+        this.blank();
+        if (this.peek() !== `${" ".repeat(indent)})`)
+          this.fail(line, "LNG1264", "method callback requires a closing parenthesis");
+        this.i += 1;
+        body.push({
+          type: "expression",
+          value: {
+            type: "methodCall",
+            receiver,
+            optional: false,
+            name,
+            arguments: [...splitTopLevel(argumentsText).map((item) => expr(item, line, this)), closure],
+            line: line.number,
+          },
+        });
+      }
       else if (/^(.+)\.([A-Za-z_]\w*)\(\(([^)]*)\)$/.test(text)) {
         const [, first, name, parameters] = /^(.+)\.([A-Za-z_]\w*)\(\(([^)]*)\)$/.exec(text);
         const steps = [];
@@ -937,6 +1001,17 @@ class Parser {
       xml += `\n${this.lines[this.i++]}`;
     }
   }
+  continuedStatement(source, line, indent) {
+    let depth = curlyDelimiterDepth(source);
+    while (depth > 0) {
+      const next = this.peek();
+      if (next === undefined || spaces(next) < indent)
+        this.fail(line, "LNG1262", "unterminated multi-line expression");
+      source += ` ${this.line().text.trim()}`;
+      depth = curlyDelimiterDepth(source);
+    }
+    return source;
+  }
   captures() {
     if (!(this.peek() ?? "").trimStart().startsWith("capture ")) return [];
     const line = this.line();
@@ -1072,6 +1147,66 @@ function topLevelBinary(text, operators, rightAssociative = false) {
   return match;
 }
 
+function curlyDelimiterDepth(text) {
+  let quote = null;
+  let depth = 0;
+  for (let index = 0; index < text.length; index += 1) {
+    const character = text[index];
+    if (quote !== null) {
+      if (character === "\\") { index += 1; continue; }
+      if (character === quote) quote = null;
+      continue;
+    }
+    if (character === "'" || character === '"') { quote = character; continue; }
+    if (character === "{") depth += 1;
+    if (character === "}") depth -= 1;
+  }
+  return depth;
+}
+
+const KEBAB_MARKER = "__lango_dash__";
+
+function normalizeKebabIdentifiers(source) {
+  let result = "";
+  let quote = null;
+  for (let index = 0; index < source.length; index += 1) {
+    const character = source[index];
+    if (quote !== null) {
+      result += character;
+      if (character === "\\") result += source[++index] ?? "";
+      else if (character === quote) quote = null;
+      continue;
+    }
+    if (character === "'" || character === '"') { quote = character; result += character; continue; }
+    const match = /^[A-Za-z_]\w*(?:-[A-Za-z_]\w*)+/.exec(source.slice(index));
+    if (match) {
+      result += match[0].replaceAll("-", KEBAB_MARKER);
+      index += match[0].length - 1;
+      continue;
+    }
+    result += character;
+  }
+  return result;
+}
+
+function kebabName(name) {
+  return name.replaceAll(KEBAB_MARKER, "-");
+}
+
+function emitKebabMember(receiver, operator, name) {
+  return name.includes(KEBAB_MARKER)
+    ? `${receiver}${operator === "?." ? "?." : ""}[${JSON.stringify(kebabName(name))}]`
+    : `${receiver}${operator}${name}`;
+}
+
+function emitKebabPath(value) {
+  return value.replace(/(\?\.|\.)([A-Za-z_]\w*)/g, (all, operator, name) =>
+    name.includes(KEBAB_MARKER)
+      ? emitKebabMember("", operator, name)
+      : all,
+  );
+}
+
 function splitTopLevel(text, separator = ", ") {
   const parts = [];
   let start = 0;
@@ -1200,6 +1335,13 @@ function expr(source, line, parser) {
   const localize = /^_\((.*)\)$/.exec(text);
   if (localize)
     return { type: "translate", literal: literal(localize[1], line, parser) };
+  const decimal = /^\$\((.*)\)$/.exec(text);
+  if (decimal) {
+    const arguments_ = decimal[1] === "" ? [] : splitTopLevel(decimal[1]);
+    if (arguments_.length !== 1)
+      parser.fail(line, "LNG1261", "$() requires exactly one value");
+    return { type: "decimal", value: expr(arguments_[0], line, parser) };
+  }
   const construct =
     /^new ([A-Za-z_]\w*(?:[./][A-Za-z_]\w*)*)\((.*)\)$/.exec(text);
   if (construct)
@@ -1623,7 +1765,8 @@ function validate(program, imports = []) {
   const hostFunctions = new Set(["fetch"]);
   const isDecimalValue = (value) =>
     value &&
-    ((value.type === "raw" && (value.value.startsWith("$") || value.value.includes(".$"))) ||
+    (value.type === "decimal" ||
+      (value.type === "raw" && (value.value.startsWith("$") || value.value.includes(".$"))) ||
       (value.type === "unary" &&
         value.operator === "negate" &&
         isDecimalValue(value.value)) ||
@@ -1635,6 +1778,21 @@ function validate(program, imports = []) {
         ((value.left.type === "raw" && value.left.value === "null" && isDecimalValue(value.right)) ||
           (value.right.type === "raw" && value.right.value === "null" && isDecimalValue(value.left)) ||
           (isDecimalValue(value.left) && isDecimalValue(value.right)))));
+  const decimalParameters = (fn) => {
+    const parameterNames = new Set(fn.parameters.map((parameter) => parameter.name));
+    const accepted = new Set();
+    const visit = (node) => {
+      if (!node || typeof node !== "object") return;
+      if (node.type === "decimal" && node.value?.type === "raw" && parameterNames.has(node.value.value))
+        accepted.add(node.value.value);
+      Object.values(node).forEach((child) => {
+        if (Array.isArray(child)) child.forEach(visit);
+        else visit(child);
+      });
+    };
+    visit(fn.body);
+    return accepted;
+  };
   const returns = (body, result = []) => {
     for (const node of body) {
       if (node.type === "return") result.push(node.value);
@@ -2057,11 +2215,13 @@ function validate(program, imports = []) {
         );
       if (target) {
         validateRequiredArguments(target, value, value.name);
+        const decimalArguments = decimalParameters(target);
         value.arguments.forEach((argument, index) => {
           const parameter = target.parameters[index];
           if (
             parameter &&
             !parameter.name.startsWith("$") &&
+            !decimalArguments.has(parameter.name) &&
             isDecimalValue(argument)
           )
             throw new LangoError(
@@ -2543,6 +2703,10 @@ function validate(program, imports = []) {
           ? node
           : node.type === "return" && node.value?.type === "closure"
             ? node.value
+            : node.type === "assign" && node.value?.type === "new" && node.value.arguments.length === 1 && node.value.arguments[0].type === "closure"
+              ? node.value.arguments[0]
+              : node.type === "expression" && node.value?.type === "methodCall" && node.value.arguments.at(-1)?.type === "closure"
+                ? node.value.arguments.at(-1)
             : null;
       if (closure) {
         const localBindings = new Set([
@@ -2615,7 +2779,7 @@ function validate(program, imports = []) {
           classScope,
           expiredCatchBindings,
         );
-      if (node.type === "closureAssign") available.add(node.name);
+      if (node.type === "closureAssign" || node.type === "assign") available.add(node.name);
         continue;
       }
       if (node.type === "assign" && !node.name.startsWith("@"))
@@ -3442,6 +3606,7 @@ function collectEmitLocals(body, names = new Set(), nested = false) {
 }
 function emitDecimalExpression(node, flags) {
   const operand = (value) => {
+    if (value.type === "decimal") return emitExpr(value, flags);
     if (value.type === "binary" && ["+", "-", "*", "/", "%", "**"].includes(value.operator))
       return emitDecimalExpression(value, flags);
     if (value.type === "raw" && /^\d+(?:\.\d+)?$/.test(value.value)) {
@@ -3700,6 +3865,7 @@ function emitExpr(node, flags) {
     value?.type === "raw" &&
     (value.value.startsWith("$") || value.value.includes(".$"));
   const decimalValue = (value) =>
+    value?.type === "decimal" ||
     decimalRaw(value) ||
     (value?.type === "binary" && (decimalValue(value.left) || decimalValue(value.right))) ||
     (value?.type === "unary" && decimalValue(value.value));
@@ -3731,9 +3897,13 @@ function emitExpr(node, flags) {
           : normalize(`this.#${node.value.slice(1)}`)
         : flags.className && node.value.startsWith("_")
           ? normalize(`this.${node.value}`)
-          : (node.value.includes("?.") || /^(?:[A-Za-z_]\w*\.[A-Za-z_]\w*|[A-Za-z_]\w*\[(?:\d+|[A-Za-z_]\w*|['"][^'"]*['"])\])$/.test(node.value))
-            ? normalize(node.value)
-            : node.value;
+          : (node.value.includes("?.") || node.value.includes(KEBAB_MARKER) || /^(?:[A-Za-z_]\w*\.[A-Za-z_]\w*|[A-Za-z_]\w*\[(?:\d+|[A-Za-z_]\w*|['"][^'"]*['"])\])$/.test(node.value))
+            ? normalize(emitKebabPath(node.value))
+            : emitKebabPath(node.value);
+  if (node.type === "decimal") {
+    flags.decimal = true;
+    return `__decimal(${emitExpr(node.value, flags)})`;
+  }
   if (node.type === "sql") {
     flags.sql = true;
     const text = node.parts
@@ -3758,7 +3928,9 @@ function emitExpr(node, flags) {
     return `__finite(-${numericLiteral ? emitExpr(node.value, flags) : `__requireNumber(${emitExpr(node.value, flags)})`})`;
   }
   if (node.type === "new")
-    return `new ${node.name.replaceAll("/", ".")}(${node.arguments.map((item) => emitExpr(item, flags)).join(", ")})`;
+    return `new ${node.name.replaceAll("/", ".")}(${node.arguments.map((item) =>
+      item.type === "closure" ? emitClosure(item, 0, flags) : emitExpr(item, flags),
+    ).join(", ")})`;
   if (node.type === "superMethodCall")
     return `super.${node.name}(${node.arguments.map((item) => emitExpr(item, flags)).join(", ")})`;
   if (node.type === "index")
@@ -3767,7 +3939,7 @@ function emitExpr(node, flags) {
     );
   if (node.type === "property")
     return normalize(
-      `${emitExpr(node.receiver, flags)}${node.optional ? "?." : "."}${node.name}`,
+      emitKebabMember(emitExpr(node.receiver, flags), node.optional ? "?." : ".", node.name),
     );
   if (node.type === "methodCall" || node.type === "namespaceMethodCall") {
     const namespace = node.type === "namespaceMethodCall";
@@ -3793,7 +3965,9 @@ function emitExpr(node, flags) {
       flags.arrayBindings?.has(node.receiver)
         ? "push"
         : node.name;
-    const arguments_ = node.arguments.map((item) => emitExpr(item, flags)).join(", ");
+    const arguments_ = node.arguments.map((item) =>
+      item.type === "closure" ? emitClosure(item, 0, flags) : emitExpr(item, flags),
+    ).join(", ");
     const helperCall = (helper) => {
       const call = `${helper}(${receiver}${arguments_ ? `, ${arguments_}` : ""})`;
       if (!node.optional) return call;
@@ -3824,7 +3998,9 @@ function emitExpr(node, flags) {
       flags.insertAt = true;
       return helperCall("__insertAt");
     }
-    const call = `${receiver}${visibility === false ? ".#" : node.optional ? "?." : "."}${method}(${arguments_})`;
+    const call = visibility === false
+      ? `${receiver}.#${method}(${arguments_})`
+      : emitKebabMember(receiver, node.optional ? "?." : ".", method) + `(${arguments_})`;
     if (node.optional) return normalize(call);
     if (
       visibility === undefined &&
@@ -3840,7 +4016,8 @@ function emitExpr(node, flags) {
   if (node.type === "object")
     return `{ ${node.fields.map((item) => {
       const value = emitExpr(item.value, flags);
-      if (!item.key.startsWith("$")) return `${item.key}: ${value}`;
+      if (!item.key.startsWith("$"))
+        return `${item.key.includes(KEBAB_MARKER) ? JSON.stringify(kebabName(item.key)) : item.key}: ${value}`;
       flags.decimal = true;
       return `${JSON.stringify(item.key)}: __decimal(${item.value.type === "raw" ? JSON.stringify(item.value.value) : value})`;
     }).join(", ")} }`;

package/src/runtime.mjs

@@ -31,7 +31,16 @@ Decimal.Rounding = Object.freeze(${JSON.stringify(Decimal.Rounding)});
 export { Decimal };
 
 export function decimal(value) {
-    return new Decimal(value);
+    if (value instanceof Decimal) return value;
+    let result;
+    try {
+        result = new Decimal(value);
+    } catch {
+        throw new TypeError("Decimal value must be finite");
+    }
+    if (!result.isFinite())
+        throw new TypeError("Decimal value must be finite");
+    return result;
 }
 
 export function isDecimal(value) {

package/src/vendor/bignumber.LICENCE.md

@@ -0,0 +1,26 @@
+The MIT License (MIT)
+=====================
+
+Copyright © `<2026>` `Michael Mclaughlin`
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+