Integer codec

2024-11-22 04:43:15 +03:00 · 2024-07-25 13:45:23 +02:00 · 2024-07-25 13:45:23 +02:00 · b435803c33
commit b435803c33
parent 0aa088a28a
145 changed files with 552 additions and 442 deletions
--- a/autodocodec-api-usage/test/Autodocodec/Aeson/SchemaSpec.hs
+++ b/autodocodec-api-usage/test/Autodocodec/Aeson/SchemaSpec.hs
@ -135,6 +135,7 @@ instance GenValid JSONSchema where
    NullSchema -> [AnySchema]
    BoolSchema -> [AnySchema]
    StringSchema -> [AnySchema]
+    IntegerSchema mBounds -> AnySchema : (IntegerSchema <$> shrinkValid mBounds)
    NumberSchema mBounds -> AnySchema : (NumberSchema <$> shrinkValid mBounds)
    MapSchema s -> AnySchema : s : (MapSchema <$> shrinkValid s)
    ArraySchema s -> AnySchema : s : (ArraySchema <$> shrinkValid s)
@ -156,7 +157,8 @@ instance GenValid JSONSchema where
      then elements [AnySchema, NullSchema, BoolSchema, StringSchema]
      else
        oneof
-          [ NumberSchema <$> genValid,
+          [ IntegerSchema <$> genValid,
+            NumberSchema <$> genValid,
            ArraySchema <$> resize (n - 1) genValid,
            MapSchema <$> resize (n - 1) genValid,
            (ObjectSchema <$> resize (n - 1) genValid) `suchThat` isValid,
@ -203,7 +205,7 @@ instance GenValid ObjectSchema where
            ObjectAllOfSchema <$> genValid
          ]

-instance GenValid NumberBounds where
+instance (GenValid a) => GenValid (Bounds a) where
  genValid = genValidStructurallyWithoutExtraChecking
  shrinkValid = shrinkValidStructurallyWithoutExtraFiltering

--- a/autodocodec-api-usage/test_resources/error/int-error-big.txt
+++ b/autodocodec-api-usage/test_resources/error/int-error-big.txt
@ -1 +1 @@
-Error in $: Number 1.0e10000 is bigger than the upper bound 9.223372036854775807e18
+Error in $: Number 1.0e10000 is bigger than the upper bound 1.0e1024
--- a/autodocodec-api-usage/test_resources/error/int8-error-200.txt
+++ b/autodocodec-api-usage/test_resources/error/int8-error-200.txt
@ -1 +1 @@
-Error in $: Number 200.0 is bigger than the upper bound 127.0
+Error in $: Number 200 is bigger than the upper bound 127
--- a/autodocodec-api-usage/test_resources/error/word-error-negative.txt
+++ b/autodocodec-api-usage/test_resources/error/word-error-negative.txt
@ -1 +1 @@
-Error in $: Number -3.0 is smaller than the lower bound 1.8446744073709551615e19
+Error in $: Number -3 is smaller than the lower bound 0
--- a/autodocodec-api-usage/test_resources/error/word8-error-300.txt
+++ b/autodocodec-api-usage/test_resources/error/word8-error-300.txt
@ -1 +1 @@
-Error in $: Number 300.0 is bigger than the upper bound 255.0
+Error in $: Number 300 is bigger than the upper bound 255
--- a/autodocodec-api-usage/test_resources/json-schema/expression.json
+++ b/autodocodec-api-usage/test_resources/json-schema/expression.json
@ -49,7 +49,7 @@
                        "value": {
                            "maximum": 9223372036854775807,
                            "minimum": -9223372036854775808,
-                            "type": "number"
+                            "type": "integer"
                        }
                    },
                    "required": [
--- a/autodocodec-api-usage/test_resources/json-schema/int.json
+++ b/autodocodec-api-usage/test_resources/json-schema/int.json
@ -1,5 +1,5 @@
 {
    "maximum": 9223372036854775807,
    "minimum": -9223372036854775808,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/int16.json
+++ b/autodocodec-api-usage/test_resources/json-schema/int16.json
@ -1,5 +1,5 @@
 {
    "maximum": 32767,
    "minimum": -32768,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/int32.json
+++ b/autodocodec-api-usage/test_resources/json-schema/int32.json
@ -1,5 +1,5 @@
 {
    "maximum": 2147483647,
    "minimum": -2147483648,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/int64.json
+++ b/autodocodec-api-usage/test_resources/json-schema/int64.json
@ -1,5 +1,5 @@
 {
    "maximum": 9223372036854775807,
    "minimum": -9223372036854775808,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/int8.json
+++ b/autodocodec-api-usage/test_resources/json-schema/int8.json
@ -1,5 +1,5 @@
 {
    "maximum": 127,
    "minimum": -128,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/integer.json
+++ b/autodocodec-api-usage/test_resources/json-schema/integer.json
@ -1,5 +1,3 @@
 {
-    "maximum": 1.0e1024,
-    "minimum": -1.0e1024,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/lists-example.json
+++ b/autodocodec-api-usage/test_resources/json-schema/lists-example.json
@ -13,7 +13,7 @@
            "items": {
                "maximum": 9223372036854775807,
                "minimum": -9223372036854775808,
-                "type": "number"
+                "type": "integer"
            },
            "type": "array"
        },
@ -22,7 +22,7 @@
            "items": {
                "maximum": 9223372036854775807,
                "minimum": -9223372036854775808,
-                "type": "number"
+                "type": "integer"
            },
            "type": "array"
        },
--- a/autodocodec-api-usage/test_resources/json-schema/map-text-ind.json
+++ b/autodocodec-api-usage/test_resources/json-schema/map-text-ind.json
@ -2,7 +2,7 @@
    "additionalProperties": {
        "maximum": 9223372036854775807,
        "minimum": -9223372036854775808,
-        "type": "number"
+        "type": "integer"
    },
    "type": "object"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/natural.json
+++ b/autodocodec-api-usage/test_resources/json-schema/natural.json
@ -1,5 +1,4 @@
 {
-    "maximum": 1.0e1024,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/recursive.json
+++ b/autodocodec-api-usage/test_resources/json-schema/recursive.json
@ -6,7 +6,7 @@
                    "$comment": "base case",
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                {
                    "$comment": "Recurse",
--- a/autodocodec-api-usage/test_resources/json-schema/these.json
+++ b/autodocodec-api-usage/test_resources/json-schema/these.json
@ -6,7 +6,7 @@
                "int": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "type": {
                    "const": "that"
@ -23,7 +23,7 @@
                "int": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "text": {
                    "type": "string"
--- a/autodocodec-api-usage/test_resources/json-schema/war.json
+++ b/autodocodec-api-usage/test_resources/json-schema/war.json
@ -3,7 +3,7 @@
        {
            "maximum": 255,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        },
        {
            "type": "string"
--- a/autodocodec-api-usage/test_resources/json-schema/word.json
+++ b/autodocodec-api-usage/test_resources/json-schema/word.json
@ -1,5 +1,5 @@
 {
    "maximum": 1.8446744073709551615e19,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/word16.json
+++ b/autodocodec-api-usage/test_resources/json-schema/word16.json
@ -1,5 +1,5 @@
 {
    "maximum": 65535,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/word32.json
+++ b/autodocodec-api-usage/test_resources/json-schema/word32.json
@ -1,5 +1,5 @@
 {
    "maximum": 4294967295,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/word64.json
+++ b/autodocodec-api-usage/test_resources/json-schema/word64.json
@ -1,5 +1,5 @@
 {
    "maximum": 1.8446744073709551615e19,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/json-schema/word8.json
+++ b/autodocodec-api-usage/test_resources/json-schema/word8.json
@ -1,5 +1,5 @@
 {
    "maximum": 255,
    "minimum": 0,
-    "type": "number"
+    "type": "integer"
 }
--- a/autodocodec-api-usage/test_resources/nix/int16-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/int16-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.s16
+lib.types.ints.s16
--- a/autodocodec-api-usage/test_resources/nix/int32-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/int32-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.s32
+lib.types.ints.s32
--- a/autodocodec-api-usage/test_resources/nix/int8-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/int8-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.s8
+lib.types.ints.s8
--- a/autodocodec-api-usage/test_resources/nix/integer-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/integer-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.number
+lib.types.int
--- a/autodocodec-api-usage/test_resources/nix/natural-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/natural-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.number
+lib.types.int
--- a/autodocodec-api-usage/test_resources/nix/war-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/war-type.nix
@ -1,5 +1,5 @@
 { lib }:
 lib.types.oneOf [
-  lib.types.u8
+  lib.types.ints.u8
  lib.types.str
 ]
--- a/autodocodec-api-usage/test_resources/nix/word16-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/word16-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.u16
+lib.types.ints.u16
--- a/autodocodec-api-usage/test_resources/nix/word32-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/word32-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.u32
+lib.types.ints.u32
--- a/autodocodec-api-usage/test_resources/nix/word8-type.nix
+++ b/autodocodec-api-usage/test_resources/nix/word8-type.nix
@ -1,2 +1,2 @@
 { lib }:
-lib.types.u8
+lib.types.ints.u8
--- a/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/expression.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/expression.json
@ -32,7 +32,7 @@
                "value": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                }
            },
            "required": [
--- a/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/lists-example.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/lists-example.json
@ -15,7 +15,7 @@
                    "items": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "type": "array"
                },
@ -25,7 +25,7 @@
                    "items": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "type": "array"
                },
--- a/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/recursive.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/recursive.json
@ -18,7 +18,7 @@
                    "description": "base case",
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                {
                    "$ref": "#/components/schemas/Recurse"
--- a/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/these.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/these.json
@ -5,7 +5,7 @@
                "int": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "text": {
                    "type": "string"
@ -29,7 +29,7 @@
                "int": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "type": {
                    "enum": [
--- a/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/war.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/declareSchemaRef/war.json
@ -5,7 +5,7 @@
            {
                "maximum": 255,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            },
            {
                "type": "string"
--- a/autodocodec-api-usage/test_resources/openapi-schema/expression.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/expression.json
@ -33,7 +33,7 @@
                    "value": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    }
                },
                "required": [
--- a/autodocodec-api-usage/test_resources/openapi-schema/int.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/int.json
@ -4,7 +4,7 @@
            "Int": {
                "maximum": 9223372036854775807,
                "minimum": -9223372036854775808,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/int16.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/int16.json
@ -4,7 +4,7 @@
            "Int16": {
                "maximum": 32767,
                "minimum": -32768,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/int32.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/int32.json
@ -4,7 +4,7 @@
            "Int32": {
                "maximum": 2147483647,
                "minimum": -2147483648,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/int64.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/int64.json
@ -4,7 +4,7 @@
            "Int64": {
                "maximum": 9223372036854775807,
                "minimum": -9223372036854775808,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/int8.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/int8.json
@ -4,7 +4,7 @@
            "Int8": {
                "maximum": 127,
                "minimum": -128,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/integer.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/integer.json
@ -2,9 +2,7 @@
    "components": {
        "schemas": {
            "Integer": {
-                "maximum": 1.0e1024,
-                "minimum": -1.0e1024,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/lists-example.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/lists-example.json
@ -16,7 +16,7 @@
                        "items": {
                            "maximum": 9223372036854775807,
                            "minimum": -9223372036854775808,
-                            "type": "number"
+                            "type": "integer"
                        },
                        "type": "array"
                    },
@ -26,7 +26,7 @@
                        "items": {
                            "maximum": 9223372036854775807,
                            "minimum": -9223372036854775808,
-                            "type": "number"
+                            "type": "integer"
                        },
                        "type": "array"
                    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/map-text-int.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/map-text-int.json
@ -5,7 +5,7 @@
                "additionalProperties": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "type": "object"
            }
--- a/autodocodec-api-usage/test_resources/openapi-schema/natural.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/natural.json
@ -2,9 +2,8 @@
    "components": {
        "schemas": {
            "Natural": {
-                "maximum": 1.0e1024,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/recursive.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/recursive.json
@ -19,7 +19,7 @@
                        "description": "base case",
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    {
                        "$ref": "#/components/schemas/Recurse"
--- a/autodocodec-api-usage/test_resources/openapi-schema/these.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/these.json
@ -6,7 +6,7 @@
                    "int": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "text": {
                        "type": "string"
@ -30,7 +30,7 @@
                    "int": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "type": {
                        "enum": [
--- a/autodocodec-api-usage/test_resources/openapi-schema/war.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/war.json
@ -6,7 +6,7 @@
                    {
                        "maximum": 255,
                        "minimum": 0,
-                        "type": "number"
+                        "type": "integer"
                    },
                    {
                        "type": "string"
--- a/autodocodec-api-usage/test_resources/openapi-schema/word.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/word.json
@ -4,7 +4,7 @@
            "Word": {
                "maximum": 1.8446744073709551615e19,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/word16.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/word16.json
@ -4,7 +4,7 @@
            "Word16": {
                "maximum": 65535,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/word32.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/word32.json
@ -4,7 +4,7 @@
            "Word32": {
                "maximum": 4294967295,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/word64.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/word64.json
@ -4,7 +4,7 @@
            "Word64": {
                "maximum": 1.8446744073709551615e19,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/openapi-schema/word8.json
+++ b/autodocodec-api-usage/test_resources/openapi-schema/word8.json
@ -4,7 +4,7 @@
            "Word8": {
                "maximum": 255,
                "minimum": 0,
-                "type": "number"
+                "type": "integer"
            }
        }
    },
--- a/autodocodec-api-usage/test_resources/show-codec/either-either-bool-scientific-text.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/either-either-bool-scientific-text.txt
@ -12,6 +12,10 @@ EitherCodec
           (ObjectOfCodec
              Nothing
              (RequiredKeyCodec
-                 "Right" Nothing (NumberCodec Nothing Nothing))))))
+                 "Right"
+                 Nothing
+                 (NumberCodec
+                    Nothing
+                    Bounds { boundsLower = Nothing , boundsUpper = Nothing }))))))
  (ObjectOfCodec
     Nothing (RequiredKeyCodec "Right" Nothing (StringCodec Nothing)))
--- a/autodocodec-api-usage/test_resources/show-codec/expression.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/expression.txt
@ -43,12 +43,11 @@ ReferenceCodec
                 (BimapCodec
                    _
                    _
-                    (NumberCodec
+                    (IntegerCodec
                       Nothing
-                       (Just
-                          NumberBounds
-                            { numberBoundsLower = -9.223372036854775808e18
-                            , numberBoundsUpper = 9.223372036854775807e18
-                            }))))
+                       Bounds
+                         { boundsLower = Just (-9223372036854775808)
+                         , boundsUpper = Just 9223372036854775807
+                         })))
          )
        ]))
--- a/autodocodec-api-usage/test_resources/show-codec/int.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/int.txt
@ -1,10 +1,9 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -9.223372036854775808e18
-          , numberBoundsUpper = 9.223372036854775807e18
-          }))
+     Bounds
+       { boundsLower = Just (-9223372036854775808)
+       , boundsUpper = Just 9223372036854775807
+       })
--- a/autodocodec-api-usage/test_resources/show-codec/int16.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/int16.txt
@ -1,8 +1,6 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -32768.0 , numberBoundsUpper = 32767.0 }))
+     Bounds { boundsLower = Just (-32768) , boundsUpper = Just 32767 })
--- a/autodocodec-api-usage/test_resources/show-codec/int32.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/int32.txt
@ -1,10 +1,9 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -2.147483648e9
-          , numberBoundsUpper = 2.147483647e9
-          }))
+     Bounds
+       { boundsLower = Just (-2147483648)
+       , boundsUpper = Just 2147483647
+       })
--- a/autodocodec-api-usage/test_resources/show-codec/int64.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/int64.txt
@ -1,10 +1,9 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -9.223372036854775808e18
-          , numberBoundsUpper = 9.223372036854775807e18
-          }))
+     Bounds
+       { boundsLower = Just (-9223372036854775808)
+       , boundsUpper = Just 9223372036854775807
+       })
--- a/autodocodec-api-usage/test_resources/show-codec/int8.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/int8.txt
@ -1,8 +1,6 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -128.0 , numberBoundsUpper = 127.0 }))
+     Bounds { boundsLower = Just (-128) , boundsUpper = Just 127 })
--- a/autodocodec-api-usage/test_resources/show-codec/integer.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/integer.txt
@ -1,8 +1,2 @@
-BimapCodec
-  _
-  _
-  (NumberCodec
-     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = -1.0e1024 , numberBoundsUpper = 1.0e1024 }))
+IntegerCodec
+  Nothing Bounds { boundsLower = Nothing , boundsUpper = Nothing }
--- a/autodocodec-api-usage/test_resources/show-codec/lists-example.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/lists-example.txt
@ -16,13 +16,12 @@ ObjectOfCodec
                       (BimapCodec
                          _
                          _
-                          (NumberCodec
+                          (IntegerCodec
                             Nothing
-                             (Just
-                                NumberBounds
-                                  { numberBoundsLower = -9.223372036854775808e18
-                                  , numberBoundsUpper = 9.223372036854775807e18
-                                  })))))
+                             Bounds
+                               { boundsLower = Just (-9223372036854775808)
+                               , boundsUpper = Just 9223372036854775807
+                               }))))
                 _
                 (Just "possibly empty list with omitted default empty list")))
           (BimapCodec
@ -38,13 +37,12 @@ ObjectOfCodec
                       (BimapCodec
                          _
                          _
-                          (NumberCodec
+                          (IntegerCodec
                             Nothing
-                             (Just
-                                NumberBounds
-                                  { numberBoundsLower = -9.223372036854775808e18
-                                  , numberBoundsUpper = 9.223372036854775807e18
-                                  })))))
+                             Bounds
+                               { boundsLower = Just (-9223372036854775808)
+                               , boundsUpper = Just 9223372036854775807
+                               }))))
                 _
                 (Just "possibly empty list with default empty list"))))
        (BimapCodec
--- a/autodocodec-api-usage/test_resources/show-codec/map-text-int.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/map-text-int.txt
@ -2,10 +2,9 @@ MapCodec
  (BimapCodec
     _
     _
-     (NumberCodec
+     (IntegerCodec
        Nothing
-        (Just
-           NumberBounds
-             { numberBoundsLower = -9.223372036854775808e18
-             , numberBoundsUpper = 9.223372036854775807e18
-             })))
+        Bounds
+          { boundsLower = Just (-9223372036854775808)
+          , boundsUpper = Just 9223372036854775807
+          }))
--- a/autodocodec-api-usage/test_resources/show-codec/natural.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/natural.txt
@ -1,8 +1,5 @@
 BimapCodec
  _
  _
