sendscript 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -4,8 +4,15 @@ 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).
 
+#### [v2.3.0](https://github.com/bas080/sendscript/compare/v2.2.0...v2.3.0)
+
+- Add support for then and catch [`c0bbea8`](https://github.com/bas080/sendscript/commit/c0bbea8efcc6b262c091d9043e96ac8c3f7606e1)
+- Document .catch and .then support [`b35009a`](https://github.com/bas080/sendscript/commit/b35009ace9761d32c0c6ef1d1d045bed2ecfe74e)
+
 #### [v2.2.0](https://github.com/bas080/sendscript/compare/v2.1.0...v2.2.0)
 
+> 10 April 2026
+
 - Have default leaf serializer throw if value has no JSON equivalant [`6752f2f`](https://github.com/bas080/sendscript/commit/6752f2f3ed51e252ab93a31b632fe8fbae51d7cb)
 - Test that prototype chain works when parsing [`2cf0e7e`](https://github.com/bas080/sendscript/commit/2cf0e7e7ced32258102382e7ff1e3f8e91a2cc77)
 

package/README.md

@@ -15,7 +15,9 @@ Write JS code that you can run on servers, browsers or other clients.
   * [Server](#server)
   * [Client](#client)
 - [Repl](#repl)
-- [Async/Await](#asyncawait)
+- [Promises](#promises)
+  * [.then / .catch](#then--catch)
+  * [await](#await)
 - [TypeScript](#typescript)
 - [Schema and Nested Modules](#schema-and-nested-modules)
   * [Defining a Nested Module](#defining-a-nested-module)
@@ -27,8 +29,6 @@ Write JS code that you can run on servers, browsers or other clients.
 - [Formatting](#formatting)
 - [Changelog](#changelog)
 - [Dependencies](#dependencies)
-- [License](#license)
-- [Roadmap](#roadmap)
 
 <!-- tocstop -->
 
@@ -215,7 +215,20 @@ Sendscript ships with a barebones (no-dependencies) node-repl script. One can ru
 
 > Use the `DEBUG='*'` to enable all logs or `DEBUG='sendscript:*'` for printingonly sendscript logs.
 
-## Async/Await
+## Promises
+
+### .then / .catch
+
+Supported since vs `v2.3`.
+
+```js
+const getOrCreatePost = send(createPost(title).catch(createPost(title)))
+```
+
+You will likely need to define better helpers that makes it safer to handle rejections and work with promises. It is however sensible to have
+this basic behavior for the sendscript DSL and parser.
+
+### await
 
 SendScript supports async/await seamlessly within a single request. This avoids the performance pitfalls of waterfall-style messaging, which can be especially slow on high-latency networks.
 
@@ -429,19 +442,19 @@ npm t -- report text-summary
 ```
 ```
 
-> sendscript@2.2.0 test
+> sendscript@2.3.0 test
 > tap -R silent
 
 
-> sendscript@2.2.0 test
+> sendscript@2.3.0 test
 > tap report text-summary
 
 
 =============================== Coverage summary ===============================
-Statements   : 100% ( 338/338 )
-Branches     : 100% ( 123/123 )
-Functions    : 100% ( 22/22 )
-Lines        : 100% ( 338/338 )
+Statements   : 100% ( 372/372 )
+Branches     : 100% ( 137/137 )
+Functions    : 100% ( 24/24 )
+Lines        : 100% ( 372/372 )
 ================================================================================
 ```
 
@@ -470,19 +483,6 @@ Check if packages are up to date on release.
 npm outdated && echo 'No outdated packages found'
 ```
 ```
-No outdated packages found
+Package  Current   Wanted   Latest  Location              Depended by
+typedoc  0.28.18  0.28.19  0.28.19  node_modules/typedoc  master
 ```
-
-## License
-
-See the [LICENSE.txt][license] file for details.
-
-## Roadmap
-
-- [ ] Support for simple lambdas to compose functions more easily.
-
-[license]:./LICENSE.txt
-[socket.io]:https://socket.io/
-[changelog]:./CHANGELOG.md
-[auto-changelog]:https://www.npmjs.com/package/auto-changelog
-[typedoc]:https://github.com/TypeStrong/typedoc

package/README.mz

@@ -183,7 +183,20 @@ Sendscript ships with a barebones (no-dependencies) node-repl script. One can ru
 
 > Use the `DEBUG='*'` to enable all logs or `DEBUG='sendscript:*'` for printingonly sendscript logs.
 
-## Async/Await
+## Promises
+
+### .then / .catch
+
+Supported since vs `v2.3`.
+
+```js
+const getOrCreatePost = send(createPost(title).catch(createPost(title)))
+```
+
+You will likely need to define better helpers that makes it safer to handle rejections and work with promises. It is however sensible to have
+this basic behavior for the sendscript DSL and parser.
+
+### await
 
 SendScript supports async/await seamlessly within a single request. This avoids the performance pitfalls of waterfall-style messaging, which can be especially slow on high-latency networks.
 

package/example/typescript/docs/functions/add.md

@@ -8,7 +8,7 @@
 
 > **add**(`a`, `b`): `number`
 
-Defined in: [math.ts:1](https://github.com/bas080/sendscript/blob/2cf0e7e7ced32258102382e7ff1e3f8e91a2cc77/example/typescript/math.ts#L1)
+Defined in: [math.ts:1](https://github.com/bas080/sendscript/blob/b35009ace9761d32c0c6ef1d1d045bed2ecfe74e/example/typescript/math.ts#L1)
 
 ## Parameters
 

package/example/typescript/docs/functions/square.md

@@ -8,7 +8,7 @@
 
 > **square**(`a`): `number`
 
-Defined in: [math.ts:2](https://github.com/bas080/sendscript/blob/2cf0e7e7ced32258102382e7ff1e3f8e91a2cc77/example/typescript/math.ts#L2)
+Defined in: [math.ts:2](https://github.com/bas080/sendscript/blob/b35009ace9761d32c0c6ef1d1d045bed2ecfe74e/example/typescript/math.ts#L2)
 
 ## Parameters
 

package/index.test.mjs

@@ -28,11 +28,13 @@ const myModuleOrig = {
   toArray: (...array) => array,
   always: (x) => () => x,
   multiply3: (a) => (b) => (c) => a * b * c,
+  sayHello: x => `hello ${x}`,
   map: (fn) => (array) => array.map(fn),
   filter: (pred) => (array) => array.filter(pred),
   hello: 'world',
   noop: () => {},
   resolve: (x) => Promise.resolve(x),
+  reject: x => Promise.reject(x),
   asyncFn: async () => 'my-async-function',
   instanceOf: (x, t) => x instanceof t,
   asyncAdd: async (a, b) => a + b,
@@ -67,6 +69,7 @@ test('should evaluate basic expressions correctly', async (t) => {
     aPromise,
     asyncAdd,
     resolve,
+    reject,
     delay,
     delayedIdentity,
     noop,
@@ -81,9 +84,27 @@ test('should evaluate basic expressions correctly', async (t) => {
     identity,
     always,
     multiply3,
+    sayHello,
     nested
   } = api
 
+  t.test('supports .then', async t => {
+    t.rejects(run(reject('error')))
+
+    t.equal(await run(reject('error').catch(sayHello)), 'hello error')
+    t.equal(await run(reject('error').then(null, sayHello)), 'hello error')
+
+    t.equal(await run(resolve('value').then(sayHello)), 'hello value')
+    t.equal(await run(resolve('value').then(sayHello, noop)), 'hello value')
+
+    t.end()
+  })
+
+  t.test('resolve and reject callback works for .then', async t => {
+    t.equal(await run(resolve(42).then(multiply3(1)(2))), 84)
+    t.end()
+  })
+
   t.test('await evaluation order matches JS semantics', async (t) => {
     const lorder = []
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sendscript",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Blur the line between server and client code.",
   "module": true,
   "main": "index.mjs",

package/parse.mjs

@@ -32,8 +32,14 @@ const isPlainObject = (value) => {
   return proto === Object.prototype || proto === null
 }
 
+const spy = (type, fn) => (...args) => {
+  const value = fn(...args)
+  debug(type, args, ' => ', value)
+  return value
+}
+
 // Recursively resolve awaited values in a parsed tree
-const evaluate = (value, awaits = []) => {
+const evaluate = spy('eval', (value, awaits = []) => {
   if (value === undefinedSentinel) return undefined
 
   if (Array.isArray(value)) {
@@ -48,6 +54,11 @@ const evaluate = (value, awaits = []) => {
       return awaits[index]
     }
 
+    if (operator === 'then') {
+      const [v, onResolve, onReject] = rest
+      return evaluate(v, awaits).then(evaluate(onResolve, awaits), evaluate(onReject, awaits))
+    }
+
     if (operator === 'call') {
       // Step 1: evaluate the function itself
       let [fn, args] = rest
@@ -86,13 +97,7 @@ const evaluate = (value, awaits = []) => {
   }
 
   return value
-}
-
-const spy = (fn) => (...args) => {
-  const value = fn(...args)
-  debug(args, ' => ', value)
-  return value
-}
+})
 
 const defaultLeafDeserializer = (text) => JSON.parse(text)
 
@@ -105,7 +110,7 @@ export default (schemaArg, env, deserialize = defaultLeafDeserializer) => {
 
     // Creates the list of awaits that will resolve in order
     // and also deserializes the leaves.
-    const reviver = spy((key, value) => {
+    const reviver = spy('revive', (key, value) => {
       if (value === null) return value
 
       if (!Array.isArray(value)) {

package/references.mjs

@@ -1,4 +1,4 @@
-import { awaitSymbol, call, ref } from './symbol.mjs'
+import { awaitSymbol, call, ref, then, referenceSymbol } from './symbol.mjs'
 
 function instrument (path) {
   function reference (...args) {
@@ -6,7 +6,6 @@ function instrument (path) {
 
     called.toJSON = () => ({
       [call]: call,
-      call: true,
       ref: reference,
       args
     })
@@ -14,13 +13,35 @@ function instrument (path) {
     return called
   }
 
-  reference.then = (resolve) => {
+  function dotThen (resolve, reject) {
+    const node = instrument(path)
+
+    node.toJSON = () => ({
+      [then]: then,
+      ref: reference,
+      resolve,
+      reject
+    })
+
+    return node
+  }
+
+  reference.catch = (reject) => {
+    return dotThen(null, reject)
+  }
+
+  reference.then = (resolve, reject) => {
+    // That is how we know if it is an await or a .then call.
+    if (resolve?.[referenceSymbol] || reject?.[referenceSymbol]) {
+      return dotThen(resolve, reject)
+    }
+
     const awaited = instrument(path)
+    // Prevent infinite recur
     delete awaited.then
 
     awaited.toJSON = () => ({
       [awaitSymbol]: awaitSymbol,
-      await: true,
       ref: reference
     })
 
@@ -29,10 +50,11 @@ function instrument (path) {
 
   reference.toJSON = () => ({
     [ref]: ref,
-    reference: true,
     path
   })
 
+  reference[referenceSymbol] = referenceSymbol
+
   return reference
 }
 

package/stringify.mjs

@@ -2,6 +2,7 @@ import Debug from './debug.mjs'
 import { SendScriptSerializationError } from './error.mjs'
 import {
   awaitSymbol,
+  then,
   call,
   ref
 } from './symbol.mjs'
@@ -43,6 +44,10 @@ function transformValue (value, leafSerializer) {
     return ['await', transformValue(value.ref, leafSerializer)]
   }
 
+  if (value && value[then]) {
+    return ['then', transformValue(value.ref, leafSerializer), transformValue(value.resolve || null, leafSerializer), transformValue(value.reject || null, leafSerializer)]
+  }
+
   // Handle arrays: quote keyword operators, transform other arrays recursively
   if (Array.isArray(value)) {
     const [operator, ...rest] = value

package/symbol.mjs

@@ -1,3 +1,5 @@
 export const ref = Symbol('ref')
 export const call = Symbol('call')
 export const awaitSymbol = Symbol('await')
+export const then = Symbol('then')
+export const referenceSymbol = Symbol('referenceSymbol')