Arboricx bundle format 1.1

We don't need SHA verification or Merkle dags in our transport bundle. Content
stores can handle both bundle and term verification and hashing.

lib/arboricx.tri

@@ -26,7 +26,7 @@ readArboricxExecutableByName = (nameBytes bs :
         (validCore _ :
           bindResult (selectExport (manifestExports validCore) nameBytes)
             (selectedExport _ :
-              readArboricxTreeFromHash (exportRoot selectedExport) bs))
+              readArboricxTreeFromIndex (exportRoot selectedExport) bs))
         bundleResult))
 
 readArboricxExecutable = (bs :
@@ -104,33 +104,52 @@ wrapHostValue = (validator wrapper resultValue rest :
     (err errHostCodecFailed resultValue)
     (validator resultValue))
 
-runArboricxByNameToTree = (nameBytes bs args :
+wrapHostValueByTag = (tag value rest :
+  matchBool
+    (ok (hostTree value) rest)
+    (matchBool
+      (wrapHostValue hostString? hostString value rest)
+      (matchBool
+        (wrapHostValue hostNumber? hostNumber value rest)
+        (matchBool
+          (wrapHostValue hostBool? hostBool value rest)
+          (matchBool
+            (wrapHostValue hostList? hostList value rest)
+            (matchBool
+              (wrapHostValue hostBytes? hostBytes value rest)
+              (err errHostCodecFailed value)
+              (equal? tag hostBytesTag))
+            (equal? tag hostListTag))
+          (equal? tag hostBoolTag))
+        (equal? tag hostNumberTag))
+      (equal? tag hostStringTag))
+    (equal? tag hostTreeTag))
+
+runArboricxByNameToTyped = (tag nameBytes bs args :
   bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : ok (hostTree value) rest))
+    (value rest : wrapHostValueByTag tag value rest))
+
+runArboricxByNameToTree = (nameBytes bs args :
+  runArboricxByNameToTyped hostTreeTag nameBytes bs args)
 
 runArboricxByNameToString = (nameBytes bs args :
-  bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : wrapHostValue hostString? hostString value rest))
+  runArboricxByNameToTyped hostStringTag nameBytes bs args)
 
 runArboricxByNameToNumber = (nameBytes bs args :
-  bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : wrapHostValue hostNumber? hostNumber value rest))
+  runArboricxByNameToTyped hostNumberTag nameBytes bs args)
 
 runArboricxByNameToBool = (nameBytes bs args :
-  bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : wrapHostValue hostBool? hostBool value rest))
+  runArboricxByNameToTyped hostBoolTag nameBytes bs args)
 
 runArboricxByNameToList = (nameBytes bs args :
-  bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : wrapHostValue hostList? hostList value rest))
+  runArboricxByNameToTyped hostListTag nameBytes bs args)
 
 runArboricxByNameToBytes = (nameBytes bs args :
-  bindResult (runArboricxArgsByName nameBytes bs args)
-    (value rest : wrapHostValue hostBytes? hostBytes value rest))
+  runArboricxByNameToTyped hostBytesTag nameBytes bs args)
 
-runArboricxToTree = (bs args : runArboricxByNameToTree [] bs args)
-runArboricxToString = (bs args : runArboricxByNameToString [] bs args)
-runArboricxToNumber = (bs args : runArboricxByNameToNumber [] bs args)
-runArboricxToBool = (bs args : runArboricxByNameToBool [] bs args)
-runArboricxToList = (bs args : runArboricxByNameToList [] bs args)
-runArboricxToBytes = (bs args : runArboricxByNameToBytes [] bs args)
+runArboricxToTree = (bs args : runArboricxByNameToTyped hostTreeTag [] bs args)
+runArboricxToString = (bs args : runArboricxByNameToTyped hostStringTag [] bs args)
+runArboricxToNumber = (bs args : runArboricxByNameToTyped hostNumberTag [] bs args)
+runArboricxToBool = (bs args : runArboricxByNameToTyped hostBoolTag [] bs args)
+runArboricxToList = (bs args : runArboricxByNameToTyped hostListTag [] bs args)
+runArboricxToBytes = (bs args : runArboricxByNameToTyped hostBytesTag [] bs args)