-  (NumberCodec
-     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0 , numberBoundsUpper = 1.0e1024 }))
+  (IntegerCodec
+     Nothing Bounds { boundsLower = Just 0 , boundsUpper = Nothing })
--- a/autodocodec-api-usage/test_resources/show-codec/recursive.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/recursive.txt
@ -10,13 +10,12 @@ ReferenceCodec
           (BimapCodec
              _
              _
-              (NumberCodec
+              (IntegerCodec
                 Nothing
-                 (Just
-                    NumberBounds
-                      { numberBoundsLower = -9.223372036854775808e18
-                      , numberBoundsUpper = 9.223372036854775807e18
-                      }))))
+                 Bounds
+                   { boundsLower = Just (-9223372036854775808)
+                   , boundsUpper = Just 9223372036854775807
+                   })))
        (ObjectOfCodec
           (Just "Recurse")
           (RequiredKeyCodec
--- a/autodocodec-api-usage/test_resources/show-codec/scientific.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/scientific.txt
@ -1 +1,2 @@
-NumberCodec Nothing Nothing
+NumberCodec
+  Nothing Bounds { boundsLower = Nothing , boundsUpper = Nothing }
--- a/autodocodec-api-usage/test_resources/show-codec/these.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/these.txt
@ -13,13 +13,12 @@ ObjectOfCodec
              (BimapCodec
                 _
                 _
-                 (NumberCodec
+                 (IntegerCodec
                    Nothing
-                    (Just
-                       NumberBounds
-                         { numberBoundsLower = -9.223372036854775808e18
-                         , numberBoundsUpper = 9.223372036854775807e18
-                         }))))
+                    Bounds
+                      { boundsLower = Just (-9223372036854775808)
+                      , boundsUpper = Just 9223372036854775807
+                      })))
       )
     , ( "both"
       , BimapCodec
@ -37,13 +36,12 @@ ObjectOfCodec
                    (BimapCodec
                       _
                       _
-                       (NumberCodec
+                       (IntegerCodec
                          Nothing
-                          (Just
-                             NumberBounds
-                               { numberBoundsLower = -9.223372036854775808e18
-                               , numberBoundsUpper = 9.223372036854775807e18
-                               }))))))
+                          Bounds
+                            { boundsLower = Just (-9223372036854775808)
+                            , boundsUpper = Just 9223372036854775807
+                            })))))
       )
     , ( "this"
       , BimapCodec
--- a/autodocodec-api-usage/test_resources/show-codec/war.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/war.txt
@ -6,9 +6,6 @@ BimapCodec
     (BimapCodec
        _
        _
-        (NumberCodec
-           Nothing
-           (Just
-              NumberBounds
-                { numberBoundsLower = 0.0 , numberBoundsUpper = 255.0 })))
+        (IntegerCodec
+           Nothing Bounds { boundsLower = Just 0 , boundsUpper = Just 255 }))
     (StringCodec Nothing))
