@valbuild/core 0.16.0 → 0.18.0

package/expr/dist/valbuild-core-expr.cjs.dev.js

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-2fff5ca8.cjs.dev.js');
-var SelectorProxy = require('../../dist/SelectorProxy-873782a5.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-486c7fbf.cjs.dev.js');
+var index = require('../../dist/index-a6e642dd.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
 
 
 
 exports.evaluate = expr_dist_valbuildCoreExpr.evaluate;
 exports.parse = expr_dist_valbuildCoreExpr.parse;
-exports.Call = SelectorProxy.Call;
-exports.Expr = SelectorProxy.Expr;
-exports.NilSym = SelectorProxy.NilSym;
-exports.StringLiteral = SelectorProxy.StringLiteral;
-exports.StringTemplate = SelectorProxy.StringTemplate;
-exports.Sym = SelectorProxy.Sym;
+exports.Call = index.Call;
+exports.Expr = index.Expr;
+exports.NilSym = index.NilSym;
+exports.StringLiteral = index.StringLiteral;
+exports.StringTemplate = index.StringTemplate;
+exports.Sym = index.Sym;

package/expr/dist/valbuild-core-expr.cjs.prod.js

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-cac9ecbd.cjs.prod.js');
-var SelectorProxy = require('../../dist/SelectorProxy-2af1b2b8.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-601a7d73.cjs.prod.js');
+var index = require('../../dist/index-8706c87e.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 
 
 
 exports.evaluate = expr_dist_valbuildCoreExpr.evaluate;
 exports.parse = expr_dist_valbuildCoreExpr.parse;
-exports.Call = SelectorProxy.Call;
-exports.Expr = SelectorProxy.Expr;
-exports.NilSym = SelectorProxy.NilSym;
-exports.StringLiteral = SelectorProxy.StringLiteral;
-exports.StringTemplate = SelectorProxy.StringTemplate;
-exports.Sym = SelectorProxy.Sym;
+exports.Call = index.Call;
+exports.Expr = index.Expr;
+exports.NilSym = index.NilSym;
+exports.StringLiteral = index.StringLiteral;
+exports.StringTemplate = index.StringTemplate;
+exports.Sym = index.Sym;

package/expr/dist/valbuild-core-expr.esm.js

@@ -1,3 +1,3 @@
-export { e as evaluate, p as parse } from '../../dist/index-af761363.esm.js';
-export { C as Call, E as Expr, N as NilSym, u as StringLiteral, v as StringTemplate, t as Sym } from '../../dist/SelectorProxy-63c2d0e2.esm.js';
+export { e as evaluate, p as parse } from '../../dist/index-4abf3a1f.esm.js';
+export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-a9235737.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {
@@ -39,8 +39,7 @@
     ],
     "exports": true
   },
-  "dependencies": {
-    "image-size": "^1.0.2",
+  "devDependencies": {
     "ts-toolbelt": "^9.6.0"
   }
 }

package/patch/dist/valbuild-core-patch.cjs.dev.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var SelectorProxy = require('../../dist/SelectorProxy-873782a5.cjs.dev.js');
+var index = require('../../dist/index-a6e642dd.cjs.dev.js');
 var result = require('../../dist/result-48320acd.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
-var ops = require('../../dist/ops-ea4827fc.cjs.dev.js');
+var ops = require('../../dist/ops-f3015423.cjs.dev.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);
@@ -14,7 +14,7 @@ function deepEqual(a, b) {
   if (a === b) {
     return true;
   }
-  if (SelectorProxy._typeof(a) === "object" && SelectorProxy._typeof(b) === "object" && a !== null && b !== null) {
+  if (index._typeof(a) === "object" && index._typeof(b) === "object" && a !== null && b !== null) {
     if (Array.isArray(a) && Array.isArray(b)) {
       if (a.length !== b.length) return false;
       for (var i = 0; i < a.length; ++i) {
@@ -26,7 +26,7 @@ function deepEqual(a, b) {
       // If the objects have a different amount of keys, they cannot be equal
       if (aEntries.length !== Object.keys(b).length) return false;
       for (var _i = 0, _aEntries = aEntries; _i < _aEntries.length; _i++) {
-        var _aEntries$_i = SelectorProxy._slicedToArray(_aEntries[_i], 2),
+        var _aEntries$_i = index._slicedToArray(_aEntries[_i], 2),
           key = _aEntries$_i[0],
           aValue = _aEntries$_i[1];
         // b must be a JSON object, so the only way for the bValue to be
@@ -43,9 +43,9 @@ function deepEqual(a, b) {
 function deepClone(value) {
   if (Array.isArray(value)) {
     return value.map(deepClone);
-  } else if (SelectorProxy._typeof(value) === "object" && value !== null) {
+  } else if (index._typeof(value) === "object" && value !== null) {
     return Object.fromEntries(Object.entries(value).map(function (_ref) {
-      var _ref2 = SelectorProxy._slicedToArray(_ref, 2),
+      var _ref2 = index._slicedToArray(_ref, 2),
         key = _ref2[0],
         value = _ref2[1];
       return [key, deepClone(value)];
@@ -62,7 +62,7 @@ function parseAndValidateArrayIndex(value) {
 }
 function sourceToPatchPath(sourcePath) {
   var _splitModuleIdAndModu = ops.splitModuleIdAndModulePath(sourcePath),
-    _splitModuleIdAndModu2 = SelectorProxy._slicedToArray(_splitModuleIdAndModu, 2),
+    _splitModuleIdAndModu2 = index._slicedToArray(_splitModuleIdAndModu, 2),
     modulePath = _splitModuleIdAndModu2[1];
   return modulePath.split(".").map(function (p) {
     return JSON.parse(p).toString();
@@ -93,7 +93,7 @@ function replaceInNode(node, key, value) {
       node[index] = value;
       return replaced;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       var _replaced = node[key];
@@ -108,7 +108,7 @@ function replaceInNode(node, key, value) {
 function replaceAtPath(document, path, value) {
   if (isNotRoot(path)) {
     return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref) {
-      var _ref2 = SelectorProxy._slicedToArray(_ref, 2),
+      var _ref2 = index._slicedToArray(_ref, 2),
         node = _ref2[0],
         key = _ref2[1];
       return replaceInNode(node, key, value);
@@ -128,7 +128,7 @@ function getFromNode(node, key) {
         return result.ok(node[index]);
       }
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       return result.ok(node[key]);
@@ -164,13 +164,13 @@ function getAtPath(node, path) {
 }
 function removeFromNode(node, key) {
   if (Array.isArray(node)) {
-    return util.pipe(parseAndValidateArrayInboundsIndex(key, node), result.map(function (index) {
-      var _node$splice = node.splice(index, 1),
-        _node$splice2 = SelectorProxy._slicedToArray(_node$splice, 1),
+    return util.pipe(parseAndValidateArrayInboundsIndex(key, node), result.map(function (index$1) {
+      var _node$splice = node.splice(index$1, 1),
+        _node$splice2 = index._slicedToArray(_node$splice, 1),
         removed = _node$splice2[0];
       return removed;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       var removed = node[key];
@@ -182,7 +182,7 @@ function removeFromNode(node, key) {
 }
 function removeAtPath(document, path) {
   return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref3) {
-    var _ref4 = SelectorProxy._slicedToArray(_ref3, 2),
+    var _ref4 = index._slicedToArray(_ref3, 2),
       node = _ref4[0],
       key = _ref4[1];
     return removeFromNode(node, key);
@@ -194,7 +194,7 @@ function addToNode(node, key, value) {
       node.splice(index, 0, value);
       return undefined;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     var _replaced2;
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
@@ -208,7 +208,7 @@ function addToNode(node, key, value) {
 function addAtPath(document, path, value) {
   if (isNotRoot(path)) {
     return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref5) {
-      var _ref6 = SelectorProxy._slicedToArray(_ref5, 2),
+      var _ref6 = index._slicedToArray(_ref5, 2),
         node = _ref6[0],
         key = _ref6[1];
       return addToNode(node, key, value);
@@ -220,15 +220,15 @@ function addAtPath(document, path, value) {
   }
 }
 function pickDocument(_ref7) {
-  var _ref8 = SelectorProxy._slicedToArray(_ref7, 1),
+  var _ref8 = index._slicedToArray(_ref7, 1),
     document = _ref8[0];
   return document;
 }
 var JSONOps = /*#__PURE__*/function () {
   function JSONOps() {
-    SelectorProxy._classCallCheck(this, JSONOps);
+    index._classCallCheck(this, JSONOps);
   }
-  SelectorProxy._createClass(JSONOps, [{
+  index._createClass(JSONOps, [{
     key: "get",
     value: function get(document, path) {
       return getAtPath(document, path);
@@ -323,7 +323,7 @@ function prefixIssuePath(prefix, _ref) {
   var path = _ref.path,
     message = _ref.message;
   return {
-    path: [prefix].concat(SelectorProxy._toConsumableArray(path)),
+    path: [prefix].concat(index._toConsumableArray(path)),
     message: message
   };
 }
@@ -377,14 +377,14 @@ function parseOperation(operation) {
       return util.pipe(result.allT([util.pipe(parseJSONPointer(operation.from), result.filterOrElse(result.isNonEmpty, function () {
         return "Cannot move root";
       }), result.mapErr(createIssueAtPath(["from"]))), util.pipe(path, result.mapErr(createIssueAtPath(["path"])))]), result.filterOrElse(function (_ref2) {
-        var _ref3 = SelectorProxy._slicedToArray(_ref2, 2),
+        var _ref3 = index._slicedToArray(_ref2, 2),
           from = _ref3[0],
           path = _ref3[1];
         return !isProperPathPrefix(from, path);
       }, function () {
         return [createIssueAtPath(["from"])("Cannot be a proper prefix of path")];
       }), result.map(function (_ref4) {
-        var _ref5 = SelectorProxy._slicedToArray(_ref4, 2),
+        var _ref5 = index._slicedToArray(_ref4, 2),
           from = _ref5[0],
           path = _ref5[1];
         return {
@@ -395,7 +395,7 @@ function parseOperation(operation) {
       }));
     case "copy":
       return util.pipe(result.allT([util.pipe(parseJSONPointer(operation.from), result.mapErr(createIssueAtPath(["from"]))), util.pipe(path, result.mapErr(createIssueAtPath(["path"])))]), result.map(function (_ref6) {
-        var _ref7 = SelectorProxy._slicedToArray(_ref6, 2),
+        var _ref7 = index._slicedToArray(_ref6, 2),
           from = _ref7[0],
           path = _ref7[1];
         return {

package/patch/dist/valbuild-core-patch.cjs.prod.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var SelectorProxy = require('../../dist/SelectorProxy-2af1b2b8.cjs.prod.js');
+var index = require('../../dist/index-8706c87e.cjs.prod.js');
 var result = require('../../dist/result-26f67b40.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
-var ops = require('../../dist/ops-1b6e0e35.cjs.prod.js');
+var ops = require('../../dist/ops-0d09f8ee.cjs.prod.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);
@@ -14,7 +14,7 @@ function deepEqual(a, b) {
   if (a === b) {
     return true;
   }
-  if (SelectorProxy._typeof(a) === "object" && SelectorProxy._typeof(b) === "object" && a !== null && b !== null) {
+  if (index._typeof(a) === "object" && index._typeof(b) === "object" && a !== null && b !== null) {
     if (Array.isArray(a) && Array.isArray(b)) {
       if (a.length !== b.length) return false;
       for (var i = 0; i < a.length; ++i) {
@@ -26,7 +26,7 @@ function deepEqual(a, b) {
       // If the objects have a different amount of keys, they cannot be equal
       if (aEntries.length !== Object.keys(b).length) return false;
       for (var _i = 0, _aEntries = aEntries; _i < _aEntries.length; _i++) {
-        var _aEntries$_i = SelectorProxy._slicedToArray(_aEntries[_i], 2),
+        var _aEntries$_i = index._slicedToArray(_aEntries[_i], 2),
           key = _aEntries$_i[0],
           aValue = _aEntries$_i[1];
         // b must be a JSON object, so the only way for the bValue to be
@@ -43,9 +43,9 @@ function deepEqual(a, b) {
 function deepClone(value) {
   if (Array.isArray(value)) {
     return value.map(deepClone);
-  } else if (SelectorProxy._typeof(value) === "object" && value !== null) {
+  } else if (index._typeof(value) === "object" && value !== null) {
     return Object.fromEntries(Object.entries(value).map(function (_ref) {
-      var _ref2 = SelectorProxy._slicedToArray(_ref, 2),
+      var _ref2 = index._slicedToArray(_ref, 2),
         key = _ref2[0],
         value = _ref2[1];
       return [key, deepClone(value)];
@@ -62,7 +62,7 @@ function parseAndValidateArrayIndex(value) {
 }
 function sourceToPatchPath(sourcePath) {
   var _splitModuleIdAndModu = ops.splitModuleIdAndModulePath(sourcePath),
-    _splitModuleIdAndModu2 = SelectorProxy._slicedToArray(_splitModuleIdAndModu, 2),
+    _splitModuleIdAndModu2 = index._slicedToArray(_splitModuleIdAndModu, 2),
     modulePath = _splitModuleIdAndModu2[1];
   return modulePath.split(".").map(function (p) {
     return JSON.parse(p).toString();
@@ -93,7 +93,7 @@ function replaceInNode(node, key, value) {
       node[index] = value;
       return replaced;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       var _replaced = node[key];
@@ -108,7 +108,7 @@ function replaceInNode(node, key, value) {
 function replaceAtPath(document, path, value) {
   if (isNotRoot(path)) {
     return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref) {
-      var _ref2 = SelectorProxy._slicedToArray(_ref, 2),
+      var _ref2 = index._slicedToArray(_ref, 2),
         node = _ref2[0],
         key = _ref2[1];
       return replaceInNode(node, key, value);
@@ -128,7 +128,7 @@ function getFromNode(node, key) {
         return result.ok(node[index]);
       }
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       return result.ok(node[key]);
@@ -164,13 +164,13 @@ function getAtPath(node, path) {
 }
 function removeFromNode(node, key) {
   if (Array.isArray(node)) {
-    return util.pipe(parseAndValidateArrayInboundsIndex(key, node), result.map(function (index) {
-      var _node$splice = node.splice(index, 1),
-        _node$splice2 = SelectorProxy._slicedToArray(_node$splice, 1),
+    return util.pipe(parseAndValidateArrayInboundsIndex(key, node), result.map(function (index$1) {
+      var _node$splice = node.splice(index$1, 1),
+        _node$splice2 = index._slicedToArray(_node$splice, 1),
         removed = _node$splice2[0];
       return removed;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
       var removed = node[key];
@@ -182,7 +182,7 @@ function removeFromNode(node, key) {
 }
 function removeAtPath(document, path) {
   return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref3) {
-    var _ref4 = SelectorProxy._slicedToArray(_ref3, 2),
+    var _ref4 = index._slicedToArray(_ref3, 2),
       node = _ref4[0],
       key = _ref4[1];
     return removeFromNode(node, key);
@@ -194,7 +194,7 @@ function addToNode(node, key, value) {
       node.splice(index, 0, value);
       return undefined;
     }));
-  } else if (SelectorProxy._typeof(node) === "object" && node !== null) {
+  } else if (index._typeof(node) === "object" && node !== null) {
     var _replaced2;
     // Prototype pollution protection
     if (Object.prototype.hasOwnProperty.call(node, key)) {
@@ -208,7 +208,7 @@ function addToNode(node, key, value) {
 function addAtPath(document, path, value) {
   if (isNotRoot(path)) {
     return util.pipe(getPointerFromPath(document, path), result.flatMap(function (_ref5) {
-      var _ref6 = SelectorProxy._slicedToArray(_ref5, 2),
+      var _ref6 = index._slicedToArray(_ref5, 2),
         node = _ref6[0],
         key = _ref6[1];
       return addToNode(node, key, value);
@@ -220,15 +220,15 @@ function addAtPath(document, path, value) {
   }
 }
 function pickDocument(_ref7) {
-  var _ref8 = SelectorProxy._slicedToArray(_ref7, 1),
+  var _ref8 = index._slicedToArray(_ref7, 1),
     document = _ref8[0];
   return document;
 }
 var JSONOps = /*#__PURE__*/function () {
   function JSONOps() {
-    SelectorProxy._classCallCheck(this, JSONOps);
+    index._classCallCheck(this, JSONOps);
   }
-  SelectorProxy._createClass(JSONOps, [{
+  index._createClass(JSONOps, [{
     key: "get",
     value: function get(document, path) {
       return getAtPath(document, path);
@@ -323,7 +323,7 @@ function prefixIssuePath(prefix, _ref) {
   var path = _ref.path,
     message = _ref.message;
   return {
-    path: [prefix].concat(SelectorProxy._toConsumableArray(path)),
+    path: [prefix].concat(index._toConsumableArray(path)),
     message: message
   };
 }
@@ -377,14 +377,14 @@ function parseOperation(operation) {
       return util.pipe(result.allT([util.pipe(parseJSONPointer(operation.from), result.filterOrElse(result.isNonEmpty, function () {
         return "Cannot move root";
       }), result.mapErr(createIssueAtPath(["from"]))), util.pipe(path, result.mapErr(createIssueAtPath(["path"])))]), result.filterOrElse(function (_ref2) {
-        var _ref3 = SelectorProxy._slicedToArray(_ref2, 2),
+        var _ref3 = index._slicedToArray(_ref2, 2),
           from = _ref3[0],
           path = _ref3[1];
         return !isProperPathPrefix(from, path);
       }, function () {
         return [createIssueAtPath(["from"])("Cannot be a proper prefix of path")];
       }), result.map(function (_ref4) {
-        var _ref5 = SelectorProxy._slicedToArray(_ref4, 2),
+        var _ref5 = index._slicedToArray(_ref4, 2),
           from = _ref5[0],
           path = _ref5[1];
         return {
@@ -395,7 +395,7 @@ function parseOperation(operation) {
       }));
     case "copy":
       return util.pipe(result.allT([util.pipe(parseJSONPointer(operation.from), result.mapErr(createIssueAtPath(["from"]))), util.pipe(path, result.mapErr(createIssueAtPath(["path"])))]), result.map(function (_ref6) {
-        var _ref7 = SelectorProxy._slicedToArray(_ref6, 2),
+        var _ref7 = index._slicedToArray(_ref6, 2),
           from = _ref7[0],
           path = _ref7[1];
         return {

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,8 +1,8 @@
-import { f as _typeof, j as _slicedToArray, c as _createClass, b as _classCallCheck, w as _toConsumableArray } from '../../dist/SelectorProxy-63c2d0e2.esm.js';
+import { e as _typeof, f as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-a9235737.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-b96df128.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
-import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-74661336.esm.js';
-export { P as PatchError } from '../../dist/ops-74661336.esm.js';
+import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-a2a295f8.esm.js';
+export { P as PatchError } from '../../dist/ops-a2a295f8.esm.js';
 
 function isNotRoot(path) {
   return isNonEmpty(path);

package/src/ValApi.ts

@@ -0,0 +1,85 @@
+import { ApiPatchResponse, ApiTreeResponse } from ".";
+import { result } from "./fp";
+import { PatchJSON } from "./patch";
+import { ModuleId } from "./val";
+
+type FetchError = { message: string; statusCode?: number };
+
+// TODO: move this to internal, only reason this is here is that react, ui and server all depend on it
+export class ValApi {
+  constructor(public host: string) {}
+
+  getDisableUrl() {
+    return `${this.host}/disable`;
+  }
+
+  postPatches(
+    moduleId: ModuleId,
+    patches: PatchJSON,
+    commit?: string,
+    headers?: Record<string, string> | undefined
+  ) {
+    let params = "";
+    if (commit) {
+      const p = new URLSearchParams();
+      p.set("commit", commit);
+      params = `?${p.toString()}`;
+    }
+    return fetch(`${this.host}/patches/~${moduleId}${params}`, {
+      headers: headers || {
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+      body: JSON.stringify(patches),
+    }).then(parse<ApiPatchResponse>);
+  }
+
+  getSession() {
+    return fetch(`${this.host}/session`).then(
+      parse<{
+        mode: "proxy" | "local";
+        member_role: "owner" | "developer" | "editor";
+      }>
+    );
+  }
+
+  getModules({
+    patch = false,
+    includeSchema = false,
+    includeSource = false,
+    treePath = "/",
+    headers,
+  }: {
+    patch?: boolean;
+    includeSchema?: boolean;
+    includeSource?: boolean;
+    treePath?: string;
+    headers?: Record<string, string> | undefined;
+  }) {
+    const params = new URLSearchParams();
+    params.set("patch", patch.toString());
+    params.set("schema", includeSchema.toString());
+    params.set("source", includeSource.toString());
+    return fetch(`${this.host}/tree/~${treePath}?${params.toString()}`, {
+      headers,
+    }).then(parse<ApiTreeResponse>);
+  }
+}
+
+// TODO: validate
+async function parse<T>(res: Response): Promise<result.Result<T, FetchError>> {
+  try {
+    if (res.ok) {
+      return result.ok(await res.json());
+    } else {
+      return result.err({
+        statusCode: res.status,
+        message: await res.text(),
+      });
+    }
+  } catch (err) {
+    return result.err({
+      message: err instanceof Error ? err.message : "Unknown error",
+    });
+  }
+}

package/src/expr/eval.test.ts

@@ -1,6 +1,6 @@
 import { pipe, result } from "../fp";
-import { Path } from "../selector";
-import { selectorToVal } from "../selector/SelectorProxy";
+import { Path } from "../selector/future";
+import { selectorToVal } from "../selector/future/SelectorProxy";
 import { Source } from "../source";
 import { evaluate } from "./eval";
 import { parse } from "./parser";

package/src/expr/eval.ts

@@ -2,8 +2,8 @@
 import { Call, Expr, StringLiteral, StringTemplate, Sym } from "./expr";
 import { Source } from "../source";
 import { result } from "../fp";
-import { Path, SourceOrExpr } from "../selector";
-import { newSelectorProxy } from "../selector/SelectorProxy";
+import { Path, SourceOrExpr } from "../selector/future";
+import { newSelectorProxy } from "../selector/future/SelectorProxy";
 import { isSerializedVal, SourcePath } from "../val";
 import { Json } from "../Json";