fix: ident scoping

src/generate.test.fnk

@@ -58,35 +58,6 @@ describe 'source maps', fn:
       js
       to_match_snapshot
 
-  it 'compiles to mjs', fn:
-    expect
-      fink2js_sm "
-        remove_unused = fn [expr=false, ...exprs], ctx, out:
-          match expr:
-            false:
-              [out, ctx]
-
-            [? in ['mod', 'imp', 'af', 'ac', 'cc', 'cif', 'cf']]:
-              remove_unused exprs, ctx, [expr, ...out]
-
-            [, , [is_unused ?, ctx]]:
-              args = get_ref_args expr
-              next_ctx = dec_refs args, ctx
-              remove_unused exprs, next_ctx, out
-
-            [? in ['fn', 'fnr', 'cn']]:
-              [op, [args, body], ...rest] = expr
-              rbody = reverse body
-              [obody, next_ctx] = remove_unused rbody, ctx, []
-              oexpr = [op, [args, obody], ...rest]
-              remove_unused exprs, next_ctx, [oexpr, ...out]
-
-            else:
-              remove_unused exprs, ctx, [expr, ...out]
-      "
-      to_match_snapshot
-
-
 
 
 describe 'errors', fn:

src/generate.test.fnk.snap

@@ -75,72 +75,5 @@ export const nanu = nanu_0,
       out = out_0,
       func = func_0,
       y = y_1;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QuZm5rIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFPLE1BQUEsTUFBRyxHQUFIO0FBQ0QsTUFBQSxLQUFtQyxHQUFMO0FBQTdCLEVBQUEsR0FBNkIsRUFBeEIsS0FBd0I7QUFBakIsV0FBaUIsRUFBTixNQUFNO0FBQUEsRUFBQSxJQUFJLEVBQUo7QUFBQSxDQUE5QjtBQUNDLE1BQUEsS0FBRyxHQUFIO0FBQ0QsTUFBQSxLQUF3QixHQUF2QixRQUFPLEtBQUksUUFBTyxLQUFHLEVBQXRCO0FBQ0QsTUFBQSxJQUFzRCxHQUF0RCxLQUFLLElBQUksS0FBSyxDQUFDLEtBQUssR0FBTCxDQUFTLEtBQVQsQ0FBYSxHQUFiLENBQWEsQ0FBQSxLQUFHLENBQWhCLENBQWlCLElBQWpCLENBQXNCLENBQUEsTUFBSSxDQUExQixHQUFWLE1BQUw7QUFDQSxNQUFBLElBQWMsR0FBZCxJQUFJLEdBQUcsT0FBUDtBQUNBLE1BQUEsTUFBQyxHQUFEO0FBQUksTUFBQSxLQUFFLEdBQUY7QUFBTCxNQUFBLEdBQVMsR0FBTCxDQUFILE1BQUcsRUFBQSxLQUFJLENBQVI7QUFFRSxNQUFBLEtBQVMsR0FBRixDQUFOLEdBQU0sRUFBSCxNQUFHLEVBQUEsS0FBQyxDQUFSOztBQUNDLE1BQUEsTUFDSSxHQURKLENBQUcsR0FBSCxFQUFNLEdBQU47QUFDTCxTQUFBLEdBQUMsR0FBRyxHQUFKLEdBQVEsTUFBUjtBQURLOztBQUVILE1BQUEsR0FDSixHQURJLE1BQUksQ0FBQyxLQUFELEVBQU0sR0FBTixFQUFTLE1BQVQsQ0FBSjthQVhKLElBQUksR0FBRyxNO01BQ1AsR0FBRyxHQUFHLEs7TUFDTixHQUFHLEdBQUcsSztNQUNOLEdBQUcsR0FBRyxLO01BQ04sRUFBRSxHQUFHLEk7TUFDTCxFQUFFLEdBQUcsSTtNQUNMLENBQUMsR0FBRyxHO01BRUosR0FBRyxHQUFHLEs7TUFDTixJQUFJLEdBQUcsTTtNQUVQLENBQUMsR0FBRyxHIiwic291cmNlc0NvbnRlbnQiOlsibmFudSA9IDM0NVxuZm9vID0ge2JhcjogMTIzNDUsICdzcGFtIG5pJzogbmFudSwgbmFudX1cbmJhciA9ICdmb28nXG5oYW0gPSAnZm9vOiAke2Zvb30gYmFyOiR7YmFyfSdcbmVsID0gPEZvbz5iYXIgezEyM30gPGRpdiBmb289MTM0IGJhciBzcGFtPW5hbnU+PC9kaXY+PC9Gb28+XG5uaSA9IHNwYW0gKyBmb28tYmFyXG5hID0gWzEsICduaSddXG5bYiwgY10gPSBhXG5vdXQgPSBbYSwgYiwgY11cbmZ1bmMgPSBmbiB4LCB5OlxuICB4ICsgeSArIGJcbnkgPSBmdW5jIGJhciwgYSwgYlxuIl19"