--- a/autodocodec-api-usage/test_resources/show-codec/word.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/word.txt
@ -1,10 +1,7 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0
-          , numberBoundsUpper = 1.8446744073709551615e19
-          }))
+     Bounds
+       { boundsLower = Just 0 , boundsUpper = Just 18446744073709551615 })
--- a/autodocodec-api-usage/test_resources/show-codec/word16.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/word16.txt
@ -1,8 +1,5 @@
 BimapCodec
  _
  _
-  (NumberCodec
-     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0 , numberBoundsUpper = 65535.0 }))
+  (IntegerCodec
+     Nothing Bounds { boundsLower = Just 0 , boundsUpper = Just 65535 })
--- a/autodocodec-api-usage/test_resources/show-codec/word32.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/word32.txt
@ -1,8 +1,6 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0 , numberBoundsUpper = 4.294967295e9 }))
+     Bounds { boundsLower = Just 0 , boundsUpper = Just 4294967295 })
--- a/autodocodec-api-usage/test_resources/show-codec/word64.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/word64.txt
@ -1,10 +1,7 @@
 BimapCodec
  _
  _
-  (NumberCodec
+  (IntegerCodec
     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0
-          , numberBoundsUpper = 1.8446744073709551615e19
-          }))
+     Bounds
+       { boundsLower = Just 0 , boundsUpper = Just 18446744073709551615 })
--- a/autodocodec-api-usage/test_resources/show-codec/word8.txt
+++ b/autodocodec-api-usage/test_resources/show-codec/word8.txt
@ -1,8 +1,5 @@
 BimapCodec
  _
  _
