From 716ec61913f73e7c5e2e350c2654fc4028a74380 Mon Sep 17 00:00:00 2001
From: Vyacheslav Matyukhin <me@berekuk.ru>
Date: Tue, 16 Aug 2022 16:02:23 +0400
Subject: [PATCH] fix some gentype errors

---
 .../Reducer_Expression_Lambda.res             |  2 +-
 ...ducerInterface_InternalExpressionValue.res | 23 +++++++++----------
 .../ReducerProject/ReducerProject.res         |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Lambda.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Lambda.res
index 587d80be..5ab7761d 100644
--- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Lambda.res
+++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_Lambda.res
@@ -95,7 +95,7 @@ let foreignFunctionInterface = (
   argArray: array<internalExpressionValue>,
   accessors: ProjectAccessorsT.t,
   reducer: ProjectReducerFnT.t,
-): result<internalExpressionValue, 'e> => {
+): result<internalExpressionValue, Reducer_ErrorValue.errorValue> => {
   let args = argArray->Belt.List.fromArray
   applyParametersToLambda(lambdaValue, args, accessors, reducer)
 }
diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_InternalExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_InternalExpressionValue.res
index b5799067..a2994baa 100644
--- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_InternalExpressionValue.res
+++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_InternalExpressionValue.res
@@ -1,10 +1,9 @@
 module ErrorValue = Reducer_ErrorValue
-module ExternalExpressionValue = ReducerInterface_ExternalExpressionValue
 module Extra_Array = Reducer_Extra_Array
-type internalCode = ExternalExpressionValue.internalCode
-type environment = ExternalExpressionValue.environment
+type internalCode = ReducerInterface_ExternalExpressionValue.internalCode
+type environment = ReducerInterface_ExternalExpressionValue.environment
 
-let defaultEnvironment = ExternalExpressionValue.defaultEnvironment
+let defaultEnvironment = ReducerInterface_ExternalExpressionValue.defaultEnvironment
 
 type rec t =
   | IEvArray(array<t>) // FIXME: Convert to MapInt
@@ -39,19 +38,19 @@ type functionCall = (string, array<t>)
 
 module Internal = {
   module NameSpace = {
-    external castNameSpaceToHidden: nameSpace => ExternalExpressionValue.hiddenNameSpace =
+    external castNameSpaceToHidden: nameSpace => ReducerInterface_ExternalExpressionValue.hiddenNameSpace =
       "%identity"
-    external castHiddenToNameSpace: ExternalExpressionValue.hiddenNameSpace => nameSpace =
+    external castHiddenToNameSpace: ReducerInterface_ExternalExpressionValue.hiddenNameSpace => nameSpace =
       "%identity"
   }
   module Lambda = {
-    let toInternal = (v: ExternalExpressionValue.lambdaValue): lambdaValue => {
+    let toInternal = (v: ReducerInterface_ExternalExpressionValue.lambdaValue): lambdaValue => {
       let p = v.parameters
       let c = v.context->NameSpace.castHiddenToNameSpace
       let b = v.body
       {parameters: p, context: c, body: b}
     }
-    and toExternal = (v: lambdaValue): ExternalExpressionValue.lambdaValue => {
+    and toExternal = (v: lambdaValue): ReducerInterface_ExternalExpressionValue.lambdaValue => {
       let p = v.parameters
       let c = v.context->NameSpace.castNameSpaceToHidden
       let b = v.body
@@ -146,7 +145,7 @@ let toStringResultOkless = (codeResult: result<t, ErrorValue.errorValue>): strin
 
 let toStringResultRecord = x =>
   switch x {
-  | Ok(a) => `Ok(${ExternalExpressionValue.toStringRecord(a)})`
+  | Ok(a) => `Ok(${ReducerInterface_ExternalExpressionValue.toStringRecord(a)})`
   | Error(m) => `Error(${ErrorValue.errorToString(m)})`
   }
 
@@ -194,7 +193,7 @@ let valueToValueType = value =>
   | IEvVoid => EvtVoid
   }
 
-let externalValueToValueType = (value: ExternalExpressionValue.t) =>
+let externalValueToValueType = (value: ReducerInterface_ExternalExpressionValue.t) =>
   switch value {
   | EvArray(_) => EvtArray
   | EvArrayString(_) => EvtArrayString
@@ -246,7 +245,7 @@ let functionCallSignatureToString = (functionCallSignature: functionCallSignatur
   `${fn}(${args->Js.Array2.map(valueTypeToString)->Js.Array2.toString})`
 }
 
-let rec toExternal = (iev: t): ExternalExpressionValue.t => {
+let rec toExternal = (iev: t): ReducerInterface_ExternalExpressionValue.t => {
   switch iev {
   | IEvArray(v) => v->Belt.Array.map(e => toExternal(e))->EvArray
   | IEvArrayString(v) => EvArrayString(v)
@@ -281,7 +280,7 @@ and nameSpaceToTypeScriptBindings = (
   Belt.Map.String.map(container, e => toExternal(e))->Belt.Map.String.toArray->Js.Dict.fromArray
 }
 
-let rec toInternal = (ev: ExternalExpressionValue.t): t => {
+let rec toInternal = (ev: ReducerInterface_ExternalExpressionValue.t): t => {
   switch ev {
   | EvArray(v) => v->Belt.Array.map(e => toInternal(e))->IEvArray
   | EvArrayString(v) => IEvArrayString(v)
diff --git a/packages/squiggle-lang/src/rescript/ReducerProject/ReducerProject.res b/packages/squiggle-lang/src/rescript/ReducerProject/ReducerProject.res
index c300e5f8..0b9f9385 100644
--- a/packages/squiggle-lang/src/rescript/ReducerProject/ReducerProject.res
+++ b/packages/squiggle-lang/src/rescript/ReducerProject/ReducerProject.res
@@ -232,7 +232,7 @@ A project has a public field tag with a constant value "reducerProject"
 project = {tag: "reducerProject"}
 */
 @genType
-let createProject = (): t => Private.createProject()->T.Private.castFromInternalProject
+let createProject = (): reducerProject => Private.createProject()->T.Private.castFromInternalProject
 
 /*
 Answer all the source ids of all the sources in the project.