@lango-project/lango-js 0.1.7 → 0.1.8

package/package.json

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

package/src/compiler.mjs

@@ -283,6 +283,17 @@ class Parser {
         this.blank();
         continue;
       }
+      const hostImport = /^import js global ([A-Za-z_]\w*(?:\/[A-Za-z_]\w*)*)(?: as ([A-Za-z_]\w*))?$/.exec(line.text);
+      if (hostImport) {
+        if (declarationSeen)
+          this.fail(line, "LNG1121", "imports must precede class and function declarations");
+        const name = hostImport[2] ?? hostImport[1].split("/").at(-1);
+        if (jsImports.some((item) => item.name === name))
+          this.fail(line, "LNG1122", `duplicate JavaScript import name ${name}`);
+        jsImports.push({ name, globalPath: hostImport[1].split("/").map(kebabName) });
+        this.blank();
+        continue;
+      }
       const jsImport = /^import js "([^"]+)" as ([A-Za-z_]\w*)$/.exec(line.text);
       if (jsImport) {
         if (declarationSeen)
@@ -1074,8 +1085,12 @@ class Parser {
   }
   captures() {
     if (!(this.peek() ?? "").trimStart().startsWith("capture ")) return [];
-    const line = this.line();
-    const names = splitTopLevel(line.text.trim().slice(8));
+    const line = { text: this.peek(), number: this.i + 1 };
+    const indent = spaces(line.text);
+    const names = [];
+    while (spaces(this.peek() ?? "") === indent && (this.peek() ?? "").trimStart().startsWith("capture ")) {
+      names.push(...splitTopLevel(this.line().text.trim().slice(8)));
+    }
     if (
       names.some(
         (name) =>
@@ -1116,7 +1131,7 @@ class Parser {
         value:
           match[2] === "{"
             ? this.object(indent + 4)
-            : expr(match[2], line, this),
+            : expr(this.continuedStatement(match[2], line, indent + 4), line, this),
       });
     }
     return { type: "object", fields };
@@ -1803,6 +1818,8 @@ function validate(program, imports = []) {
     ),
   );
   const jsImportNames = new Set(program.jsImports.map((item) => item.name));
+  const jsModuleNames = new Set(program.jsImports.filter((item) => !item.globalPath).map((item) => item.name));
+  const hostImportNames = new Set(program.jsImports.filter((item) => item.globalPath).map((item) => item.name));
   const importedFunctions = new Map(
     imports.flatMap((item) =>
       (item.selections ?? [])
@@ -1836,7 +1853,7 @@ function validate(program, imports = []) {
     ["xml2obj", 1],
     ["start_trans", 0], ["commit_trans", 0], ["rollback_trans", 0], ["trans_state", 0],
   ]);
-  const hostFunctions = new Set(["fetch"]);
+  const hostFunctions = new Set(["fetch", ...hostImportNames]);
   const isDecimalValue = (value) =>
     value &&
     (value.type === "decimal" ||
@@ -2260,6 +2277,18 @@ function validate(program, imports = []) {
     findMethod(classNode, "constructor", false);
   const walk = (value, localCallables, classNode = null, staticMethod = false) => {
     if (!value || typeof value !== "object") return;
+    if (value.type === "closure" || value.type === "closureAssign")
+      localCallables = new Set([...localCallables, ...value.parameters.map((parameter) => parameter.name), ...dynamicBindingNames(value.body)]);
+    const bindings = [
+      ...(["assign", "closureAssign", "increment", "contextSet", "contextDeclare", "globalDeclare"].includes(value.type) ? [value.name] : []),
+      ...(value.parameters ?? []).map((parameter) => parameter.name),
+      ...(value.type === "for" ? [value.item] : []),
+      ...(value.type === "forObject" ? [value.key, value.value] : []),
+      ...(value.catchName ? [value.catchName] : []),
+    ];
+    const readonly = bindings.find((name) => hostImportNames.has(name));
+    if (readonly)
+      throw new LangoError("LNG1268", value.line ?? 1, `${readonly} is a readonly host import and cannot be rebound or shadowed`);
     if (value.type === "binary" && ["+", "-", "*", "/", "%", "**", ">", "<", ">=", "<="].includes(value.operator)) {
       const string = (item) => item.type === "string";
       const number = (item) => item.type === "raw" && /^\d/.test(item.value);
@@ -2336,7 +2365,7 @@ function validate(program, imports = []) {
           value.line,
           `use / between JavaScript namespace segments in new ${value.name}(...)`,
         );
-      if (value.name.includes("/")) validateJavaScriptArguments(value, value.name);
+      if (value.name.includes("/") || hostImportNames.has(value.name)) validateJavaScriptArguments(value, value.name);
       const target = classes.get(value.name);
       const constructor = target && findConstructor(target);
       if (constructor) validateRequiredArguments(constructor, value, value.name);
@@ -2344,7 +2373,7 @@ function validate(program, imports = []) {
     if (value.type === "methodCall" && typeof value.receiver === "string") {
       if (
         value.receiver.includes(".") &&
-        jsImportNames.has(value.receiver.split(".")[0])
+        jsModuleNames.has(value.receiver.split(".")[0])
       )
         throw new LangoError(
           "LNG1232",
@@ -2404,6 +2433,8 @@ function validate(program, imports = []) {
           `${targetClass.name}${target.method.static ? "::" : ":"}${value.name}`,
         );
     }
+    if (value.type === "methodCall" && hostImportNames.has(receiverRoot(value.receiver)))
+      validateJavaScriptArguments(value, `${receiverRoot(value.receiver)}.${value.name}`);
     if (value.type === "methodCall" && receiverRoot(value.receiver) === "args")
       validateJavaScriptArguments(value, `args.${value.name}`);
     if (value.type === "namespaceMethodCall") {
@@ -3401,6 +3432,7 @@ function emit(program, moduleImports = [], includeTests = false) {
         item.names.map((name) => name.split(" as ").at(-1)),
       ),
     ),
+    hostGlobals: new Map(program.jsImports.filter((item) => item.globalPath).map((item) => [item.name, item.globalPath])),
   };
   const classes = program.classes
     .map((item) => emitClass(item, flags))
@@ -3424,7 +3456,18 @@ function emit(program, moduleImports = [], includeTests = false) {
         .concat("...__langoOwnTests")
         .join(", ")}];\n`
     : "";
+  const globals = program.globals
+    .map((item) => {
+      const value = emitExpr(item.value, flags);
+      const prefix = item.exported ? "export let" : "let";
+      if (!item.name.startsWith("$")) return `${prefix} ${item.name} = ${value};\n`;
+      flags.decimal = true;
+      return `${prefix} ${item.name} = __decimal(${item.value.type === "raw" ? JSON.stringify(item.value.value) : value});\n`;
+    })
+    .join("");
   const helpers = [
+    flags.hostGlobal && "hostGlobal as __hostGlobal",
+    flags.hostGlobalCall && "hostGlobalCall as __hostGlobalCall",
     flags.decimal && "decimal as __decimal",
     flags.print && "println as __println",
     flags.translate && "translate as __translate",
@@ -3482,20 +3525,12 @@ function emit(program, moduleImports = [], includeTests = false) {
     )
     .join("");
   const jsModules = program.jsImports
+    .filter((item) => !item.globalPath)
     .map(
       (item) =>
         `import * as ${item.name} from ${JSON.stringify(item.specifier)};\n`,
     )
     .join("");
-  const globals = program.globals
-    .map((item) => {
-      const value = emitExpr(item.value, flags);
-      const prefix = item.exported ? "export let" : "let";
-      if (!item.name.startsWith("$")) return `${prefix} ${item.name} = ${value};\n`;
-      flags.decimal = true;
-      return `${prefix} ${item.name} = __decimal(${item.value.type === "raw" ? JSON.stringify(item.value.value) : value});\n`;
-    })
-    .join("");
   const testReset = includeTests
     ? `export function __langoResetTests() {\n${program.globals
         .map((item) => `    ${item.name} = ${emitExpr(item.value, flags)};\n`)
@@ -3984,6 +4019,11 @@ function emitBoundaryChecks(parameters, depth, flags) {
     .join("");
 }
 function emitReceiverName(name, flags) {
+  const host = /^([A-Za-z_]\w*)(.*)$/.exec(name);
+  if (host && flags.hostGlobals?.has(host[1])) {
+    flags.hostGlobal = true;
+    return `__hostGlobal(${JSON.stringify(flags.hostGlobals.get(host[1]))})${emitKebabPath(host[2])}`;
+  }
   const member = /^(@{1,2})(\$?[A-Za-z_]\w*)(.*)$/.exec(name);
   if (member) {
     const [, scope, property, suffix] = member;
@@ -4014,6 +4054,13 @@ function emitExpr(node, flags) {
     flags.normalize = true;
     return `__normalize(${value})`;
   };
+  if (node.type === "raw" && flags.hostGlobals.has(node.value.split(/[.\[?]/)[0]))
+    return normalize(emitReceiverName(node.value, flags));
+  if (node.type === "call" && flags.hostGlobals.has(node.name)) {
+    flags.hostGlobalCall = true;
+    const arguments_ = node.arguments.map((item) => item.type === "closure" ? emitClosure(item, 0, flags) : emitExpr(item, flags)).join(", ");
+    return `__hostGlobalCall(${JSON.stringify(flags.hostGlobals.get(node.name))}${arguments_ ? `, ${arguments_}` : ""})`;
+  }
   if (node.type === "raw")
     if (/^@{1,2}\$?[A-Za-z_]\w*[.\[?]/.test(node.value))
       return normalize(emitReceiverName(node.value, flags));
@@ -4076,7 +4123,7 @@ 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) =>
+    return `new ${flags.hostGlobals.has(node.name.split("/")[0]) ? `(${emitReceiverName(node.name.replaceAll("/", "."), flags)})` : node.name.replaceAll("/", ".")}(${node.arguments.map((item) =>
       item.type === "closure" ? emitClosure(item, 0, flags) : emitExpr(item, flags),
     ).join(", ")})`;
   if (node.type === "superMethodCall")
@@ -4092,7 +4139,7 @@ function emitExpr(node, flags) {
   if (node.type === "methodCall" || node.type === "namespaceMethodCall") {
     const namespace = node.type === "namespaceMethodCall";
     const sourceReceiver = namespace
-      ? node.receiver.replaceAll("/", ".")
+      ? emitReceiverName(node.receiver.replaceAll("/", "."), flags)
       : typeof node.receiver === "string"
         ? emitReceiverName(node.receiver, flags)
         : emitExpr(node.receiver, flags);

package/src/runtime.mjs

@@ -548,6 +548,36 @@ export function call(value, ...arguments_) {
     return normalize(value(...arguments_));
 }
 
+export class HostGlobalUnavailable extends Error {
+    constructor(path) {
+        super("HostGlobalUnavailable: " + path.join("/"));
+        this.name = "HostGlobalUnavailable";
+    }
+}
+
+function resolveHostGlobal(path) {
+    let owner = globalThis;
+    let value = owner;
+    for (const segment of path) {
+        owner = value;
+        if (owner === null || owner === undefined || !(segment in Object(owner)))
+            throw new HostGlobalUnavailable(path);
+        value = owner[segment];
+    }
+    if (value === undefined) throw new HostGlobalUnavailable(path);
+    return { owner, value };
+}
+
+export function hostGlobal(path) {
+    return resolveHostGlobal(path).value;
+}
+
+export function hostGlobalCall(path, ...arguments_) {
+    const { owner, value } = resolveHostGlobal(path);
+    if (typeof value !== "function") throw new Error("NotCallable");
+    return normalize(Reflect.apply(value, owner, arguments_));
+}
+
 export function callMethod(receiver, name, ...arguments_) {
     const value = receiver?.[name];
     if (typeof value !== "function") throw new Error("NotCallable");