Merge pull request #180 from cca-io/fix-int-enums

Fix int enums
cca-io · Dec 9, 2021 · 583d4ba · 583d4ba
2 parents c3b0bde + 22fc36b
commit 583d4ba
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 78 deletions.
diff --git a/documentation/docs/changelog.md b/documentation/docs/changelog.md
@@ -14,6 +14,10 @@ title: Changelog
 (_Tags are copied from
 [babel](https://github.com/babel/babel/blob/master/CHANGELOG.md)_)
 
+## 3.0.2
+
+- :bug: Fixed the binding generator's handling of `int` enums.
+
 ## 3.0.1
 
 - :house: Fixed outdated peer dependencies.

diff --git a/documentation/docs/project-structure/union-values.md b/documentation/docs/project-structure/union-values.md
@@ -45,10 +45,8 @@ type variant = [#elevation | #outlined]
 
 ## Numeric unions
 
-A union consisting of only numbers will utilize the
-[[@int]](https://rescript-lang.org/docs/manual/latest/bind-to-js-function#constrain-arguments-better)
-directive. Therefore, numerical unions will accept a form of polymorphic variant
-as well.
+Numeric unions now work the same way as string only unions now and don't utilize
+the `@int` directive anymore.
 
 These don't happen often - currently the only place where this applies is in the
 `Mui.Grid.res` component.

diff --git a/examples/src/examples/ExampleSlider.bs.js b/examples/src/examples/ExampleSlider.bs.js
diff --git a/examples/src/examples/ExampleStylingTailwind.bs.js b/examples/src/examples/ExampleStylingTailwind.bs.js
diff --git a/examples/src/labExamples/ExampleToggleButton.bs.js b/examples/src/labExamples/ExampleToggleButton.bs.js
diff --git a/public/rescript-material-ui-lab/package.json b/public/rescript-material-ui-lab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rescript-material-ui-lab",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "This library provides ReScript bindings for material-ui-lab.",
   "keywords": [
     "rescript",

diff --git a/public/rescript-material-ui-ppx/package.json b/public/rescript-material-ui-ppx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rescript-material-ui-ppx",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "repository": "https://github.com/cca-io/rescript-material-ui",
   "private": false,
   "homepage": "https://rescript-material-ui.cca.io/",

diff --git a/public/rescript-material-ui/package.json b/public/rescript-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rescript-material-ui",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "This library provides ReScript bindings for material-ui.",
   "keywords": [
     "rescript",

diff --git a/public/rescript-material-ui/src/Grid.res b/public/rescript-material-ui/src/Grid.res
@@ -349,20 +349,7 @@ external make: (
   ~lg: Lg.t=?,
   ~md: Md.t=?,
   ~sm: Sm.t=?,
-  ~spacing: @int
-  [
-    | @as(0) #0
-    | @as(1) #1
-    | @as(2) #2
-    | @as(3) #3
-    | @as(4) #4
-    | @as(5) #5
-    | @as(6) #6
-    | @as(7) #7
-    | @as(8) #8
-    | @as(9) #9
-    | @as(10) #10
-  ]=?,
+  ~spacing: [#0 | #1 | #2 | #3 | #4 | #5 | #6 | #7 | #8 | #9 | #10]=?,
   ~wrap: wrap=?,
   ~xl: Xl.t=?,
   ~xs: Xs.t=?,

diff --git a/tools/binding-generator/src/classes/property-parser/_enum.ts b/tools/binding-generator/src/classes/property-parser/_enum.ts
@@ -125,8 +125,8 @@ const factory = (propertyType: PropType$Enum) => {
             .map((name, i) => `#${name}`)
             .join(' | ')}];
           `;
-          this._reasonType = `@int [${enumValuesReason
-            .map((name, i) => `@as(${this._enumValues[i]}) #${name}`)
+          this._reasonType = `[${enumValuesReason
+            .map((name) => `#${name}`)
             .join(' | ')}]`;
           break;
       }