···

       
1169
       
1169
       
 
       
          # check and merge share the same closure

     

       
1170
       
1170
       
 
       
          # .headError is either non-present null or an error describing string

     

       
1171
       
1171
       
 
       
          if checkedAndMerged.headError or null != null then

     

       
1172
       
1172
       
-
       
            throw "A definition for option `${showOption loc}' is not of type `${type.description}'. TypeError: ${checkedAndMerged.headError}"

     

       
1172
       
1172
       
+
       
            throw "A definition for option `${showOption loc}' is not of type `${type.description}'. TypeError: ${checkedAndMerged.headError.message}"

     

       
1173
       
1173
       
 
       
          else

     

       
1174
       
1174
       
 
       
            checkedAndMerged.value

     

       
1175
       
1175
       
 
       
        else if all (def: type.check def.value) defsFinal then

     

···

       
104
       
104
       
 
       
    let

     

       
105
       
105
       
 
       
      invalidDefs = filter (def: !check def.value) defs;

     

       
106
       
106
       
 
       
    in

     

       
107
       
107
       
-
       
    if invalidDefs != [ ] then "Definition values: ${showDefs invalidDefs}" else null;

     

       
107
       
107
       
+
       
    if invalidDefs != [ ] then { message = "Definition values: ${showDefs invalidDefs}"; } else null;

     

       
108
       
108
       
 
       


     

       
109
       
109
       
 
       
  outer_types = rec {

     

       
110
       
110
       
 
       
    isType = type: x: (x._type or "") == type;

     
···

       
1450
       
1450
       
 
       
                      valueMeta = {

     

       
1451
       
1451
       
 
       
                        inherit headError;

     

       
1452
       
1452
       
 
       
                      };

     

       
1453
       
1453
       
-
       
                      headError = "The option `${showOption loc}` is neither a value of type `${t1.description}` nor `${t2.description}`, Definition values: ${showDefs defs}";

     

       
1454
       
1454
       
-
       
                      value = null;

     

       
1453
       
1453
       
+
       
                      headError = {

     

       
1454
       
1454
       
+
       
                        message = "The option `${showOption loc}` is neither a value of type `${t1.description}` nor `${t2.description}`, Definition values: ${showDefs defs}";

     

       
1455
       
1455
       
+
       
                      };

     

       
1456
       
1456
       
+
       
                      value = abort "(t.merge.v2 defs).value must only be accessed when `.headError == null`. This is a bug in code that consumes a module system type.";

     

       
1455
       
1457
       
 
       
                    };

     

       
1456
       
1458
       
 
       
              in

     

       
1457
       
1459
       
 
       
              checkedAndMerged;