@lango-project/lango-js 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lango-project/lango-js",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"

package/src/cli.mjs

@@ -24,7 +24,9 @@ const buildOptions = (arguments_) => {
         }
         const value = arguments_[index + 1];
         if (!value) return null;
-        if (option === "--decimal-division-scale")
+        if (option === "--target")
+            profile.target = value;
+        else if (option === "--decimal-division-scale")
             profile.decimal_division_scale = Number(value);
         else if (option === "--decimal-division-rounding")
             profile.decimal_division_rounding = Decimal.Rounding[value] ?? value;
@@ -34,21 +36,22 @@ const buildOptions = (arguments_) => {
     return { outputPath: arguments_[1], profile };
 };
 const build = command === "build" && inputPath ? buildOptions(rest) : null;
-const runOptions = (arguments_) => {
-    const options = { database: null, catalog: null };
+const runOptions = (arguments_, allowBuildDir = false) => {
+    const options = { database: null, catalog: null, buildDir: null };
     let index = 0;
-    while (arguments_[index] === "--database" || arguments_[index] === "--catalog") {
+    while (arguments_[index] === "--database" || arguments_[index] === "--catalog" || (allowBuildDir && arguments_[index] === "--build-dir")) {
         const option = arguments_[index];
         const value = arguments_[index + 1];
         if (!value) return null;
         if (option === "--database") options.database = value;
-        else options.catalog = value;
+        else if (option === "--catalog") options.catalog = value;
+        else options.buildDir = value;
         index += 2;
     }
     if (arguments_[index] === "--") index += 1;
     return { ...options, args: arguments_.slice(index) };
 };
-const testOptions = command === "test" && inputPath ? runOptions(rest) : null;
+const testOptions = command === "test" && inputPath ? runOptions(rest, true) : null;
 
 async function initProject(directory) {
     const target = path.resolve(directory);
@@ -129,7 +132,9 @@ if (command === "init" && inputPath && rest.length === 0) {
     try {
         if (testOptions.args.length)
             throw new Error("Lango test does not accept program arguments");
-        const directory = await mkdtemp(path.join(os.tmpdir(), "lango-test-"));
+        const directory = testOptions.buildDir
+            ? path.resolve(testOptions.buildDir)
+            : await mkdtemp(path.join(os.tmpdir(), "lango-test-"));
         const outputPath = path.join(directory, "main.mjs");
         await buildFile(path.resolve(inputPath), outputPath, new Set(), true);
         const runtime = await import(pathToFileURL(path.join(directory, ".lango/runtime.mjs")).href);
@@ -173,6 +178,6 @@ if (command === "init" && inputPath && rest.length === 0) {
         process.exitCode = error instanceof LangoError ? 1 : 2;
     }
 } else {
-    console.error("Usage: node src/cli.mjs init <directory>\n       node src/cli.mjs build <input.lango> --out <output.mjs> [--executable] [--decimal-division-scale <n>] [--decimal-division-rounding <EnumName>]\n       node src/cli.mjs run <input.lango> [--database <sqlite-file>] [--catalog <catalog.json>] [-- args...]\n       node src/cli.mjs test <input.lango> [--database <sqlite-file>] [--catalog <catalog.json>]\n       node src/cli.mjs format <input.lango>");
+    console.error("Usage: node src/cli.mjs init <directory>\n       node src/cli.mjs build <input.lango> --out <output.mjs> [--target node|browser] [--executable] [--decimal-division-scale <n>] [--decimal-division-rounding <EnumName>]\n       node src/cli.mjs run <input.lango> [--database <sqlite-file>] [--catalog <catalog.json>] [-- args...]\n       node src/cli.mjs test <input.lango> [--build-dir <directory>] [--database <sqlite-file>] [--catalog <catalog.json>]\n       node src/cli.mjs format <input.lango>");
     process.exitCode = 2;
 }

package/src/compiler.mjs

@@ -32,6 +32,8 @@ export function formatDiagnostics(error) {
 
 export async function buildFile(inputPath, outputPath, seen = new Set(), includeTests = false, profile = {}) {
   const decimalProfile = validateDecimalProfile(profile);
+  if (decimalProfile.target === "browser" && profile.executable)
+    throw new LangoError("LNG1266", 1, "browser builds cannot use --executable", inputPath);
   const isEntryPoint = seen.size === 0;
   if (isEntryPoint)
     await validateModuleInitializerCycles(inputPath, outputPath);
@@ -87,6 +89,8 @@ export async function buildFile(inputPath, outputPath, seen = new Set(), include
   }
 
   const compiled = compile(source, inputPath, imports, includeTests, decimalProfile);
+  if (decimalProfile.target === "browser" && compiled.program.jsImports.some((item) => item.specifier?.startsWith("node:")))
+    throw new LangoError("LNG1266", 1, "browser builds cannot import node: modules", inputPath);
   let output = compiled.javascript.replace(
     "//# sourceMappingURL=main.mjs.map",
     `//# sourceMappingURL=${path.basename(outputPath)}.map`,
@@ -122,7 +126,9 @@ export async function buildFile(inputPath, outputPath, seen = new Set(), include
     "utf8",
   );
   const xmlVendor = new URL("./vendor/xmldom/", import.meta.url);
+  if (decimalProfile.target === "browser") return;
   await mkdir(path.join(directory, ".lango/xmldom"), { recursive: true });
+  await writeFile(path.join(directory, ".lango/xmldom/package.json"), '{"type":"commonjs"}\n', "utf8");
   for (const name of ["conventions.js", "dom-parser.js", "dom.js", "entities.js", "errors.js", "grammar.js", "index.js", "sax.js"])
     await writeFile(
       path.join(directory, ".lango/xmldom", name),
@@ -185,13 +191,16 @@ function tabDiagnostics(source, sourceName) {
 }
 
 function validateDecimalProfile(profile) {
+  const target = profile.target ?? "node";
+  if (target !== "node" && target !== "browser")
+    throw new LangoError("LNG1266", 1, `unknown build target ${target}`);
   const decimal_division_scale = profile.decimal_division_scale ?? 6;
   const decimal_division_rounding = profile.decimal_division_rounding ?? Decimal.Rounding.HalfEven;
   if (!Number.isInteger(decimal_division_scale) || decimal_division_scale < 0)
     throw new LangoError("LNG1262", 1, "decimal_division_scale must be a non-negative integer");
   if (!Object.values(Decimal.Rounding).includes(decimal_division_rounding))
     throw new LangoError("LNG1263", 1, `unknown decimal_division_rounding ${decimal_division_rounding}`);
-  return { decimal_division_scale, decimal_division_rounding };
+  return { decimal_division_scale, decimal_division_rounding, target };
 }
 
 const BASE64_VLQ = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -1172,18 +1181,42 @@ function collectSqlParameters(sql) {
   return [...new Set(names)];
 }
 
+function interpolationEnd(text, start) {
+  let depth = 1;
+  for (let index = start; index < text.length; index += 1) {
+    const character = text[index];
+    if (character === "'" || character === '"') {
+      index = quotedStringEnd(text, index);
+      if (index < 0) return -1;
+    } else if (character === "{") depth += 1;
+    else if (character === "}" && --depth === 0) return index;
+  }
+  return -1;
+}
+
+function quotedStringEnd(text, start) {
+  const quote = text[start];
+  for (let index = start + 1; index < text.length; index += 1) {
+    if (text[index] === "\\") { index += 1; continue; }
+    if (text.startsWith("${", index)) {
+      index = interpolationEnd(text, index + 2);
+      if (index < 0) return -1;
+    } else if (text[index] === quote) return index;
+  }
+  return -1;
+}
+
+function skipString(text, start) {
+  const end = quotedStringEnd(text, start);
+  return end < 0 ? text.length : end;
+}
+
 function topLevelBinary(text, operators, rightAssociative = false) {
-  let quote = null;
   let depth = 0;
   let match = null;
   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 === "'" || character === '"') { index = skipString(text, index); continue; }
     if ("([{".includes(character)) { depth += 1; continue; }
     if (")]}".includes(character)) { depth -= 1; continue; }
     if (depth !== 0) continue;
@@ -1199,16 +1232,10 @@ function topLevelBinary(text, operators, rightAssociative = false) {
 }
 
 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 === "'" || character === '"') { index = skipString(text, index); continue; }
     if (character === "{") depth += 1;
     if (character === "}") depth -= 1;
   }
@@ -1219,16 +1246,14 @@ 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;
+    if (character === "'" || character === '"') {
+      const end = skipString(source, index);
+      result += source.slice(index, end + 1);
+      index = end;
       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);
@@ -1261,16 +1286,10 @@ function emitKebabPath(value) {
 function splitTopLevel(text, separator = ", ") {
   const parts = [];
   let start = 0;
-  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 === "'" || character === '"') { index = skipString(text, index); continue; }
     if ("([{".includes(character)) { depth += 1; continue; }
     if (")]}".includes(character)) { depth -= 1; continue; }
     if (depth === 0 && text.startsWith(separator, index)) {
@@ -1285,16 +1304,10 @@ function splitTopLevel(text, separator = ", ") {
 
 function parenthesizedExpression(text) {
   if (!text.startsWith("(") || !text.endsWith(")")) return null;
-  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 === "'" || character === '"') { index = skipString(text, index); continue; }
     if (character === "(") depth += 1;
     if (character === ")") {
       depth -= 1;
@@ -1735,23 +1748,13 @@ function xmlTagEnd(source, start) {
 }
 
 function stripComment(line) {
-  let quote = null;
-  let escaped = false;
   for (let index = 0; index < line.length; index += 1) {
     const character = line[index];
-    if (escaped) {
-      escaped = false;
-      continue;
-    }
-    if (quote && character === "\\") {
-      escaped = true;
-      continue;
-    }
     if (character === '"' || character === "'") {
-      quote = quote === character ? null : quote ?? character;
+      index = skipString(line, index);
       continue;
     }
-    if (!quote && character === "#") return line.slice(0, index).trimEnd();
+    if (character === "#") return line.slice(0, index).trimEnd();
   }
   return line;
 }
@@ -1760,20 +1763,25 @@ function literal(value, line, parser) {
   const quote = value[0];
   if (!((quote === "'" || quote === '"') && value.at(-1) === quote))
     parser.fail(line, "LNG1109", "expected a string literal");
-  const decoded = value
-    .slice(1, -1)
+  const decode = (text) => text
     .replace(/\\n/g, "\n")
     .replace(/\\t/g, "\t")
-    .replace(/\\(['"\\])/g, "$1");
+    .replace(/\\(['"\\$])/g, "$1");
   const parts = [];
-  let at = 0;
-  const regex = /\$\{([A-Za-z_]\w*(?:\.[A-Za-z_]\w*|\[\d+\])?)\}/g;
-  let match;
-  while ((match = regex.exec(decoded))) {
-    parts.push({ text: decoded.slice(at, match.index), value: match[1] });
-    at = match.index + match[0].length;
+  let at = 1;
+  for (let index = 1; index < value.length - 1; index += 1) {
+    if (value[index] === "\\") { index += 1; continue; }
+    if (!value.startsWith("${", index)) continue;
+    const end = interpolationEnd(value, index + 2);
+    if (end < 0 || end >= value.length - 1)
+      parser.fail(line, "LNG1267", "unterminated string interpolation");
+    const source = value.slice(index + 2, end).trim();
+    if (!source) parser.fail(line, "LNG1267", "string interpolation requires an expression");
+    parts.push({ text: decode(value.slice(at, index)), value: expr(normalizeKebabIdentifiers(source), line, parser) });
+    index = end;
+    at = end + 1;
   }
-  parts.push({ text: decoded.slice(at), value: null });
+  parts.push({ text: decode(value.slice(at, -1)), value: null });
   return parts;
 }
 
@@ -2473,6 +2481,7 @@ function validate(program, imports = []) {
   const expressionReferences = (node, references) => {
     if (!node || typeof node !== "object") return;
     if (node.type === "raw") {
+      if (["true", "false", "null", "this"].includes(node.value)) return;
       const match = /^(@{0,2}[A-Za-z_]\w*)/.exec(node.value);
       if (match) references.add(match[1]);
       return;
@@ -2510,10 +2519,7 @@ function validate(program, imports = []) {
     if (node.type === "string" || node.type === "translate") {
       node.literal
         .filter((part) => part.value)
-        .forEach((part) => {
-          const match = /^(@{0,2}[A-Za-z_]\w*)/.exec(part.value);
-          if (match) references.add(match[1]);
-        });
+        .forEach((part) => expressionReferences(part.value, references));
       return;
     }
     Object.values(node).forEach((value) => {
@@ -3452,6 +3458,8 @@ function emit(program, moduleImports = [], includeTests = false) {
     flags.normalize && "normalize as __normalize",
     flags.finite && "finite as __finite",
     flags.number && "requireNumber as __requireNumber",
+    flags.numeric && "requireNumeric as __requireNumeric",
+    flags.numericAdd && "numericAdd as __numericAdd",
     flags.call && "call as __call",
     flags.callMethod && "callMethod as __callMethod",
     flags.boundary && "boundary as __boundary",
@@ -3703,7 +3711,7 @@ function collectEmitLocals(body, names = new Set(), nested = false) {
   return names;
 }
 function emitDecimalExpression(node, flags) {
-  const operand = (value) => {
+  const operand = (value, numericOnly = false) => {
     if (value.type === "decimal") return emitExpr(value, flags);
     if (value.type === "binary" && ["+", "-", "*", "/", "%", "**"].includes(value.operator))
       return emitDecimalExpression(value, flags);
@@ -3713,13 +3721,15 @@ function emitDecimalExpression(node, flags) {
     }
     if (value.type === "raw" && value.value.startsWith("$")) return emitExpr(value, flags);
     flags.decimal = true;
-    return `__decimal(${emitExpr(value, flags)})`;
+    if (numericOnly) flags.numeric = true;
+    const emitted = emitExpr(value, flags);
+    return `__decimal(${numericOnly ? `__requireNumeric(${emitted})` : emitted})`;
   };
   if (node.type !== "binary" || !["+", "-", "*", "/", "%", "**"].includes(node.operator))
     return operand(node);
   flags.decimal = true;
   const methods = { "+": "plus", "-": "minus", "*": "times", "/": "div", "%": "mod", "**": "pow" };
-  return `${operand(node.left)}.${methods[node.operator]}(${operand(node.right)})`;
+  return `${operand(node.left, node.operator === "+")}.${methods[node.operator]}(${operand(node.right, node.operator === "+")})`;
 }
 function needsLoopLabel(body, nestedLoopDepth = 0) {
   for (const node of body) {
@@ -3791,6 +3801,10 @@ function emitStatement(node, depth, declared, flags) {
   if (node.type === "indexAssign") {
     const target = `${emitReceiverName(node.receiver, flags)}${(node.indexes ?? [node.index]).map((index) => `[${emitExpr(index, flags)}]`).join("")}`;
     const value = emitExpr(node.value, flags);
+    if (node.operator === "+") {
+      flags.numericAdd = true;
+      return `${pad}${target} = __numericAdd(${target}, ${value});\n`;
+    }
     if (node.operator) flags.finite = true;
     return `${pad}${target} = ${node.operator ? `__finite(${target} ${node.operator} ${value})` : value};\n`;
   }
@@ -3804,7 +3818,10 @@ function emitStatement(node, depth, declared, flags) {
   }
   if (node.type === "superConstructor")
     return `${pad}super(${node.arguments.map((item) => emitExpr(item, flags)).join(", ")});\n`;
-  if (node.type === "increment") return `${pad}${node.name} += 1;\n`;
+  if (node.type === "increment") {
+    flags.numericAdd = true;
+    return `${pad}${node.name} = __numericAdd(${node.name}, 1);\n`;
+  }
   if (node.type === "add")
     return `${pad}${node.target}.push(${emitExpr(node.value, flags)});\n`;
   if (node.type === "return")
@@ -4200,8 +4217,16 @@ function emitExpr(node, flags) {
           : value.type === "raw" && /^\d+(?:\.\d+)?$/.test(value.value)
             ? `__decimal(${JSON.stringify(value.value)})`
             : emitExpr(value, flags);
+      if (node.operator === "+") {
+        flags.numericAdd = true;
+        return `__numericAdd(${operand(node.left)}, ${operand(node.right)})`;
+      }
       return `${operand(node.left)}.${methods[node.operator]}(${operand(node.right)})`;
     }
+    if (node.operator === "+") {
+      flags.numericAdd = true;
+      return `__numericAdd(${emitExpr(node.left, flags)}, ${emitExpr(node.right, flags)})`;
+    }
     const value = `${emitExpr(node.left, flags)} ${operators[node.operator] ?? node.operator} ${emitExpr(node.right, flags)}`;
     if (["+", "-", "*", "/", "%", "**"].includes(node.operator)) {
       flags.finite = true;
@@ -4290,16 +4315,16 @@ function emitExpr(node, flags) {
     .join("");
   const values = node.literal
     .filter((item) => item.value)
-    .map((item) => item.value);
+    .map((item) => emitExpr(item.value, flags));
   return `__translate(${JSON.stringify(template)}, [${values.join(", ")}])`;
 }
 function emitBoolean(node, flags) {
   flags.boolean = true;
   return `__requireBoolean(${emitExpr(node, flags)})`;
 }
-function emitString(parts) {
+function emitString(parts, flags) {
   if (parts.length === 1) return JSON.stringify(parts[0].text);
-  return `\`${parts.map((item) => `${item.text.replaceAll("`", "\\`")}${item.value === null ? "" : `\${${item.value}}`}`).join("")}\``;
+  return `\`${parts.map((item) => `${JSON.stringify(item.text).slice(1, -1).replaceAll("`", "\\`").replaceAll("${", "\\${")}${item.value === null ? "" : `\${${emitExpr(item.value, flags)}}`}`).join("")}\``;
 }
 function spaces(line) {
   return line.length - line.trimStart().length;

package/src/runtime.mjs

@@ -15,6 +15,7 @@ const ROUNDING_MODES = Object.freeze({
 });
 
 export function runtimeSource(profile = {}) {
+    const browser = profile.target === "browser";
     const scale = profile.decimal_division_scale ?? 6;
     const rounding = profile.decimal_division_rounding ?? Decimal.Rounding.HalfEven;
     if (!Number.isInteger(scale) || scale < 0)
@@ -22,9 +23,9 @@ export function runtimeSource(profile = {}) {
     if (!(rounding in ROUNDING_MODES))
         throw new Error(`unknown decimal_division_rounding ${rounding}`);
     return `import BigNumber from "./bignumber.mjs";
-import { createRequire } from "node:module";
+${browser ? 'const DOMParser = globalThis.DOMParser;' : `import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
-const { DOMParser } = require("./xmldom/index.js");
+const { DOMParser } = require("./xmldom/index.js");`}
 
 const Decimal = BigNumber.clone({
     DECIMAL_PLACES: ${scale},
@@ -207,6 +208,8 @@ export function xml2obj(xml) {
         throw new Error(\`XmlParseError: \${error.message}\`);
     }
     if (errors.length) throw new Error(\`XmlParseError: \${errors[0]}\`);
+    if (${browser} && document.getElementsByTagName("parsererror").length)
+        throw new Error("XmlParseError: invalid XML document");
     if (!document.documentElement)
         throw new Error("XmlParseError: XML must contain one root tag");
     return new Tag(document.documentElement);
@@ -270,10 +273,10 @@ export function println(value) {
 }
 
 const defaultLog = Object.freeze({
-    debug(value) { return writeLog(process.stdout, "DEBUG", value); },
-    info(value) { return writeLog(process.stdout, "INFO", value); },
-    warn(value) { return writeLog(process.stderr, "WARN", value); },
-    err(value) { return writeLog(process.stderr, "ERROR", value); },
+    debug(value) { ${browser ? 'console.debug(String(value)); return null;' : 'return writeLog(process.stdout, "DEBUG", value);'} },
+    info(value) { ${browser ? 'console.info(String(value)); return null;' : 'return writeLog(process.stdout, "INFO", value);'} },
+    warn(value) { ${browser ? 'console.warn(String(value)); return null;' : 'return writeLog(process.stderr, "WARN", value);'} },
+    err(value) { ${browser ? 'console.error(String(value)); return null;' : 'return writeLog(process.stderr, "ERROR", value);'} },
 });
 
 function writeLog(stream, level, value) {
@@ -527,6 +530,19 @@ export function requireNumber(value) {
     return finite(value);
 }
 
+export function requireNumeric(value) {
+    if (isDecimal(value) && value.isFinite()) return value;
+    return requireNumber(value);
+}
+
+export function numericAdd(left, right) {
+    requireNumeric(left);
+    requireNumeric(right);
+    if (isDecimal(left) || isDecimal(right))
+        return decimal(left).plus(right);
+    return finite(left + right);
+}
+
 export function call(value, ...arguments_) {
     if (typeof value !== "function") throw new Error("NotCallable");
     return normalize(value(...arguments_));