sendscript 2.0.1 → 2.2.0

package/.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish Package
+name: Release and Publish
 
 on:
   push:
@@ -6,20 +6,57 @@ on:
       - '*'
 
 permissions:
+  contents: write
   id-token: write  # Required for OIDC
-  contents: read
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: ['lts/*', 'latest']
+      fail-fast: true
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: ${{ matrix.node }}
+          cache: npm
+
+      - run: npm ci
+      - run: npm test
+
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 'latest'
+          cache: npm
+
+      - run: npm ci
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+
   publish:
+    needs: test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
 
       - uses: actions/setup-node@v6
         with:
-          node-version: '24'
+          node-version: 'latest'
+          cache: npm
           registry-url: 'https://registry.npmjs.org'
+
       - run: npm ci
-      - run: npm run build --if-present
       - run: npm test
-      - run: npm publish
+      - run: npm publish

package/CHANGELOG.md

@@ -4,8 +4,23 @@ 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.2.0](https://github.com/bas080/sendscript/compare/v2.1.0...v2.2.0)
+
+- 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)
+
+#### [v2.1.0](https://github.com/bas080/sendscript/compare/v2.0.1...v2.1.0)
+
+> 9 April 2026
+
+- Make eval order when using await inline with JS [`00db8aa`](https://github.com/bas080/sendscript/commit/00db8aaa563378db814035e3e550269593ed82e2)
+- Merge release workflow into publish [`6a5db12`](https://github.com/bas080/sendscript/commit/6a5db128b659dd295390505b2e470c5913617abf)
+- Fix the cli repl [`3cf8b0d`](https://github.com/bas080/sendscript/commit/3cf8b0d9b4531989fb01a53fa9ab4cb6a011c183)
+
 #### [v2.0.1](https://github.com/bas080/sendscript/compare/v2.0.0...v2.0.1)
 
+> 8 April 2026
+
 - Publish to npm on tag push [`357ac0e`](https://github.com/bas080/sendscript/commit/357ac0ef3384f294e4f9bb179d5a675afda5fd19)
 
 ### [v2.0.0](https://github.com/bas080/sendscript/compare/v1.1.0...v2.0.0)

package/README.md

@@ -92,7 +92,7 @@ composition and even await.
 This package is nothing more than the absolute core of sendscript. It
 includes:
 
-- The `module` function to create stubs to write the programs.
+- The `references` function to create stubs to write the programs.
 - `stringify` which takes the program and returns a JSON string.
 - `parse` which takes the `stringify` JSON string and a real module and returns the result.
 
@@ -429,19 +429,19 @@ npm t -- report text-summary
 ```
 ```
 
-> sendscript@2.0.1 test
+> sendscript@2.2.0 test
 > tap -R silent
 
 
-> sendscript@2.0.1 test
+> sendscript@2.2.0 test
 > tap report text-summary
 
 
 =============================== Coverage summary ===============================
-Statements   : 100% ( 348/348 )
-Branches     : 100% ( 145/145 )
-Functions    : 100% ( 24/24 )
-Lines        : 100% ( 348/348 )
+Statements   : 100% ( 338/338 )
+Branches     : 100% ( 123/123 )
+Functions    : 100% ( 22/22 )
+Lines        : 100% ( 338/338 )
 ================================================================================
 ```
 

package/README.mz

@@ -63,7 +63,7 @@ composition and even await.
 This package is nothing more than the absolute core of sendscript. It
 includes:
 
-- The `module` function to create stubs to write the programs.
+- The `references` function to create stubs to write the programs.
 - `stringify` which takes the program and returns a JSON string.
 - `parse` which takes the `stringify` JSON string and a real module and returns the result.
 

package/cli.mjs

@@ -2,13 +2,14 @@
 
 import path from 'path'
 import { pathToFileURL } from 'url'
-import stringify from './stringify.mjs'
+import Stringify from './stringify.mjs'
 import repl from './repl.mjs'
 import Parse from './parse.mjs'
 
+const stringify = Stringify()
 const modulePath = pathToFileURL(path.resolve(process.cwd(), process.argv[2])).href
 const mod = await import(modulePath)
-const parse = Parse(mod)
+const parse = Parse(Object.keys(mod), mod)
 
 const send = program => parse(stringify(program))
 

package/error.mjs

@@ -1,2 +1,3 @@
 export class SendScriptError extends Error {}
 export class SendScriptReferenceError extends SendScriptError {}
+export class SendScriptSerializationError extends SendScriptError {}

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/357ac0ef3384f294e4f9bb179d5a675afda5fd19/example/typescript/math.ts#L1)
+Defined in: [math.ts:1](https://github.com/bas080/sendscript/blob/2cf0e7e7ced32258102382e7ff1e3f8e91a2cc77/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/357ac0ef3384f294e4f9bb179d5a675afda5fd19/example/typescript/math.ts#L2)
+Defined in: [math.ts:2](https://github.com/bas080/sendscript/blob/2cf0e7e7ced32258102382e7ff1e3f8e91a2cc77/example/typescript/math.ts#L2)
 
 ## Parameters
 

package/index.test.mjs

@@ -2,8 +2,11 @@ import { test } from 'tap'
 import Stringify from './stringify.mjs'
 import references from './references.mjs'
 import Parse from './parse.mjs'
+import { SendScriptSerializationError } from './error.mjs'
 
-const myModule = {
+const order = []
+
+const myModuleOrig = {
   nested: {
     again: {
       T: () => true
@@ -12,6 +15,16 @@ const myModule = {
   add: (a, b) => a + b,
   identity: (x) => x,
   concat: (a, b) => a.concat(b),
+  delay: (value, ms) => {
+    return new Promise(resolve => {
+      order.push(`${value} start`)
+      setTimeout(() => {
+        order.push(`${value} end`)
+
+        resolve(value)
+      }, ms)
+    })
+  },
   toArray: (...array) => array,
   always: (x) => () => x,
   multiply3: (a) => (b) => (c) => a * b * c,
@@ -33,7 +46,10 @@ const myModule = {
   Promise
 }
 
-const schema = Object.keys(myModule)
+// We want to support prototype chain when parsing.
+const myModule = Object.create(myModuleOrig)
+const schema = Object.keys(myModuleOrig)
+
 schema.push(['nested', [
   ['again', ['T']]
 ]])
@@ -51,6 +67,7 @@ test('should evaluate basic expressions correctly', async (t) => {
     aPromise,
     asyncAdd,
     resolve,
+    delay,
     delayedIdentity,
     noop,
     Promise,
@@ -67,6 +84,48 @@ test('should evaluate basic expressions correctly', async (t) => {
     nested
   } = api
 
+  t.test('await evaluation order matches JS semantics', async (t) => {
+    const lorder = []
+
+    const ldelay = (label, ms) => new RealPromise((resolve) => {
+      lorder.push(label + ' start')
+      setTimeout(() => {
+        lorder.push(label + ' end')
+        resolve(label)
+      }, ms)
+    })
+
+    const lresult = [
+      await ldelay('a', 30),
+      await ldelay('b', 10)
+    ]
+
+    t.same(lresult, ['a', 'b'])
+    t.same(lorder, [
+      'a start',
+      'a end',
+      'b start',
+      'b end'
+    ])
+
+    // TODO: Write it what ss touches
+
+    const result = await run([
+      await delay('a', 30),
+      await delay('b', 10)
+    ])
+
+    t.same(result, ['a', 'b'])
+    t.same(order, [
+      'a start',
+      'a end',
+      'b start',
+      'b end'
+    ])
+
+    t.end()
+  })
+
   t.test('mix await without await', async t => {
     const [one, two] = await run([await resolve(1), resolve(2)])
 
@@ -170,12 +229,30 @@ test('should evaluate basic expressions correctly', async (t) => {
     t.end()
   })
 
+  t.test('throws if stringify returns undefined', t => {
+    // This is to prevent accidentally sending payloads that make little sense.
+
+    // Check if it throw the expected error type.
+    try {
+      run(undefined)
+    } catch (error) {
+      t.ok(error instanceof SendScriptSerializationError)
+    }
+
+    t.throws(() => run(undefined))
+    t.throws(() => run(new Set()))
+    t.throws(() => run(identity(undefined)))
+    t.throws(() => run(() => {}))
+
+    t.end()
+  })
+
   t.test('basic types and identity', (t) => {
     t.equal(run(identity(null)), null)
-    t.equal(run(identity(undefined)), null)
     t.equal(run(noop()), undefined)
     t.equal(run(identity(1)), 1)
     t.strictSame(run(identity([])), [])
+    t.strictSame(run(identity({})), {})
     t.strictSame(run(identity([identity(1), 2, 3])), [1, 2, 3])
     t.strictSame(run(always('hello')()), 'hello')
     t.end()
@@ -216,7 +293,8 @@ test('should evaluate basic expressions correctly', async (t) => {
 
   t.test('null-prototype object traversal', (t) => {
     const { nullProto } = api
-    t.strictSame(run({ a: nullProto() }), { a: { b: 'c' } })
+    const other = myModule.nullProto()
+    t.strictSame(run({ a: nullProto() }), { a: other })
     t.end()
   })
 

package/package.json

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

package/parse.mjs

@@ -10,12 +10,10 @@ function flattenSchema (schema) {
       obj[item] = true
     } else if (Array.isArray(item)) {
       const [name, children] = item
-      // TODO: Test this
       if (!Array.isArray(children)) {
         throw new Error(`Expected children array for namespace "${name}"`)
       }
       obj[name] = flattenSchema(children)
-      // TODO: Test this also
     } else {
       throw new Error('Schema items must be strings or [name, children] arrays')
     }
@@ -26,11 +24,6 @@ function flattenSchema (schema) {
 
 const debug = Debug.extend('parse')
 
-const isThenable = (value) => (
-  value != null && typeof value.then === 'function'
-)
-
-const isAwaitPromise = Symbol('sendscript-await')
 const undefinedSentinel = Symbol('sendscript-undefined')
 
 const isPlainObject = (value) => {
@@ -39,66 +32,57 @@ const isPlainObject = (value) => {
   return proto === Object.prototype || proto === null
 }
 
-const markAwait = (promise) => {
-  promise[isAwaitPromise] = true
-  return promise
-}
-
-const isExplicitAwait = (value) => (
-  isThenable(value) && value[isAwaitPromise] === true
-)
-
 // Recursively resolve awaited values in a parsed tree
-const resolveAwaitedValues = (value) => {
+const evaluate = (value, awaits = []) => {
   if (value === undefinedSentinel) return undefined
 
-  if (isThenable(value)) {
-    return isExplicitAwait(value)
-      ? markAwait(value.then(resolveAwaitedValues))
-      : value
-  }
-
   if (Array.isArray(value)) {
-    let hasAwait = false
-    const result = value.map((item) => {
-      const resolved = resolveAwaitedValues(item)
-      if (isExplicitAwait(resolved)) hasAwait = true
-      return resolved
-    })
+    const [operator, ...rest] = value
+
+    if (operator === 'await') {
+      const [index] = rest
+      // No need to check index. It is closely tied to the program.
+      // if (typeof index !== 'number' || index < 0 || index >= awaitsResolved.length) {
+      //   throw new Error(`Invalid await index: ${index}`);
+      // }
+      return awaits[index]
+    }
 
-    if (!hasAwait) return result
+    if (operator === 'call') {
+      // Step 1: evaluate the function itself
+      let [fn, args] = rest
+      fn = evaluate(fn, awaits)
 
-    const awaited = result.map((item, index) =>
-      isExplicitAwait(item)
-        ? Promise.resolve(item).then((resolved) => {
-          result[index] = resolved
-          return resolved
-        })
-        : item
-    )
+      // Step 2: evaluate each argument AFTER fn is ready
+      for (let i = 0; i < args.length; i++) {
+        args[i] = evaluate(args[i], awaits)
+      }
+
+      // Step 3: call the function
+      return fn(...args)
+    }
 
-    return markAwait(Promise.all(awaited).then(() => result))
+    if (operator === 'quote') {
+      const [quoted] = rest
+      return quoted // return as-is without evaluating
+    }
+
+    // fallback: evaluate each element
+    // re-uses the array again.
+
+    for (let index = 0; index < value.length; index++) {
+      const item = value[index]
+      value[index] = evaluate(item, awaits)
+    }
+    return value
   }
 
   if (isPlainObject(value)) {
-    const result = {}
-    const promises = []
-
+    // We muatate the object itself. No need to make a new one.
     for (const key of Object.keys(value)) {
-      const resolved = resolveAwaitedValues(value[key])
-      if (isExplicitAwait(resolved)) {
-        promises.push(
-          Promise.resolve(resolved).then((resolvedValue) => {
-            result[key] = resolvedValue
-          })
-        )
-      } else {
-        result[key] = resolved
-      }
+      value[key] = evaluate(value[key], awaits)
     }
-
-    if (!promises.length) return result
-    return markAwait(Promise.all(promises).then(() => result))
+    return value
   }
 
   return value
@@ -117,7 +101,10 @@ export default (schemaArg, env, deserialize = defaultLeafDeserializer) => {
 
   return function parse (program) {
     debug('program', program)
+    const awaits = []
 
+    // Creates the list of awaits that will resolve in order
+    // and also deserializes the leaves.
     const reviver = spy((key, value) => {
       if (value === null) return value
 
@@ -134,36 +121,12 @@ export default (schemaArg, env, deserialize = defaultLeafDeserializer) => {
 
       if (operator === 'await') {
         const [program] = rest
-        return markAwait(Promise.resolve(program))
-      }
-
-      if (Array.isArray(operator) && operator[0] === 'quote') {
-        const [, quoted] = operator
-        return [quoted, ...rest]
-      }
-
-      if (operator === 'call') {
-        const [fn, args] = rest
-        const resolvedFn = isExplicitAwait(fn) ? Promise.resolve(fn) : fn
-        const resolvedArgs = resolveAwaitedValues(args)
-
-        if (isExplicitAwait(resolvedFn) || isExplicitAwait(resolvedArgs)) {
-          const promiseFn = isExplicitAwait(resolvedFn)
-            ? Promise.resolve(resolvedFn)
-            : resolvedFn
-          const promiseArgs = isExplicitAwait(resolvedArgs)
-            ? Promise.resolve(resolvedArgs)
-            : resolvedArgs
-
-          return Promise.all([promiseFn, promiseArgs])
-            .then(([resolvedFnValue, resolvedArgsValue]) => resolvedFnValue(...resolvedArgsValue))
-        }
 
-        return fn(...resolvedArgs)
+        return ['await', awaits.push(program) - 1]
       }
 
       if (operator === 'ref') {
-        const path = rest // e.g., ["math","add"]
+        const path = rest
         let current = env
         let schemaCurrent = schema
 
@@ -183,8 +146,23 @@ export default (schemaArg, env, deserialize = defaultLeafDeserializer) => {
     })
 
     const parsed = JSON.parse(program, reviver)
-    const result = resolveAwaitedValues(parsed)
 
-    return result
+    debug('parsed', parsed)
+
+    if (awaits.length) {
+      debug('awaits', awaits)
+
+      return (async function () {
+        for (let index = 0; index < awaits.length; index++) {
+          awaits[index] = await evaluate(awaits[index], awaits)
+        }
+
+        debug('awaits(awaited)', awaits)
+
+        return evaluate(parsed, awaits)
+      })()
+    }
+
+    return evaluate(parsed)
   }
 }

package/repl.mjs

@@ -1,8 +1,8 @@
-import instrument from './module.mjs'
+import references from './references.mjs'
 import repl from 'node:repl'
 
 export default async function sendscriptRepl (send, module) {
-  Object.assign(global, instrument(module))
+  Object.assign(global, references(Object.keys(module)))
 
   async function cb (cmd, context, filename, callback) {
     callback(null, await send(eval(cmd))) // eslint-disable-line no-eval

package/stringify.mjs

@@ -1,4 +1,5 @@
 import Debug from './debug.mjs'
+import { SendScriptSerializationError } from './error.mjs'
 import {
   awaitSymbol,
   call,
@@ -69,7 +70,17 @@ function transformValue (value, leafSerializer) {
   return ['leaf', leafSerializer(value)]
 }
 
-export default function stringify (leafSerializer = JSON.stringify) {
+function strictStringify (x) {
+  const typeOf = typeof x
+
+  if (typeOf === 'object' || typeOf === 'function' || x === undefined) {
+    throw new SendScriptSerializationError(`Cannot and should not attempt to serialize ${x}`)
+  }
+
+  return JSON.stringify(x)
+}
+
+export default function stringify (leafSerializer = strictStringify) {
   function stringify (program) {
     return JSON.stringify(transformValue(program, leafSerializer))
   }

package/.github/workflows/release.yml

@@ -1,45 +0,0 @@
-name: Release on tag
-
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: write
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: ['lts/*', 'latest']
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: npm
-
-      - run: npm ci
-      - run: npm test
-
-  release:
-    needs: test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'latest'
-          cache: npm
-
-      - run: npm ci
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: true