Merge pull request #3 from mkantor/numbers

Add `natural_number` and `integer` types & prelude modules

Author: mkantor

src/end-to-end.test.ts

@@ -191,4 +191,25 @@ testCases(endToEnd, code => code)('end-to-end tests', [
       assert.deepEqual(typeof output.value.value, 'string')
     },
   ],
+  [`:natural_number.add(1)(1)`, either.makeRight('2')],
+  [
+    `:natural_number.add(one)(juan)`,
+    output => {
+      assert(either.isLeft(output))
+    },
+  ],
+  [`:integer.add(42)(-1)`, either.makeRight('41')],
+  [`:integer.subtract(-1)(-1)`, either.makeRight('0')],
+  [`:integer.subtract(1)(2)`, either.makeRight('1')],
+  [
+    `:object.lookup(output)({
+      add_one: :integer.add(1)
+      less_than_three: :integer.less_than(3)
+      output: :less_than_three(:add_one(1))
+    })`,
+    either.makeRight({
+      tag: 'some',
+      value: 'true',
+    }),
+  ],
 ])

src/language/compiling/semantics/expressions/lookup-expression.ts

@@ -10,7 +10,10 @@ import {
   type ExpressionContext,
   type KeywordHandler,
 } from '../../../semantics/expression-elaboration.js'
-import { stringifyKeyPathForEndUser } from '../../../semantics/key-path.js'
+import {
+  keyPathToMolecule,
+  stringifyKeyPathForEndUser,
+} from '../../../semantics/key-path.js'
 import {
   isObjectNode,
   makeObjectNode,
@@ -52,11 +55,7 @@ export const readLookupExpression = (
           } else {
             const canonicalizedQuery =
               typeof query === 'string'
-                ? makeObjectNode(
-                    Object.fromEntries(
-                      query.split('.').map((key, index) => [index, key]),
-                    ),
-                  )
+                ? makeObjectNode(keyPathToMolecule(query.split('.')))
                 : query
 
             return either.map(
@@ -212,11 +211,7 @@ const lookup = ({
                   return either.makeRight(
                     option.makeSome(
                       makeLookupExpression(
-                        makeObjectNode(
-                          Object.fromEntries(
-                            relativePath.map((key, index) => [index, key]),
-                          ),
-                        ),
+                        makeObjectNode(keyPathToMolecule(relativePath)),
                       ),
                     ),
                   )