@magnusopera/fscript 0.92.4 → 0.93.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -364,19 +364,26 @@ function rewriteTypeQualifier(aliases, selfPrefix, selfTypeNames, qualifier) {
364
364
  }
365
365
 
366
366
  function rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref) {
367
+ let option;
367
368
  switch (tref.tag) {
368
369
  case 1:
369
- return new TypeRef(/* TRTuple */ 1, [map((tref_1) => rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref_1), tref.fields[0])]);
370
+ return tref;
370
371
  case 2:
371
- return new TypeRef(/* TRFun */ 2, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[1])]);
372
+ return new TypeRef(/* TRApplied */ 2, [rewriteTypeName(aliases, selfPrefix, selfTypeNames, tref.fields[0]), map((tref_1) => rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref_1), tref.fields[1])]);
372
373
  case 3:
373
- return new TypeRef(/* TRPostfix */ 3, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), tref.fields[1]]);
374
+ return new TypeRef(/* TRForall */ 3, [tref.fields[0], (option = tref.fields[1], (option != null) ? rewriteTypeRef(aliases, selfPrefix, selfTypeNames, option) : undefined)]);
374
375
  case 4:
375
- return new TypeRef(/* TRMap */ 4, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[1])]);
376
+ return new TypeRef(/* TRTuple */ 4, [map((tref_3) => rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref_3), tref.fields[0])]);
376
377
  case 5:
377
- return new TypeRef(/* TRRecord */ 5, [map((tupledArg) => [tupledArg[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg[1])], tref.fields[0])]);
378
+ return new TypeRef(/* TRFun */ 5, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[1])]);
378
379
  case 6:
379
- return new TypeRef(/* TRStructuralRecord */ 6, [map((tupledArg_1) => [tupledArg_1[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg_1[1])], tref.fields[0])]);
380
+ return new TypeRef(/* TRPostfix */ 6, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), tref.fields[1]]);
381
+ case 7:
382
+ return new TypeRef(/* TRMap */ 7, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[1])]);
383
+ case 8:
384
+ return new TypeRef(/* TRRecord */ 8, [map((tupledArg) => [tupledArg[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg[1])], tref.fields[0])]);
385
+ case 9:
386
+ return new TypeRef(/* TRStructuralRecord */ 9, [map((tupledArg_1) => [tupledArg_1[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg_1[1])], tref.fields[0])]);
380
387
  default:
381
388
  return new TypeRef(/* TRName */ 0, [rewriteTypeName(aliases, selfPrefix, selfTypeNames, tref.fields[0])]);
382
389
  }