-`;
-
-exports[`source maps compiles to mjs 2`] = `
-"import { _in_ } from \\"@fink/js-interop/runtime.js\\";
-
-const remove_unused_0 = (...args_0) => {
-  remove_unused_0: do {
-    const dlst_0 = args_0[0];
-    const tail_0 = args_0.slice(1);
-    const hdm_0 = dlst_0[0];
-    const expr_0 = undefined === hdm_0 ? false : hdm_0;
-    const tail_1 = dlst_0.slice(1);
-    const ctx_0 = args_0[1];
-    const out_0 = args_0[2];
-
-    /* istanbul ignore else */
-    if (expr_0 === false) {
-      return [out_0, ctx_0];
-    }
-
-    /* istanbul ignore else */
-    if (null != expr_0) {
-      /* istanbul ignore else */
-      if (true === _in_(expr_0[0], [\`mod\`, \`imp\`, \`af\`, \`ac\`, \`cc\`, \`cif\`, \`cf\`])) {
-        args_0 = [tail_1, ctx_0, [expr_0, ...out_0]];
-        continue remove_unused_0;
-      }
-    }
-
-    /* istanbul ignore else */
-    if (null != expr_0) {
-      const itm_1 = expr_0[2];
-
-      /* istanbul ignore else */
-      if (null != itm_1) {
-        const val_1 = is_unused(itm_1[0], ctx_0);
-
-        /* istanbul ignore else */
-        if (true === val_1) {
-          const args_2 = get_ref_args(expr_0);
-          const next_ctx_1 = dec_refs(args_2, ctx_0);
-          args_0 = [tail_1, next_ctx_1, out_0];
-          continue remove_unused_0;
-        }
-      }
-    }
-
-    /* istanbul ignore else */
-    if (null != expr_0) {
-      /* istanbul ignore else */
-      if (true === _in_(expr_0[0], [\`fn\`, \`fnr\`, \`cn\`])) {
-        const tail_5 = expr_0.slice(1);
-        const dlst_2 = expr_0[1];
-        const rbody_0 = reverse(dlst_2[1]);
-        const dlst_3 = remove_unused_0(rbody_0, ctx_0, []);
-        args_0 = [tail_1, dlst_3[1], [[expr_0[0], [dlst_2[0], dlst_3[0]], ...tail_5.slice(1)], ...out_0]];
-        continue remove_unused_0;
-      }
-    }
-
-    args_0 = [tail_1, ctx_0, [expr_0, ...out_0]];
-    continue remove_unused_0;
-  } while (true);
-};
-
-export const remove_unused = remove_unused_0;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QuZm5rIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQWdCLE1BQUEsZUFzQmhCLEdBdEJnQixJQUFBLE1Bc0JoQjtBQXRCZ0IsRUFBQSxlQXNCaEI7QUF0Qm1CLFVBQUEsTUFBc0IsR0FBekIsTUFBRztBQUFBLFVBQUEsTUFBc0IsR0FBekIsTUFBRztBQUFDLFVBQUEsS0FBSSxHQUFMLE1BQUM7QUFBQSxVQUFBLE1BQUksR0FBSixjQUFBLEtBQUksR0FBQyxLQUFELEdBQUo7QUFBQSxVQUFBLE1BQUksR0FBTCxNQUFDO0FBQXVCLFVBQUEsS0FBRyxHQUE5QixNQUEyQjtBQUFLLFVBQUEsS0FBRyxHQUFuQyxNQUFnQzs7QUFzQmhEO0FBcEJJLFFBREksTUFDSixLQUFBLEtBQUs7QUFDSCxjQUFDLEtBQUQsRUFBTSxLQUFOO0FBQVU7O0FBbUJoQjtBQWpCSSxnQkFKSSxNQUlKLEVBQUM7QUFBQTtBQUFBLHdCQUpHLE1BSUgsS0FBSyxDQUFFLEtBQUYsRUFBUyxLQUFULEVBQWdCLElBQWhCLEVBQXNCLElBQXRCLEVBQTRCLElBQTVCLEVBQWtDLEtBQWxDLEVBQXlDLElBQXpDLENBQUwsR0FBbUQ7QUFMeEMsUUFBQSxNQUt3QyxHQUN4QixDQUFaLE1BQVksRUFBTCxLQUFLLEdBQUMsTUFBRCxFQUFVLEdBQUEsS0FBVixFQUR3QjtBQUFBLGlCQUx4QyxlQUt3QztBQUNWO0FBRFM7O0FBaUJ2RDtBQWRJLGdCQVBJLE1BT0osRUFBSztBQUFBLFlBQUEsS0FBa0IsR0FQbkIsTUFPQzs7QUFBQTtBQUFBLGtCQUFBLEtBQWtCLEVBQWpCO0FBQUEsY0FBQSxLQUFnQixHQUFoQixTQUFTLENBQVYsS0FBVyxHQUFELEVBQUksS0FBSixDQUFUOztBQUFBO0FBQUEscUJBQUEsS0FBZ0IsRUFBRTtBQUNmLGdCQUFBLE1BQWlCLEdBQWpCLFlBQVksQ0FBQyxNQUFELENBQVo7QUFDSSxnQkFBQSxVQUFrQixHQUFsQixRQUFRLENBQUMsTUFBRCxFQUFPLEtBQVAsQ0FBUjtBQVZELFVBQUEsTUFRWSxHQUdTLENBQWpCLE1BQWlCLEVBQVYsVUFBVSxFQUFBLEtBQUcsQ0FIWjtBQUFBLG1CQVJaLGVBUVk7QUFHWTtBQUhkO0FBQUM7O0FBYzNCO0FBVEksZ0JBWkksTUFZSixFQUFDO0FBQUE7QUFBQSx3QkFaRyxNQVlILEtBQUssQ0FBRSxJQUFGLEVBQVEsS0FBUixFQUFlLElBQWYsQ0FBTCxHQUF5QjtBQUN2QixjQUFBLE1BQUUsR0FBMkIsTUFBN0I7QUFBSSxjQUFBLE1BQVksR0FBYSxNQUF6QjtBQUNHLGNBQUEsT0FBWSxHQUFaLE9BQU8sQ0FEVixNQUNXLEdBQUQsQ0FBUDtBQUNZLGNBQUEsTUFBNEIsR0FBNUIsZUFBYSxDQUFDLE9BQUQsRUFBUSxLQUFSLEVBQWEsRUFBYixDQUFiO0FBaEJWLFFBQUEsTUFhYyxHQUtPLENBQWpCLE1BQWlCLEVBRlgsTUFFQyxHQUFVLEdBQUMsQ0FKRixNQUdyQixHQUN1QixFQURuQixDQUhSLE1BR1MsR0FBRCxFQURPLE1BQ0EsR0FBUCxDQUNtQixFQURELEdBSDlCLE1BRzhCLFNBQ0MsQ0FBRCxFQUFXLEdBQUEsS0FBWCxFQUxQO0FBQUEsaUJBYmQsZUFhYztBQUtzQjtBQUx2Qjs7QUFiYixJQUFBLE1Bc0JoQixHQURnQyxDQUFaLE1BQVksRUFBTCxLQUFLLEdBQUMsTUFBRCxFQUFVLEdBQUEsS0FBVixFQUNoQztBQUFBLGFBdEJnQixlQXNCaEI7QUFBQTtBQUFBLENBdEJnQjs7YUFBaEIsYUFBYSxHQUFHLGUiLCJzb3VyY2VzQ29udGVudCI6WyJyZW1vdmVfdW51c2VkID0gZm4gW2V4cHI9ZmFsc2UsIC4uLmV4cHJzXSwgY3R4LCBvdXQ6XG4gIG1hdGNoIGV4cHI6XG4gICAgZmFsc2U6XG4gICAgICBbb3V0LCBjdHhdXG5cbiAgICBbPyBpbiBbJ21vZCcsICdpbXAnLCAnYWYnLCAnYWMnLCAnY2MnLCAnY2lmJywgJ2NmJ11dOlxuICAgICAgcmVtb3ZlX3VudXNlZCBleHBycywgY3R4LCBbZXhwciwgLi4ub3V0XVxuXG4gICAgWywgLCBbaXNfdW51c2VkID8sIGN0eF1dOlxuICAgICAgYXJncyA9IGdldF9yZWZfYXJncyBleHByXG4gICAgICBuZXh0X2N0eCA9IGRlY19yZWZzIGFyZ3MsIGN0eFxuICAgICAgcmVtb3ZlX3VudXNlZCBleHBycywgbmV4dF9jdHgsIG91dFxuXG4gICAgWz8gaW4gWydmbicsICdmbnInLCAnY24nXV06XG4gICAgICBbb3AsIFthcmdzLCBib2R5XSwgLi4ucmVzdF0gPSBleHByXG4gICAgICByYm9keSA9IHJldmVyc2UgYm9keVxuICAgICAgW29ib2R5LCBuZXh0X2N0eF0gPSByZW1vdmVfdW51c2VkIHJib2R5LCBjdHgsIFtdXG4gICAgICBvZXhwciA9IFtvcCwgW2FyZ3MsIG9ib2R5XSwgLi4ucmVzdF1cbiAgICAgIHJlbW92ZV91bnVzZWQgZXhwcnMsIG5leHRfY3R4LCBbb2V4cHIsIC4uLm91dF1cblxuICAgIGVsc2U6XG4gICAgICByZW1vdmVfdW51c2VkIGV4cHJzLCBjdHgsIFtleHByLCAuLi5vdXRdXG4iXX0="
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QuZm5rIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFPLE1BQUEsTUFBRyxHQUFIO0FBQ0QsTUFBQSxLQUFtQyxHQUFMO0FBQTdCLEVBQUEsR0FBNkIsRUFBeEIsS0FBd0I7QUFBakIsV0FBaUIsRUFBTixNQUFNO0FBQUEsRUFBQSxJQUFJLEVBQUo7QUFBQSxDQUE5QjtBQUNDLE1BQUEsS0FBRyxHQUFIO0FBQ0QsTUFBQSxLQUF3QixHQUF2QixRQUFPLEtBQUksUUFBTyxLQUFHLEVBQXRCO0FBQ0QsTUFBQSxJQUFzRCxHQUF0RCxLQUFLLElBQUksS0FBSyxDQUFDLENBQUMsR0FBRCxDQUFLLEdBQUwsQ0FBUyxLQUFULENBQWEsR0FBYixDQUFhLENBQUEsS0FBRyxDQUFoQixDQUFpQixJQUFqQixDQUFzQixDQUFBLE1BQUksQ0FBMUIsR0FBVixNQUFMO0FBQ0EsTUFBQSxJQUFjLEdBQWQsSUFBSSxHQUFHLE9BQVA7QUFDQSxNQUFBLE1BQUMsR0FBRDtBQUFJLE1BQUEsS0FBRSxHQUFGO0FBQUwsTUFBQSxHQUFTLEdBQUwsQ0FBSCxNQUFHLEVBQUEsS0FBSSxDQUFSO0FBRUUsTUFBQSxLQUFTLEdBQUYsQ0FBTixHQUFNLEVBQUgsTUFBRyxFQUFBLEtBQUMsQ0FBUjs7QUFDQyxNQUFBLE1BQ0ksR0FESixDQUFHLEdBQUgsRUFBTSxHQUFOO0FBQ0wsU0FBQSxHQUFDLEdBQUcsR0FBSixHQUFRLE1BQVI7QUFESzs7QUFFSCxNQUFBLEdBQ0osR0FESSxNQUFJLENBQUMsS0FBRCxFQUFNLEdBQU4sRUFBUyxNQUFULENBQUo7YUFYSixJQUFJLEdBQUcsTTtNQUNQLEdBQUcsR0FBRyxLO01BQ04sR0FBRyxHQUFHLEs7TUFDTixHQUFHLEdBQUcsSztNQUNOLEVBQUUsR0FBRyxJO01BQ0wsRUFBRSxHQUFHLEk7TUFDTCxDQUFDLEdBQUcsRztNQUVKLEdBQUcsR0FBRyxLO01BQ04sSUFBSSxHQUFHLE07TUFFUCxDQUFDLEdBQUcsRyIsInNvdXJjZXNDb250ZW50IjpbIm5hbnUgPSAzNDVcbmZvbyA9IHtiYXI6IDEyMzQ1LCAnc3BhbSBuaSc6IG5hbnUsIG5hbnV9XG5iYXIgPSAnZm9vJ1xuaGFtID0gJ2ZvbzogJHtmb299IGJhcjoke2Jhcn0nXG5lbCA9IDxGb28+YmFyIHsxMjN9IDxkaXYgZm9vPTEzNCBiYXIgc3BhbT1uYW51PjwvZGl2PjwvRm9vPlxubmkgPSBzcGFtICsgZm9vLWJhclxuYSA9IFsxLCAnbmknXVxuW2IsIGNdID0gYVxub3V0ID0gW2EsIGIsIGNdXG5mdW5jID0gZm4geCwgeTpcbiAgeCArIHkgKyBiXG55ID0gZnVuYyBiYXIsIGEsIGJcbiJdfQ=="
 `;

src/ir/context.fnk

@@ -56,19 +56,6 @@ ir_fn = fn fn_name, args, name_or_id=false, {loc}, ctx:
 
 
 
-
-
-# get_value = fn id, {values}:
-#   {(id): val={}} = values
-#   val
-
-
-
-# update_value = fn id, updates, ctx:
-#   {(id): curr={}} = ctx.values
-#   {...ctx, values: {...ctx.values, (id): {...curr, ...updates}}}
-
-
 get_value = fn {i: id}, {values}:
   tryGet {}, id, values
 
@@ -130,7 +117,7 @@ init_ref_counts = fn [expr=false, ...rest], ctx:
     else:
       [{f: op, args}, res] = expr
       rest_ctx = match op:
-        ? in ['fn', 'cn', 'fnr']:
+        ? in ['fn', 'cn']:
           [fn_args, body] = args
           init_ref_counts body, init_refs [...fn_args, ...res], ctx
 

src/ir/func/init.fnk

@@ -2,6 +2,7 @@
 {transform} = import '../transform.fnk'
 {unique_or_id, ir_fn, get_refs} = import '../context.fnk'
 {transform_dl} = import '../assignment/init.fnk'
+{bind_x} = import '../identifier/init.fnk'
 
 
 
@@ -28,6 +29,9 @@ transform_exprs = fn [expr=false, ...rest], ctx, out, last_id:
   match expr:
     false:
       [out, last_id, ctx]
+    {value: 'undefined'}:
+      [foo, id, next_ctx] = transform expr, 'result', ctx
+      transform_exprs rest, next_ctx, [...out, ...foo], id
     else:
       [foo, id, next_ctx] = transform expr, 'result', ctx
       transform_exprs rest, next_ctx, [...out, ...foo], id
@@ -41,16 +45,22 @@ transform_args = fn {args: exprs, loc}, ctx:
 
 
 
-transform_func = fn expr, res_id, {scopes=[], self_name, ...ctx}:
-  [self_id, x_ctx] = unique_or_id '${res_id.i}', expr, ctx
-  args_ctx = {...x_ctx, scopes: [{(self_name): self_id}, ...scopes]}
+transform_func = fn expr, res_id, {scopes, self_name=false, ...ctx}:
+  func_ctx = {...ctx, scopes: [{}, ...scopes]}
+
+  [self_id, args_ctx] = match self_name:
+    false:
+      [false, func_ctx ]
+    else:
+      [self_id, bind_ctx] = unique_or_id '${res_id.i}', expr, func_ctx
+      [self_id, bind_x {value: self_name}, self_id, bind_ctx]
 
   [args, args_id, body_ctx] = transform_args expr, args_ctx
   [exprs, fn_res_id, fn_ctx] = transform_exprs expr.exprs, body_ctx, []
   body = [...args, ...exprs]
 
-  [fun, , end_ctx] = match get_refs self_id, fn_ctx:
-    ? > 0 :
+  [fun, , end_ctx] = match self_id:
+    ? != false and 0 < get_refs ?, fn_ctx:
       zfnc args_id, self_id, fn_res_id, body, res_id, expr, fn_ctx
     else:
       fnc args_id, fn_res_id, body, res_id, expr, fn_ctx

src/ir/func/init.test.fnk

@@ -103,6 +103,15 @@ describe 'func', fn:
       to_match_snapshot
 
 
+  it 'handles self-ref scoping', fn:
+    expect
+      fink2lir "
+        undefined = foo
+        bar = fn: fn: undefined
+      "
+      to_match_snapshot
+
+
 
 describe 'recursive funcs', fn:
   it 'compiles recursive calls', fn:

src/ir/func/init.test.fnk.snap

@@ -355,6 +355,25 @@ rec_e fn exports_0:
           mod exports_1, drctvs_0, fn mod_0:"
 `;
 
+exports[`func handles self-ref scoping 1`] = `
+"
+rec_e fn exports_0:
+  id foo, fn undefined_0:
+    str 'undefined', fn key_0:
+      rec_s exports_0, key_0, undefined_0, fn exports_1:
+        id (fn args_0, ret_1: #fn
+          id (fn args_1, ret_0: #fn
+            id undefined_0, fn result_1:
+              cc ret_0, result_1
+          ), fn result_0:
+            cc ret_1, result_0
+        ), fn bar_0:
+          str 'bar', fn key_1:
+            rec_s exports_1, key_1, bar_0, fn exports_2:
+              lst_e fn drctvs_0:
+                mod exports_2, drctvs_0, fn mod_0:"
+`;
+
 exports[`recursive funcs compiles recursive calls 1`] = `
 "
 rec_e fn exports_0:

src/ir/identifier/init.fnk

@@ -4,7 +4,7 @@
 
 
 bind = fn {value, loc}, ctx:
-  {scopes: [scope, ...scopes]=[]} = ctx
+  {scopes: [scope, ...scopes]} = ctx
   [id, next_ctx] = unique_or_id value, {loc}, ctx
 
   end_ctx = rec:
@@ -18,7 +18,7 @@ bind = fn {value, loc}, ctx:
 
 # TODO rename
 bind_x = fn {value}, id, ctx:
-  {scopes: [scope, ...scopes]=[]} = ctx
+  {scopes: [scope, ...scopes]} = ctx
 
   end_ctx = rec:
     ...ctx
@@ -30,7 +30,7 @@ bind_x = fn {value}, id, ctx:
 
 
 
-get_ident = fn name, [scope, ...scopes]=[], ctx:
+get_ident = fn name, [scope, ...scopes], ctx:
   match scope:
     {(name): ?}:
       id = scope.(name)

src/ir/init.fnk

@@ -48,6 +48,7 @@ init_ctx = fn code, filename, options:
     unique_ids: {}
     errors: []
     values: empty
+    scopes: [{}]
 
   pipe ctx:
     add_transformers

src/ir/serialize.fnk

@@ -65,8 +65,7 @@ serialize = fn [curr=false, ...rest], out='', indent='':
           ${indent}), fn${a2s ids}:'
         '  ${indent}'
 
-
-    [{f: ? in ['cn', 'fn', 'fnr']}]:
+    [{f: ? in ['cn', 'fn']}]:
       [{f: op, args: [args, body]}, ids] = curr
       serialize
         rest

src/js/identifier/init.fnk

@@ -69,8 +69,7 @@ safe_names = fn [curr=false, ...exprs], renames={}, out=[]:
       [nres, next_ren] = rename res, renames
       safe_names exprs, next_ren, [...out, [expr, nres]]
 
-
-    [{f: ? in ['fn', 'fnr', 'cn']}]:
+    [{f: ? in ['fn', 'cn']}]:
       [expr, res] = curr
       {args: [args, body]} = expr
       [nargs, bod_ren] = rename args, renames

src/js/init.fnk

@@ -1,6 +1,6 @@
 {reverse} = import '@fink/std-lib/iter.fnk'
 
-{init_ctx, update_value} = import '../ir/context.fnk'
+{init_ctx, update_value, get_value} = import '../ir/context.fnk'
 
 {replace_idents} = import './identifier/init.fnk'
 
@@ -111,9 +111,18 @@ prepare_non_inlinable = fn [expr=false, ...exprs], ctx:
       next_ctx = update_value res_id, {inline: false}, ctx
       prepare_non_inlinable exprs, next_ctx
 
+    [{f: 'str'}]:
+      [, [res_id]] = expr
+      next_ctx = update_value res_id, {tp: 'str'}, ctx
+      prepare_non_inlinable exprs, next_ctx
+
     [{f: 'jxe'}]:
       [{args: [elem_id]}] = expr
-      next_ctx = update_value elem_id, {inline: false}, ctx
+
+      next_ctx = match get_value elem_id, ctx:
+        {tp: 'str'}: ctx
+        else: update_value elem_id, {inline: false}, ctx
+
       prepare_non_inlinable exprs, next_ctx
 
     [{f: ? in ['fn', 'cn']}]:
@@ -134,7 +143,7 @@ transform_ir = fn input_exprs, options:
     prepare_rets rev_expr, ?
     prepare_imports rev_expr, ?
     prepare_exports rev_expr, ?
-    prepare_non_inlinable rev_expr, ?
+    prepare_non_inlinable exprs, ?
     add_transformers ?
 
   transfrom_module exprs, ctx

src/js/module/init.test.fnk.snap

@@ -47,7 +47,7 @@ exports.ˆdefault = default_0;"
 `;
 
 exports[`module handles side effects 1`] = `
-"const mex_0 = foo(bar);
-const mex_1 = shrub.ni(foo);
+"foo(bar);
+shrub.ni(foo);
 export const spam = ni;"
 `;