sendscript 1.0.6 → 2.0.1

package/references.mjs

@@ -0,0 +1,59 @@
+import { awaitSymbol, call, ref } from './symbol.mjs'
+
+function instrument (path) {
+  function reference (...args) {
+    const called = instrument(path)
+
+    called.toJSON = () => ({
+      [call]: call,
+      call: true,
+      ref: reference,
+      args
+    })
+
+    return called
+  }
+
+  reference.then = (resolve) => {
+    const awaited = instrument(path)
+    delete awaited.then
+
+    awaited.toJSON = () => ({
+      [awaitSymbol]: awaitSymbol,
+      await: true,
+      ref: reference
+    })
+
+    return resolve(awaited)
+  }
+
+  reference.toJSON = () => ({
+    [ref]: ref,
+    reference: true,
+    path
+  })
+
+  return reference
+}
+
+export default function module (schema, parentPath = []) {
+  return schema.reduce((acc, item) => {
+    if (typeof item === 'string') {
+      // leaf function
+      acc[item] = instrument([...parentPath, item])
+    } else if (Array.isArray(item)) {
+      const [name, children] = item
+
+      if (Array.isArray(children)) {
+        // recurse: children can be strings or [name, children] arrays
+        acc[name] = module(children, [...parentPath, name])
+      } else {
+        throw new Error(`Expected children array for namespace "${name}"`)
+      }
+    } else {
+      throw new Error('Schema items must be strings or [name, children] arrays')
+    }
+
+    return acc
+  }, {})
+}

package/references.test.mjs

@@ -0,0 +1,8 @@
+import { test } from 'tap'
+import references from './references.mjs'
+
+test('invalid uses of references', t => {
+  t.throws(() => references([['a']]))
+  t.throws(() => references([{}]))
+  t.end()
+})

package/stringify.mjs

@@ -1,5 +1,4 @@
 import Debug from './debug.mjs'
-import isNil from './is-nil.mjs'
 import {
   awaitSymbol,
   call,
@@ -8,59 +7,72 @@ import {
 
 const debug = Debug.extend('stringify')
 
-const replaced = Symbol('replaced')
-const keywords = ['ref', 'call', 'quote', 'await']
+const keywords = ['ref', 'call', 'quote', 'await', 'leaf']
 const isKeyword = (v) => keywords.includes(v)
-let awaitId = -1
 
-function replacer (key, value) {
-  debug(this, key, value)
-
-  if (isNil(value)) {
-    return value
-  }
-
-  if (value[ref]) {
-    const result = ['ref', value.name]
+const isPlainObject = (value) => {
+  if (!value || typeof value !== 'object') return false
+  const proto = Object.getPrototypeOf(value)
+  return proto === Object.prototype || proto === null
+}
 
-    result[replaced] = replaced
+// Recursively transform a program tree, encoding SendScript operators and leaf values
+function transformValue (value, leafSerializer) {
+  debug(value)
 
-    return result
+  if (value === null) {
+    return null
   }
 
-  if (value[call]) {
-    const result = ['call', value.ref, value.args]
-
-    result[replaced] = replaced
-
-    return result
+  // Normalize SendScript wrapper functions (ref, call, await)
+  if (typeof value === 'function' && typeof value.toJSON === 'function') {
+    return transformValue(value.toJSON(), leafSerializer)
   }
 
-  if (value[awaitSymbol]) {
-    awaitId += 1
-    const result = ['await', value.ref, awaitId]
+  // Encode SendScript operators
+  if (value && value[ref]) {
+    return ['ref', ...value.path]
+  }
 
-    result[replaced] = replaced
+  if (value && value[call]) {
+    return ['call', transformValue(value.ref, leafSerializer), transformValue(value.args, leafSerializer)]
+  }
 
-    return result
+  if (value && value[awaitSymbol]) {
+    return ['await', transformValue(value.ref, leafSerializer)]
   }
 
-  // Quote only the reserved string and not the complete array. Quoted values
-  // will be unquoted on parse. A quoted quote also.
-  if (!value[replaced] && Array.isArray(value)) {
+  // Handle arrays: quote keyword operators, transform other arrays recursively
+  if (Array.isArray(value)) {
     const [operator, ...rest] = value
 
     if (isKeyword(operator)) {
-      const quoted = ['quote', operator]
-      quoted[replaced] = replaced
+      // Quote reserved keyword strings to preserve them as data
+      return [['quote', operator], ...rest.map((item) => transformValue(item, leafSerializer))]
+    }
+
+    return value.map((item) => transformValue(item, leafSerializer))
+  }
+
+  // Recurse into plain objects
+  if (isPlainObject(value)) {
+    const result = {}
 
-      return [quoted, ...rest]
+    for (const key of Object.keys(value)) {
+      result[key] = transformValue(value[key], leafSerializer)
     }
+
+    return result
   }
 
-  return value
+  // Encode non-JSON leaf values (Date, RegExp, BigInt, etc.)
+  return ['leaf', leafSerializer(value)]
 }
 
-export default function stringify (program) {
-  return JSON.stringify(program, replacer)
+export default function stringify (leafSerializer = JSON.stringify) {
+  function stringify (program) {
+    return JSON.stringify(transformValue(program, leafSerializer))
+  }
+
+  return stringify
 }

package/index.mjs

@@ -1,11 +0,0 @@
-import stringify from './stringify.mjs'
-import makeModule from './module.mjs'
-import parse from './parse.mjs'
-
-export default function sendscript (module) {
-  return {
-    stringify,
-    parse: parse(module),
-    module: makeModule(module)
-  }
-}

package/module.mjs

@@ -1,52 +0,0 @@
-import {
-  awaitSymbol,
-  call,
-  ref
-} from './symbol.mjs'
-
-function instrument (name) {
-  function reference (...args) {
-    const called = instrument(name)
-
-    called.toJSON = () => ({
-      [call]: call,
-      call: true,
-      ref: reference,
-      args
-    })
-
-    return called
-  }
-
-  reference.then = (resolve) => {
-    const awaited = instrument(name)
-
-    delete awaited.then
-
-    awaited.toJSON = () => ({
-      [awaitSymbol]: awaitSymbol,
-      await: true,
-      ref: reference
-    })
-
-    return resolve(awaited)
-  }
-
-  reference.toJSON = () => ({
-    [ref]: ref,
-    reference: true,
-    name
-  })
-
-  return reference
-}
-
-export default function module (schema) {
-  if (!Array.isArray(schema)) return module(Object.keys(schema))
-
-  return schema.reduce((api, name) => {
-    api[name] = instrument(name)
-
-    return api
-  }, {})
-}