@@ -412,7 +419,7 @@ function tryFlattenExprPath(expr) {
412
419
  switch (current.tag) {
413
420
  case 2:
414
421
  return append(parseDotted(current.fields[0]), acc);
415
- case 21: {
422
+ case 22: {
416
423
  acc_mut = cons(current.fields[1], acc);
417
424
  current_mut = current.fields[0];
418
425
  continue loop;
@@ -481,62 +488,65 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
481
488
  switch (expr.tag) {
482
489
  case 2:
483
490
  return new Expr(/* EVar */ 2, [rewriteValueName(boundNames_1, expr.fields[0]), expr.fields[1]]);
484
- case 29:
485
- return new Expr(/* ENameOf */ 29, [rewriteValueName(boundNames_1, expr.fields[0]), expr.fields[1]]);
486
- case 28:
487
- return new Expr(/* ETypeOf */ 28, [rewriteTypeName(aliases, selfPrefix, topLevelTypeNames, expr.fields[0]), expr.fields[1]]);
488
491
  case 3:
489
- return new Expr(/* EParen */ 3, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
490
- case 4: {
492
+ return new Expr(/* ETypeApply */ 3, [rewriteExpr(boundNames_1, expr.fields[0]), map((tref) => rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, tref), expr.fields[1]), expr.fields[2]]);
493
+ case 30:
494
+ return new Expr(/* ENameOf */ 30, [rewriteValueName(boundNames_1, expr.fields[0]), expr.fields[1]]);
495
+ case 29:
496
+ return new Expr(/* ETypeOf */ 29, [rewriteTypeName(aliases, selfPrefix, topLevelTypeNames, expr.fields[0]), expr.fields[1]]);
497
+ case 4:
498
+ return new Expr(/* EParen */ 4, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
499
+ case 5: {
491
500
  const param = expr.fields[0];
492
- return new Expr(/* ELambda */ 4, [new Param(param.Name, (option_1 = param.Annotation, (option_1 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_1) : undefined), param.Span), rewriteExpr(add(param.Name, boundNames_1), expr.fields[1]), expr.fields[2]]);
501
+ return new Expr(/* ELambda */ 5, [new Param(param.Name, (option_1 = param.Annotation, (option_1 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_1) : undefined), param.Span), rewriteExpr(add(param.Name, boundNames_1), expr.fields[1]), expr.fields[2]]);
493
502
  }
494
- case 5:
495
- return new Expr(/* EApply */ 5, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
496
503
  case 6:
497
- return new Expr(/* EIf */ 6, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
504
+ return new Expr(/* EApply */ 6, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
498
505
  case 7:
499
- return new Expr(/* ERaise */ 7, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
500
- case 8: {
506
+ return new Expr(/* EIf */ 7, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
507
+ case 8:
508
+ return new Expr(/* ERaise */ 8, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
509
+ case 9: {
501
510
  const name_6 = expr.fields[0];
502
- return new Expr(/* EFor */ 8, [name_6, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(add(name_6, boundNames_1), expr.fields[2]), expr.fields[3]]);
511
+ return new Expr(/* EFor */ 9, [name_6, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(add(name_6, boundNames_1), expr.fields[2]), expr.fields[3]]);
503
512
  }
504
- case 9: {
513
+ case 10: {
505
514
  const rewrittenCases = map((tupledArg_1) => {
506
515
  let mapping_4, option_3;
507
516
  const rewrittenPattern = rewritePattern(aliases, selfPrefix, topLevelTypeNames, tupledArg_1[0]);
508
517
  const boundWithPattern = union(boundNames_1, collectPatternBindings(rewrittenPattern));
509
518
  return [rewrittenPattern, (mapping_4 = curry2(rewriteExpr)(boundWithPattern), (option_3 = tupledArg_1[1], (option_3 != null) ? mapping_4(option_3) : undefined)), rewriteExpr(boundWithPattern, tupledArg_1[2]), tupledArg_1[3]];
510
519
  }, expr.fields[1]);
511
- return new Expr(/* EMatch */ 9, [rewriteExpr(boundNames_1, expr.fields[0]), rewrittenCases, expr.fields[2]]);
520
+ return new Expr(/* EMatch */ 10, [rewriteExpr(boundNames_1, expr.fields[0]), rewrittenCases, expr.fields[2]]);
512
521
  }
513
- case 10: {
522
+ case 11: {
514
523
  const valueExpr_1 = expr.fields[1];
515
- const span_10 = expr.fields[5];
524
+ const span_11 = expr.fields[6];
516
525
  const name_7 = expr.fields[0];
517
526
  const bodyExpr = expr.fields[2];
527
+ const arity = expr.fields[5] | 0;
518
528
  let rewrittenReturnAnnotation;
519
529
  const option_5 = expr.fields[4];
520
530
  rewrittenReturnAnnotation = ((option_5 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_5) : undefined);
521
531
  if (expr.fields[3]) {
522
532
  const boundWithName = add(name_7, boundNames_1);
523
- return new Expr(/* ELet */ 10, [name_7, rewriteExpr(boundWithName, valueExpr_1), rewriteExpr(boundWithName, bodyExpr), true, rewrittenReturnAnnotation, span_10]);
533
+ return new Expr(/* ELet */ 11, [name_7, rewriteExpr(boundWithName, valueExpr_1), rewriteExpr(boundWithName, bodyExpr), true, rewrittenReturnAnnotation, arity, span_11]);
524
534
  }
525
535
  else {
526
- return new Expr(/* ELet */ 10, [name_7, rewriteExpr(boundNames_1, valueExpr_1), rewriteExpr(add(name_7, boundNames_1), bodyExpr), false, rewrittenReturnAnnotation, span_10]);
536
+ return new Expr(/* ELet */ 11, [name_7, rewriteExpr(boundNames_1, valueExpr_1), rewriteExpr(add(name_7, boundNames_1), bodyExpr), false, rewrittenReturnAnnotation, arity, span_11]);
527
537
  }
528
538
  }
529
- case 11: {
539
+ case 12: {
530
540
  const rewrittenPattern_1 = rewritePattern(aliases, selfPrefix, topLevelTypeNames, expr.fields[0]);
531
541
  const boundWithPattern_1 = union(boundNames_1, collectPatternBindings(rewrittenPattern_1));
532
- return new Expr(/* ELetPattern */ 11, [rewrittenPattern_1, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundWithPattern_1, expr.fields[2]), expr.fields[3]]);
542
+ return new Expr(/* ELetPattern */ 12, [rewrittenPattern_1, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundWithPattern_1, expr.fields[2]), expr.fields[3]]);
533
543
  }
534
- case 12: {
544
+ case 13: {
535
545
  const bindings_1 = expr.fields[0];
536
546
  const recursiveBound = union(boundNames_1, ofList(map((tupledArg_2) => tupledArg_2[0], bindings_1), {
537
547
  Compare: (x_2, y_2) => (comparePrimitives(x_2, y_2) | 0),
538
548
  }));
539
- return new Expr(/* ELetRecGroup */ 12, [map((tupledArg_3) => {
549
+ return new Expr(/* ELetRecGroup */ 13, [map((tupledArg_3) => {
540
550
  let option_9;
541
551
  const rewrittenArgs = map((p) => {
542
552
  let option_7;
@@ -545,18 +555,18 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
545
555
  return [tupledArg_3[0], rewrittenArgs, (option_9 = tupledArg_3[2], (option_9 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_9) : undefined), rewriteExpr(fold_1((s, p_1) => add(p_1.Name, s), recursiveBound, rewrittenArgs), tupledArg_3[3]), tupledArg_3[4]];
546
556
  }, bindings_1), rewriteExpr(recursiveBound, expr.fields[1]), expr.fields[2]]);
547
557
  }
548
- case 13:
549
- return new Expr(/* EList */ 13, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
550
558
  case 14:
551
- return new Expr(/* ERange */ 14, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
559
+ return new Expr(/* EList */ 14, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
552
560
  case 15:
553
- return new Expr(/* ETuple */ 15, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
561
+ return new Expr(/* ERange */ 15, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
554
562
  case 16:
555
- return new Expr(/* ERecord */ 16, [map((tupledArg_4) => [tupledArg_4[0], rewriteExpr(boundNames_1, tupledArg_4[1])], expr.fields[0]), expr.fields[1]]);
563
+ return new Expr(/* ETuple */ 16, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
556
564
  case 17:
557
- return new Expr(/* EStructuralRecord */ 17, [map((tupledArg_5) => [tupledArg_5[0], rewriteExpr(boundNames_1, tupledArg_5[1])], expr.fields[0]), expr.fields[1]]);
565
+ return new Expr(/* ERecord */ 17, [map((tupledArg_4) => [tupledArg_4[0], rewriteExpr(boundNames_1, tupledArg_4[1])], expr.fields[0]), expr.fields[1]]);
558
566
  case 18:
559
- return new Expr(/* EMap */ 18, [map((_arg_11) => {
567
+ return new Expr(/* EStructuralRecord */ 18, [map((tupledArg_5) => [tupledArg_5[0], rewriteExpr(boundNames_1, tupledArg_5[1])], expr.fields[0]), expr.fields[1]]);
568
+ case 19:
569
+ return new Expr(/* EMap */ 19, [map((_arg_11) => {
560
570
  if (_arg_11.tag === 1) {
561
571
  return new MapEntry(/* MESpread */ 1, [rewriteExpr(boundNames_1, _arg_11.fields[0])]);
562
572
  }
@@ -564,15 +574,15 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
564
574
  return new MapEntry(/* MEKeyValue */ 0, [rewriteExpr(boundNames_1, _arg_11.fields[0]), rewriteExpr(boundNames_1, _arg_11.fields[1])]);
565
575
  }
566
576
  }, expr.fields[0]), expr.fields[1]]);
567
- case 19:
568
- return new Expr(/* ERecordUpdate */ 19, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_6) => [tupledArg_6[0], rewriteExpr(boundNames_1, tupledArg_6[1])], expr.fields[1]), expr.fields[2]]);
569
577
  case 20:
570
- return new Expr(/* EStructuralRecordUpdate */ 20, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_7) => [tupledArg_7[0], rewriteExpr(boundNames_1, tupledArg_7[1])], expr.fields[1]), expr.fields[2]]);
571
- case 21: {
572
- const target_2 = expr.fields[0];
573
- const span_21 = expr.fields[2];
578
+ return new Expr(/* ERecordUpdate */ 20, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_6) => [tupledArg_6[0], rewriteExpr(boundNames_1, tupledArg_6[1])], expr.fields[1]), expr.fields[2]]);
579
+ case 21:
580
+ return new Expr(/* EStructuralRecordUpdate */ 21, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_7) => [tupledArg_7[0], rewriteExpr(boundNames_1, tupledArg_7[1])], expr.fields[1]), expr.fields[2]]);
581
+ case 22: {
582
+ const target_3 = expr.fields[0];
583
+ const span_22 = expr.fields[2];
574
584
  const fieldName = expr.fields[1];
575
- const matchValue = tryFlattenExprPath(target_2);
585
+ const matchValue = tryFlattenExprPath(target_3);
576
586
  let matchResult, rest_1, root_1;
577
587
  if (matchValue != null) {
578
588
  if (!isEmpty(matchValue)) {
@@ -594,23 +604,23 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
594
604
  }
595
605
  switch (matchResult) {
596
606
  case 0:
597
- return new Expr(/* EVar */ 2, [(FSharpMap__get_Item(aliases, root_1) + ".") + joinDotted(append(rest_1, singleton(fieldName))), span_21]);
607
+ return new Expr(/* EVar */ 2, [(FSharpMap__get_Item(aliases, root_1) + ".") + joinDotted(append(rest_1, singleton(fieldName))), span_22]);
598
608
  default:
599
- return new Expr(/* EFieldGet */ 21, [rewriteExpr(boundNames_1, target_2), fieldName, span_21]);
609
+ return new Expr(/* EFieldGet */ 22, [rewriteExpr(boundNames_1, target_3), fieldName, span_22]);
600
610
  }
601
611
  }
602
- case 22:
603
- return new Expr(/* EIndexGet */ 22, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
604
612
  case 23:
605
- return new Expr(/* ECons */ 23, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
613
+ return new Expr(/* EIndexGet */ 23, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
606
614
  case 24:
607
- return new Expr(/* EAppend */ 24, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
615
+ return new Expr(/* ECons */ 24, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
608
616
  case 25:
609
- return new Expr(/* EBinOp */ 25, [expr.fields[0], rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
617
+ return new Expr(/* EAppend */ 25, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
610
618
  case 26:
611
- return new Expr(/* ESome */ 26, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
612
- case 30:
613
- return new Expr(/* EInterpolatedString */ 30, [map((_arg_12) => {
619
+ return new Expr(/* EBinOp */ 26, [expr.fields[0], rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
620
+ case 27:
621
+ return new Expr(/* ESome */ 27, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
622
+ case 31:
623
+ return new Expr(/* EInterpolatedString */ 31, [map((_arg_12) => {
614
624
  if (_arg_12.tag === 1) {
615
625
  return new InterpolatedPart(/* IPExpr */ 1, [rewriteExpr(boundNames_1, _arg_12.fields[0])]);
616
626
  }
@@ -638,7 +648,7 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
638
648
  let def_1;
639
649
  switch (_arg_13.tag) {
640
650
  case 0:
641
- return new Stmt(/* SType */ 0, [(def_1 = _arg_13.fields[0], new TypeDef(qualifySelfName(def_1.Name), def_1.IsRecursive, map((tupledArg_8) => [tupledArg_8[0], rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, tupledArg_8[1])], def_1.Fields), map((tupledArg_9) => {
651
+ return new Stmt(/* SType */ 0, [(def_1 = _arg_13.fields[0], new TypeDef(qualifySelfName(def_1.Name), def_1.TypeParameters, def_1.IsRecursive, map((tupledArg_8) => [tupledArg_8[0], rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, tupledArg_8[1])], def_1.Fields), map((tupledArg_9) => {
642
652
  let option_13;
643
653
  return [tupledArg_9[0], (option_13 = tupledArg_9[1], (option_13 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_13) : undefined)];
644
654
  }, def_1.Cases), def_1.Import, def_1.Span))]);