-  (NumberCodec
-     Nothing
-     (Just
-        NumberBounds
-          { numberBoundsLower = 0.0 , numberBoundsUpper = 255.0 }))
+  (IntegerCodec
+     Nothing Bounds { boundsLower = Just 0 , boundsUpper = Just 255 })
--- a/autodocodec-api-usage/test_resources/swagger-schema/expression.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/expression.json
@ -14,7 +14,7 @@
                "value": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                }
            },
            "required": [
--- a/autodocodec-api-usage/test_resources/swagger-schema/int.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/int.json
@ -3,7 +3,7 @@
        "Int": {
            "maximum": 9223372036854775807,
            "minimum": -9223372036854775808,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/int16.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/int16.json
@ -3,7 +3,7 @@
        "Int16": {
            "maximum": 32767,
            "minimum": -32768,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/int32.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/int32.json
@ -3,7 +3,7 @@
        "Int32": {
            "maximum": 2147483647,
            "minimum": -2147483648,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/int64.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/int64.json
@ -3,7 +3,7 @@
        "Int64": {
            "maximum": 9223372036854775807,
            "minimum": -9223372036854775808,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/int8.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/int8.json
@ -3,7 +3,7 @@
        "Int8": {
            "maximum": 127,
            "minimum": -128,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/integer.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/integer.json
@ -1,9 +1,7 @@
 {
    "definitions": {
        "Integer": {
-            "maximum": 1.0e1024,
-            "minimum": -1.0e1024,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/lists-example.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/lists-example.json
@ -15,7 +15,7 @@
                    "items": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "type": "array"
                },
@ -24,7 +24,7 @@
                    "items": {
                        "maximum": 9223372036854775807,
                        "minimum": -9223372036854775808,
-                        "type": "number"
+                        "type": "integer"
                    },
                    "type": "array"
                },
--- a/autodocodec-api-usage/test_resources/swagger-schema/map-text-int.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/map-text-int.json
@ -4,7 +4,7 @@
            "additionalProperties": {
                "maximum": 9223372036854775807,
                "minimum": -9223372036854775808,
-                "type": "number"
+                "type": "integer"
            },
            "type": "object"
        }
--- a/autodocodec-api-usage/test_resources/swagger-schema/natural.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/natural.json
@ -1,9 +1,8 @@
 {
    "definitions": {
        "Natural": {
-            "maximum": 1.0e1024,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/these.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/these.json
@ -5,7 +5,7 @@
                "int": {
                    "maximum": 9223372036854775807,
                    "minimum": -9223372036854775808,
-                    "type": "number"
+                    "type": "integer"
                },
                "text": {
                    "type": "string"
--- a/autodocodec-api-usage/test_resources/swagger-schema/word.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/word.json
@ -3,7 +3,7 @@
        "Word": {
            "maximum": 1.8446744073709551615e19,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/word16.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/word16.json
@ -3,7 +3,7 @@
        "Word16": {
            "maximum": 65535,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/word32.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/word32.json
@ -3,7 +3,7 @@
        "Word32": {
            "maximum": 4294967295,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/word64.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/word64.json
@ -3,7 +3,7 @@
        "Word64": {
            "maximum": 1.8446744073709551615e19,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/swagger-schema/word8.json
+++ b/autodocodec-api-usage/test_resources/swagger-schema/word8.json
@ -3,7 +3,7 @@
        "Word8": {
            "maximum": 255,
            "minimum": 0,
-            "type": "number"
+            "type": "integer"
        }
    },
    "info": {
--- a/autodocodec-api-usage/test_resources/yaml-schema/expression.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/expression.txt
@ -14,7 +14,7 @@
  [37mtype[m: # [31mrequired[m
    product
 , [37mvalue[m: # [31mrequired[m
-    [33m<number>[m # [32m64 bit signed integer[m
+    [33m<integer>[m # [32m64 bit signed integer[m
  [37mtype[m: # [31mrequired[m
    literal
 ]
--- a/autodocodec-api-usage/test_resources/yaml-schema/int.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/int.txt
@ -1 +1 @@
-[33m<number>[m # [32m64 bit signed integer[m
+[33m<integer>[m # [32m64 bit signed integer[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/int16.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/int16.txt
@ -1 +1 @@
-[33m<number>[m # [32m16 bit signed integer[m
+[33m<integer>[m # [32m16 bit signed integer[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/int32.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/int32.txt
@ -1 +1 @@
-[33m<number>[m # [32m32 bit signed integer[m
+[33m<integer>[m # [32m32 bit signed integer[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/int64.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/int64.txt
@ -1 +1 @@
-[33m<number>[m # [32m64 bit signed integer[m
+[33m<integer>[m # [32m64 bit signed integer[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/int8.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/int8.txt
@ -1 +1 @@
-[33m<number>[m # [32m8 bit signed integer[m
+[33m<integer>[m # [32m8 bit signed integer[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/integer.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/integer.txt
@ -1 +1 @@
-[33m<number>[m # between [32m-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000[m and [32m10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000[m
+[33m<integer>[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/lists-example.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/lists-example.txt
@ -2,11 +2,11 @@
 [37mpossibly-empty-with-omitted-default[m: # [34moptional[m
  # default: [35m[][m
  # possibly empty list with omitted default empty list
-  - [33m<number>[m # [32m64 bit signed integer[m
+  - [33m<integer>[m # [32m64 bit signed integer[m
 [37mpossibly-empty-with-default[m: # [34moptional[m
  # default: [35m[][m
  # possibly empty list with default empty list
-  - [33m<number>[m # [32m64 bit signed integer[m
+  - [33m<integer>[m # [32m64 bit signed integer[m
 [37mrequired-non-empty[m: # [31mrequired[m
  # required non-empty list
  - [33m<string>[m
--- a/autodocodec-api-usage/test_resources/yaml-schema/map-text-int.txt
+++ b/autodocodec-api-usage/test_resources/yaml-schema/map-text-int.txt
@ -1,2 +1,2 @@
 [37m<key>[m: 
-  [33m<number>[m # [32m64 bit signed integer[m
+  [33m<integer>[m # [32m64 bit signed integer[m
--- a/Show More
+++ b/Show More