@lango-project/lango-js 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lango-project/lango-js",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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+/";
@@ -1055,7 +1064,10 @@ class Parser {
       const next = this.peek();
       if (next === undefined || spaces(next) < indent)
         this.fail(line, "LNG1262", "unterminated multi-line expression");
-      source += ` ${this.line().text.trim()}`;
+      const continuation = this.line().text.trim();
+      const startsField = /^(?:\$?[A-Za-z_][\w-]*|['"][^'"]+['"]): /.test(continuation);
+      if (startsField && !/[{,]\s*$/.test(source)) source += ",";
+      source += ` ${continuation}`;
       depth = curlyDelimiterDepth(source);
     }
     return source;
@@ -4294,9 +4306,9 @@ 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) => `${item.text.replaceAll("`", "\\`")}${item.value === null ? "" : `\${${emitReceiverName(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) {