sendscript 0.0.3 → 0.1.0

package/CHANGELOG.md

@@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.1.0](https://github.com/bas080/sendscript/compare/v0.0.4...v0.1.0)
+
+- Allow nesting arrays, calls and args [`48e5804`](https://github.com/bas080/sendscript/commit/48e5804891db0ee0ed8c274f20f81d49d6609a54)
+
+#### [v0.0.4](https://github.com/bas080/sendscript/compare/v0.0.3...v0.0.4)
+
+> 6 October 2023
+
+- Add keywords to package.json [`e24d77b`](https://github.com/bas080/sendscript/commit/e24d77b14e67399cedc085294fbef3024a060087)
+- Add .tap to gitignore [`d0abbca`](https://github.com/bas080/sendscript/commit/d0abbcaafab8b915449118b3d2926ca7ff8dc133)
+
 #### [v0.0.3](https://github.com/bas080/sendscript/compare/v0.0.2...v0.0.3)
 
+> 6 October 2023
+
 - Update tap from version 16 to 18 [`465c933`](https://github.com/bas080/sendscript/commit/465c93391097018ee010b51a64ca51d6872b49f1)
 
 #### [v0.0.2](https://github.com/bas080/sendscript/compare/v0.0.1...v0.0.2)

package/README.md

@@ -7,10 +7,6 @@ Write JS code that you can run on servers, browsers or other clients.
 [![Standard Code Style](https://img.shields.io/badge/code_style-standard-brightgreen.svg?style=flat-square)](https://standardjs.com)
 [![License](https://img.shields.io/npm/l/sendscript?color=brightgreen&style=flat-square)](./LICENSE.txt)
 
-> SendScript leaves it up to you to choose HTTP, web-sockets or any other
-> method of communication between servers and clients that best fits your
-> needs.
-
 <!-- toc -->
 
 - [Socket example](#socket-example)
@@ -28,6 +24,10 @@ Write JS code that you can run on servers, browsers or other clients.
 
 <!-- tocstop -->
 
+SendScript leaves it up to you to choose HTTP, web-sockets or any other
+method of communication between servers and clients that best fits your
+needs.
+
 ## Socket example
 
 For this example we'll use [socket.io][socket.io].
@@ -194,19 +194,19 @@ npm t -- report text-summary
 ```
 ```
 
-> sendscript@0.0.3 test
+> sendscript@0.1.0 test
 > tap -R silent
 
 
-> sendscript@0.0.3 test
+> sendscript@0.1.0 test
 > tap report text-summary
 
 
 =============================== Coverage summary ===============================
-Statements   : 100% ( 139/139 )
-Branches     : 100% ( 47/47 )
-Functions    : 100% ( 12/12 )
-Lines        : 100% ( 139/139 )
+Statements   : 100% ( 92/92 )
+Branches     : 100% ( 30/30 )
+Functions    : 100% ( 10/10 )
+Lines        : 100% ( 92/92 )
 ================================================================================
 ```
 

package/README.mz

@@ -7,12 +7,12 @@ Write JS code that you can run on servers, browsers or other clients.
 [![Standard Code Style](https://img.shields.io/badge/code_style-standard-brightgreen.svg?style=flat-square)](https://standardjs.com)
 [![License](https://img.shields.io/npm/l/sendscript?color=brightgreen&style=flat-square)](./LICENSE.txt)
 
-> SendScript leaves it up to you to choose HTTP, web-sockets or any other
-> method of communication between servers and clients that best fits your
-> needs.
-
 <!-- toc -->
 
+SendScript leaves it up to you to choose HTTP, web-sockets or any other
+method of communication between servers and clients that best fits your
+needs.
+
 ## Socket example
 
 For this example we'll use [socket.io][socket.io].

package/api.mjs

@@ -9,17 +9,17 @@ export default function api (schema, call) {
     const then = (program) => (resolve, reject) =>
       Promise.resolve(call(program)).then(resolve, reject)
 
-    const fn = (...args) => ({
-      [symbol]: symbol,
-      toJSON () {
-        return [fn, ...args]
-      },
-      async then (resolve, reject) {
-        return then(await promiseOnlyNonAPI([
-          fn, ...args
-        ]))(resolve, reject)
+    const fn = (...args) => {
+      const toJSON = () => ['call', fn, ...args]
+
+      return {
+        [symbol]: symbol,
+        toJSON,
+        async then (resolve, reject) {
+          return then(await promiseOnlyNonAPI(toJSON()))(resolve, reject)
+        }
       }
-    })
+    }
 
     fn.toJSON = () => ['ref', name]
     fn.then = then(fn)

package/exec.mjs

@@ -1,11 +1,7 @@
 import _debug from './debug.mjs'
-import { BlendExpressionError } from './error.mjs'
 import curry from './curry.mjs'
 
 const debug = _debug.extend('lisp')
-const debugError = debug.extend('error')
-const isFunction = x => typeof x === 'function'
-const castFunction = x => isFunction(x) ? x : () => x
 
 const exec = curry(async (env, expression) => {
   debug('exec', expression)
@@ -16,54 +12,20 @@ const exec = curry(async (env, expression) => {
 
   const [operator, ...args] = expression
 
-  // Yey, resolved and all and ready to call.
-  if (isFunction(operator)) {
-    try {
-      return await operator.call(env, ...(await Promise.all(args.map(exec(env)))))
-    } catch (error) {
-      debugError(error)
-      throw error
-    }
-  }
-
-  // Use JSON value when toJSON is implemented.
-  // NECESSARY? if (operator?.toJSON) { operator = operator.toJSON() }
-
-  if (operator === 'fn') {
-    const [body] = args
-
-    return (fnEnv) => exec(Object.assign(Object.create(env), fnEnv), body)
-  }
-
-  if (operator === 'let') {
-    const letEnv = Object.create(env)
-    const [letBindings, letBody] = args
+  if (operator === 'call') {
+    const [fnName, ...fnArgs] = args
 
-    await Promise.all(letBindings.map(async ([name, letExpr]) => {
-      letEnv[name] = await exec(letEnv, letExpr)
-    }))
-
-    return exec(letEnv, letBody)
+    const fn = await exec(env, fnName)
+    return fn.apply(env, await exec(env, fnArgs))
   }
 
   if (operator === 'ref') {
     const [name] = args
-    return env[name]
-  }
 
-  if (Array.isArray(operator)) {
-    return exec(env, [await exec(env, operator), ...args])
-  }
-
-  // Throw error if operator is not in env.
-  if (!(operator in env)) {
-    const error = new BlendExpressionError(`Unknown expression: ${operator}`)
-    debugError(error)
-    throw error
+    return env[name]
   }
 
-  return exec(env, [castFunction(env[operator]), ...args])
+  return await Promise.all(expression.map(exec(env)))
 })
 
-export { exec }
 export default exec

package/exec.test.mjs

@@ -1,125 +1,37 @@
 import { test } from 'tap'
-import { exec } from './exec.mjs'
+import api from './api.mjs'
+import exec from './exec.mjs'
 
-test('should evaluate basic expressions correctly', (t) => {
-  t.plan(4)
-
-  exec({ '+': (a, b) => a + b }, ['+', 1, 2])
-    .then((result) => t.equal(result, 3, '1 + 2 = 3'))
-
-  exec({ '-': (a, b) => a - b }, ['-', 5, 3])
-    .then((result) => t.equal(result, 2, '5 - 3 = 2'))
-
-  exec({ '*': (a, b) => a * b }, ['*', 4, 3])
-    .then((result) => t.equal(result, 12, '4 * 3 = 12'))
-
-  exec({ '/': (a, b) => a / b }, ['/', 10, 2])
-    .then((result) => t.equal(result, 5, '10 / 2 = 5'))
-})
-
-test('should be able to call a partially applied function', async t => {
-  const env = {
-    '+': a => b => a + b
-  }
-
-  t.equal(typeof (await exec(env, ['+', 1])), 'function')
-  t.equal(await exec(env, [['+', 1], 2]), 3)
-  t.end()
-})
-
-test('should handle let expressions', (t) => {
-  t.plan(1)
-
-  exec({ '+': (a, b) => a + b }, ['let', [['x', 2], ['y', 3]], ['+', ['x'], ['y']]])
-    .then((result) => t.equal(result, 5, 'x + y = 5'))
-})
-
-test('should handle fn expressions', (t) => {
-  t.plan(2)
-
-  exec({}, ['fn', ['+', 1, 'x']])
-    .then((result) => t.equal(typeof result, 'function', 'should return a function'))
-
-  exec({ '+': (a, b) => a + b }, ['fn', ['+', 1, ['x']]])
-    .then(async (result) => {
-      t.equal(await result({ x: 2 }), 3, '1 + 2 = 3')
-    })
-})
-
-test('should throw an error for unknown expressions', (t) => {
-  t.plan(1)
-
-  exec({ '+': (a, b) => a + b }, ['-', 1, 2])
-    .catch((err) => t.equal(err.message, 'Unknown expression: -', 'should throw an error for unknown expressions'))
-})
-
-test('should evaluate nested expressions correctly', (t) => {
-  t.plan(1)
-
-  const env = {
-    '+': (a, b) => a + b,
-    '*': (a, b) => a * b
-  }
-
-  exec(env, ['*', 2, ['+', 1, 2]])
-    .then((result) => t.equal(result, 6, '2 * (1 + 2) = 6'))
-})
-
-test('should concatenate two arrays', async t => {
-  t.plan(1)
-
-  const env = {
-    array: (...args) => args,
+test('should evaluate basic expressions correctly', async (t) => {
+  const module = {
+    add: (a, b) => a + b,
+    identity: x => x,
     concat: (a, b) => a.concat(b)
   }
-  const expression = ['concat', ['array', 1, 2, 3], ['array', 4, 5, 6]]
-  const result = await exec(env, expression)
-
-  t.same(result, [1, 2, 3, 4, 5, 6])
-})
-
-test('should fetch the reference to the item on the env', async t => {
-  const value = 'yey'
-
-  const env = {
-    thing: () => value
-  }
 
-  const expression = ['ref', 'thing']
-  const result = await exec(env, expression)
+  const evaluate = exec(module)
+  const { add, concat, identity } = api(Object.keys(module), program =>
+    evaluate(JSON.parse(JSON.stringify(program))))
 
-  t.same(result(), value)
+  t.equal(
+    await evaluate(add(1, 2)),
+    3
+  )
 
-  const result2 = await exec(env, ['thing'])
-  t.same(result2, value)
+  t.strictSame(
+    await evaluate(concat([1, 2], [[add(1, 2)]])),
+    [1, 2, [3]]
+  )
 
-  t.end()
-})
-
-test('should reject with the error of the called function', async t => {
-  const error = new Error('BOOM')
-  const env = {
-    throws () {
-      throw error
-    }
-  }
-
-  await t.rejects(exec(env, ['throws']))
-
-  t.end()
-})
-
-test('should not exec expressions in an object', async t => {
-  const env = {
-    throws () {
-      throw new Error('Should not have been called.')
-    }
-  }
+  t.strictSame(
+    await evaluate(concat([1, 2], [add(1, 2), add(2, 2)])),
+    [1, 2, 3, 4]
+  )
 
-  const result = await exec(env, { quoted: ['throws'] })
+  t.strictSame(
+    await evaluate([identity(1), 2, 3]),
+    [1, 2, 3]
+  )
 
-  t.same(result, {
-    quoted: ['throws']
-  })
   t.end()
 })

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "sendscript",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "Blur the line between server and client code.",
   "module": true,
   "main": "index.mjs",
+  "keywords": [
+    "rpc",
+    "json",
+    "dsl",
+    "lisp",
+    "program"
+  ],
   "repository": {
     "type": "git",
     "url": "git@github.com:bas080/sendscript.git"
@@ -16,7 +23,7 @@
   "author": "Bas Huis",
   "license": "MIT",
   "devDependencies": {
-    "tap": "^18.4.3"
+    "tap": "^18.5.2"
   },
   "dependencies": {
     "debug": "^4.3.4"