@valbuild/core 0.13.5 → 0.13.6

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-2f65eaa1.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-43176a0e.cjs.dev.js');
 var createClass = require('./createClass-a436dbfe.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
 var ops = require('./ops-87cdbafc.cjs.dev.js');
@@ -729,7 +729,7 @@ function serializedValOfSelectorSource(selector) {
       return {
         val: array.map(function (item, i) {
           return rec(expr_dist_valbuildCoreExpr.isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? item : expr_dist_valbuildCoreExpr.newSelectorProxy(item, expr_dist_valbuildCoreExpr.createValPathOfItem(valPath, i)));
+          ? item : expr_dist_valbuildCoreExpr.newSelectorProxy(item, expr_dist_valbuildCoreExpr.createValPathOfItem(valPath !== null && valPath !== void 0 ? valPath : undefined, i)));
         }),
         valPath: valPath
       };
@@ -813,10 +813,10 @@ function newValProxy(val) {
               return target.length;
             }
             if (hasOwn(source, prop)) {
-              var _Reflect$get$valPath, _Reflect$get;
+              var _Reflect$get$valPath, _Reflect$get, _val$valPath;
               return newValProxy({
                 val: Reflect.get(target, prop).val,
-                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : expr_dist_valbuildCoreExpr.createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
+                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : expr_dist_valbuildCoreExpr.createValPathOfItem((_val$valPath = val.valPath) !== null && _val$valPath !== void 0 ? _val$valPath : undefined, Array.isArray(target) ? Number(prop) : prop)
               });
             }
             return Reflect.get(target, prop);
@@ -1024,6 +1024,7 @@ var Internal = {
   getRawSource: getRawSource,
   resolvePath: resolvePath,
   splitModuleIdAndModulePath: splitModuleIdAndModulePath,
+  serializedValOfSelectorSource: serializedValOfSelectorSource,
   fetchVal: fetchVal,
   isVal: expr_dist_valbuildCoreExpr.isVal
 };

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('./index-104b3b67.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('./index-e496913b.cjs.prod.js');
 var createClass = require('./createClass-de7426aa.cjs.prod.js');
 var result = require('./result-26f67b40.cjs.prod.js');
 var ops = require('./ops-ae4d1bc2.cjs.prod.js');
@@ -729,7 +729,7 @@ function serializedValOfSelectorSource(selector) {
       return {
         val: array.map(function (item, i) {
           return rec(expr_dist_valbuildCoreExpr.isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? item : expr_dist_valbuildCoreExpr.newSelectorProxy(item, expr_dist_valbuildCoreExpr.createValPathOfItem(valPath, i)));
+          ? item : expr_dist_valbuildCoreExpr.newSelectorProxy(item, expr_dist_valbuildCoreExpr.createValPathOfItem(valPath !== null && valPath !== void 0 ? valPath : undefined, i)));
         }),
         valPath: valPath
       };
@@ -813,10 +813,10 @@ function newValProxy(val) {
               return target.length;
             }
             if (hasOwn(source, prop)) {
-              var _Reflect$get$valPath, _Reflect$get;
+              var _Reflect$get$valPath, _Reflect$get, _val$valPath;
               return newValProxy({
                 val: Reflect.get(target, prop).val,
-                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : expr_dist_valbuildCoreExpr.createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
+                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : expr_dist_valbuildCoreExpr.createValPathOfItem((_val$valPath = val.valPath) !== null && _val$valPath !== void 0 ? _val$valPath : undefined, Array.isArray(target) ? Number(prop) : prop)
               });
             }
             return Reflect.get(target, prop);
@@ -1024,6 +1024,7 @@ var Internal = {
   getRawSource: getRawSource,
   resolvePath: resolvePath,
   splitModuleIdAndModulePath: splitModuleIdAndModulePath,
+  serializedValOfSelectorSource: serializedValOfSelectorSource,
   fetchVal: fetchVal,
   isVal: expr_dist_valbuildCoreExpr.isVal
 };

package/dist/valbuild-core.esm.js

@@ -1,5 +1,5 @@
-import { _ as _inherits, a as _createSuper, S as Schema, g as getValPath, n as newSelectorProxy, b as SourceOrExpr, E as Expr, I as ImageSchema, c as _objectSpread2, d as _defineProperty, V as VAL_EXTENSION, i as image, P as Path, e as createValPathOfItem, f as isSelector, h as isSerializedVal, j as file, k as isFile, F as FILE_REF_PROP, l as convertImageSource, m as getSchema, o as isVal } from './index-b861a6d2.esm.js';
-export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, p as expr } from './index-b861a6d2.esm.js';
+import { _ as _inherits, a as _createSuper, S as Schema, g as getValPath, n as newSelectorProxy, b as SourceOrExpr, E as Expr, I as ImageSchema, c as _objectSpread2, d as _defineProperty, V as VAL_EXTENSION, i as image, P as Path, e as createValPathOfItem, f as isSelector, h as isSerializedVal, j as file, k as isFile, F as FILE_REF_PROP, l as convertImageSource, m as getSchema, o as isVal } from './index-bc255f5a.esm.js';
+export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, p as expr } from './index-bc255f5a.esm.js';
 import { _ as _classCallCheck, a as _createClass, b as _typeof, c as _slicedToArray, d as _toConsumableArray } from './createClass-012eebbf.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok } from './result-b96df128.esm.js';
 import { P as PatchError } from './ops-6fae92a1.esm.js';
@@ -726,7 +726,7 @@ function serializedValOfSelectorSource(selector) {
       return {
         val: array.map(function (item, i) {
           return rec(isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
-          ? item : newSelectorProxy(item, createValPathOfItem(valPath, i)));
+          ? item : newSelectorProxy(item, createValPathOfItem(valPath !== null && valPath !== void 0 ? valPath : undefined, i)));
         }),
         valPath: valPath
       };
@@ -810,10 +810,10 @@ function newValProxy(val) {
               return target.length;
             }
             if (hasOwn(source, prop)) {
-              var _Reflect$get$valPath, _Reflect$get;
+              var _Reflect$get$valPath, _Reflect$get, _val$valPath;
               return newValProxy({
                 val: Reflect.get(target, prop).val,
-                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : createValPathOfItem(val.valPath, Array.isArray(target) ? Number(prop) : prop)
+                valPath: (_Reflect$get$valPath = (_Reflect$get = Reflect.get(target, prop)) === null || _Reflect$get === void 0 ? void 0 : _Reflect$get.valPath) !== null && _Reflect$get$valPath !== void 0 ? _Reflect$get$valPath : createValPathOfItem((_val$valPath = val.valPath) !== null && _val$valPath !== void 0 ? _val$valPath : undefined, Array.isArray(target) ? Number(prop) : prop)
               });
             }
             return Reflect.get(target, prop);
@@ -1021,6 +1021,7 @@ var Internal = {
   getRawSource: getRawSource,
   resolvePath: resolvePath,
   splitModuleIdAndModulePath: splitModuleIdAndModulePath,
+  serializedValOfSelectorSource: serializedValOfSelectorSource,
   fetchVal: fetchVal,
   isVal: isVal
 };

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-2f65eaa1.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-43176a0e.cjs.dev.js');
 require('../../dist/createClass-a436dbfe.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
 

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-104b3b67.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-e496913b.cjs.prod.js');
 require('../../dist/createClass-de7426aa.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 

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

@@ -1,3 +1,3 @@
-export { C as Call, E as Expr, N as NilSym, r as StringLiteral, s as StringTemplate, t as Sym, u as evaluate, q as parse } from '../../dist/index-b861a6d2.esm.js';
+export { C as Call, E as Expr, N as NilSym, r as StringLiteral, s as StringTemplate, t as Sym, u as evaluate, q as parse } from '../../dist/index-bc255f5a.esm.js';
 import '../../dist/createClass-012eebbf.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {

package/src/expr/eval.test.ts

@@ -176,7 +176,7 @@ describe("eval", () => {
     EvalTestCases.filter(({ focus }) =>
       EvalTestCases.some((v) => v.focus) ? focus : true
     )
-  )('evaluate: "$expr"', ({ expr, expected }) => {
+  )('evaluate: "$expr"', async ({ expr, expected }) => {
     const parseRes = parse(expr);
     if (result.isErr(parseRes)) {
       return expect(parseRes).toHaveProperty("value");
@@ -184,13 +184,10 @@ describe("eval", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expect(
       pipe(
-        evaluate(
+        await evaluate(
           parseRes.value,
           (ref) => {
-            return newSelectorProxy(
-              sources[ref as keyof typeof sources],
-              ref as SourcePath
-            );
+            return Promise.resolve(sources[ref as keyof typeof sources]);
           },
           []
         ),

package/src/expr/eval.ts

@@ -4,7 +4,8 @@ import { Source } from "../source";
 import { result } from "../fp";
 import { Path, SourceOrExpr } from "../selector";
 import { newSelectorProxy } from "../selector/SelectorProxy";
-import { isSerializedVal, SourcePath } from "../val";
+import { isSerializedVal, ModulePath, SourcePath } from "../val";
+import { Json } from "../Json";
 
 export class EvalError {
   constructor(public readonly message: string, public readonly expr: Expr) {}
@@ -24,11 +25,11 @@ type LocalSelector<S extends Source> = {
 };
 
 const MAX_STACK_SIZE = 100; // an arbitrary semi-large number
-function evaluateSync(
+async function evaluateAsync(
   expr: Expr,
-  getSource: (ref: string) => LocalSelector<Source>,
+  getSource: (modulePath: ModulePath) => Promise<Json>,
   stack: readonly LocalSelector<Source>[][]
-): LocalSelector<Source> {
+): Promise<LocalSelector<Source>> {
   // TODO: amount of evaluates should be limited?
   if (stack.length > MAX_STACK_SIZE) {
     throw new EvalError(
@@ -48,7 +49,9 @@ function evaluateSync(
           throw new EvalError("cannot call 'val' as anonymous function", expr);
         }
         if (expr.children[1] instanceof StringLiteral) {
-          return getSource(expr.children[1].value);
+          const path = expr.children[1].value;
+          const source = await getSource(path as ModulePath);
+          return newSelectorProxy(source, path as SourcePath);
         } else {
           throw new EvalError(
             "argument of 'val' must be a string literal",
@@ -62,7 +65,7 @@ function evaluateSync(
             expr
           );
         }
-        const value = evaluateSync(expr.children[1], getSource, stack);
+        const value = await evaluateAsync(expr.children[1], getSource, stack);
 
         const valObj = value[SourceOrExpr];
         const valPath = value[Path];
@@ -75,7 +78,10 @@ function evaluateSync(
         try {
           const serialized = JSON.parse(valObj);
           if (isSerializedVal(serialized)) {
-            return newSelectorProxy(serialized.val, serialized.valPath);
+            return newSelectorProxy(
+              serialized.val,
+              serialized.valPath ?? undefined
+            );
           }
           const parsedValue = newSelectorProxy(JSON.parse(valObj), valPath);
           return parsedValue;
@@ -98,16 +104,18 @@ function evaluateSync(
             expr
           );
         }
-        const res = evaluateSync(expr.children[1], getSource, stack);
+        const res = await evaluateAsync(expr.children[1], getSource, stack);
         return newSelectorProxy(JSON.stringify(res[SourceOrExpr]));
       }
     }
-    const prop = evaluateSync(expr.children[0], getSource, stack)[SourceOrExpr];
+    const prop = (await evaluateAsync(expr.children[0], getSource, stack))[
+      SourceOrExpr
+    ];
     if (expr.children.length === 1) {
       // TODO: return if literal only?
       return newSelectorProxy(prop);
     }
-    const obj = evaluateSync(expr.children[1], getSource, stack);
+    const obj = await evaluateAsync(expr.children[1], getSource, stack);
     if (typeof prop !== "string" && typeof prop !== "number") {
       throw new EvalError(
         `cannot access ${JSON.stringify(obj)} with property ${JSON.stringify(
@@ -131,7 +139,7 @@ function evaluateSync(
         }
         if (expr.children[0] instanceof Sym) {
           return maybeFunction((...args: any[]) => {
-            return evaluateSync(
+            return evaluateAsync(
               expr.children[2],
               getSource,
               stack.concat([args])
@@ -148,7 +156,9 @@ function evaluateSync(
         if (expr.children[0] instanceof Sym) {
           if (expr.children[0].value === "val") {
             if (expr.children[1] instanceof StringLiteral) {
-              return getSource(expr.children[1].value);
+              const path = expr.children[1].value;
+              const source = await getSource(path as ModulePath);
+              return newSelectorProxy(source, path as SourcePath);
             } else {
               throw new EvalError(
                 "argument of 'val' must be a string literal",
@@ -171,7 +181,7 @@ function evaluateSync(
             );
           }
           return maybeFunction(
-            ...args.map((arg) => evaluateSync(arg, getSource, stack))
+            ...args.map((arg) => evaluateAsync(arg, getSource, stack))
           );
         }
         const maybeValue = obj[prop];
@@ -205,40 +215,42 @@ function evaluateSync(
     return newSelectorProxy(expr.value);
   } else if (expr instanceof StringTemplate) {
     return newSelectorProxy(
-      expr.children
-        .map((child) => {
-          if (child instanceof Sym && child.value === "()") {
-            return "null";
-          }
-          const evalRes = evaluateSync(child, getSource, stack);
-          if (
-            child.type === "StringLiteral" ||
-            child.type === "StringTemplate"
-          ) {
-            return evalRes[SourceOrExpr];
-          }
-          if (Path in evalRes) {
-            // a selector, so serialize to Val
-            return JSON.stringify({
-              val: evalRes[SourceOrExpr],
-              valPath: evalRes[Path],
-            });
-          }
-          return JSON.stringify(evalRes[SourceOrExpr]);
-        })
-        .join("")
+      await Promise.all(
+        expr.children
+          .map(async (child) => {
+            if (child instanceof Sym && child.value === "()") {
+              return "null";
+            }
+            const evalRes = await evaluateAsync(child, getSource, stack);
+            if (
+              child.type === "StringLiteral" ||
+              child.type === "StringTemplate"
+            ) {
+              return evalRes[SourceOrExpr];
+            }
+            if (Path in evalRes) {
+              // a selector, so serialize to Val
+              return JSON.stringify({
+                val: evalRes[SourceOrExpr],
+                valPath: evalRes[Path],
+              });
+            }
+            return JSON.stringify(evalRes[SourceOrExpr]);
+          })
+          .join("")
+      )
     );
   }
   throw new EvalError(`could not evaluate`, expr);
 }
 
-export function evaluate(
+export async function evaluate(
   expr: Expr,
-  source: (ref: string) => LocalSelector<Source>,
+  source: (ref: string) => Promise<Json>,
   stack: readonly LocalSelector<Source>[][]
-): result.Result<LocalSelector<Source>, EvalError> {
+): Promise<result.Result<LocalSelector<Source>, EvalError>> {
   try {
-    return result.ok(evaluateSync(expr, source, stack));
+    return result.ok(await evaluateAsync(expr, source, stack));
   } catch (err) {
     if (err instanceof EvalError) {
       return result.err(err);

package/src/expr/repl.ts

@@ -54,32 +54,30 @@ repl
         lines += underline + "\x1b[0m\n";
         callback(null, lines);
       } else {
-        pipe(
-          evaluate(
-            res.value,
-            (ref) =>
-              newSelectorProxy(
-                sources[ref as keyof typeof sources],
-                ref as SourcePath
-              ),
+        evaluate(
+          res.value,
+          (ref) => Promise.resolve(sources[ref as keyof typeof sources]),
 
-            []
-          ),
-          result.map((v) => {
-            try {
-              console.log(selectorToVal(v).val);
-              callback(null, undefined);
-            } catch (e) {
-              callback(
-                null,
-                `\x1b[31mInvalid function! Expected selector, but got:\x1b[0m:\n${JSON.stringify(
-                  v
-                )}\n\nDetails: ${
-                  e instanceof Error ? e.message : JSON.stringify(e)
-                }`
-              );
-            }
-          })
+          []
+        ).then((res) =>
+          pipe(
+            res,
+            result.map((v) => {
+              try {
+                console.log(selectorToVal(v).val);
+                callback(null, undefined);
+              } catch (e) {
+                callback(
+                  null,
+                  `\x1b[31mInvalid function! Expected selector, but got:\x1b[0m:\n${JSON.stringify(
+                    v
+                  )}\n\nDetails: ${
+                    e instanceof Error ? e.message : JSON.stringify(e)
+                  }`
+                );
+              }
+            })
+          )
         );
       }
     },

package/src/fetchVal.ts

@@ -88,7 +88,10 @@ export function serializedValOfSelectorSource<T extends SelectorSource>(
           rec(
             isSelector(item) // NOTE: We do this since selectors currently do not create selectors of items unless specifically required.
               ? item
-              : newSelectorProxy(item, createValPathOfItem(valPath, i))
+              : newSelectorProxy(
+                  item,
+                  createValPathOfItem(valPath ?? undefined, i)
+                )
           )
         ),
         valPath,
@@ -187,7 +190,7 @@ function newValProxy<T extends Json>(val: SerializedVal): Val<T> {
                 valPath:
                   Reflect.get(target, prop)?.valPath ??
                   createValPathOfItem(
-                    val.valPath,
+                    val.valPath ?? undefined,
                     Array.isArray(target) ? Number(prop) : prop
                   ),
               } as SerializedVal);

package/src/index.ts

@@ -32,7 +32,7 @@ export {
   type SelectorOf,
   GenericSelector,
 } from "./selector";
-import { getVal } from "./fetchVal";
+import { getVal, serializedValOfSelectorSource } from "./fetchVal";
 import {
   getRawSource,
   resolvePath,
@@ -51,6 +51,7 @@ const Internal = {
   getRawSource,
   resolvePath,
   splitModuleIdAndModulePath,
+  serializedValOfSelectorSource,
   fetchVal,
   isVal,
 };

package/src/selector/SelectorProxy.ts

@@ -35,7 +35,7 @@ export function newSelectorProxy(
     if (isSelector(source)) {
       return source;
     } else if (isSerializedVal(source)) {
-      return newSelectorProxy(source.val, source.valPath);
+      return newSelectorProxy(source.val, source.valPath ?? undefined);
     }
   }
 
@@ -174,7 +174,7 @@ export function newSelectorProxy(
 function selectorAsVal(sel: any): any {
   if (isSerializedVal(sel)) {
     // is a serialized val
-    return selectorAsVal(newSelectorProxy(sel.val, sel.valPath));
+    return selectorAsVal(newSelectorProxy(sel.val, sel.valPath ?? undefined));
   } else if (
     typeof sel === "object" &&
     sel &&

package/src/selector/selector.test.ts

@@ -277,7 +277,7 @@ const RemoteAndLocaleSelectorModuleTestCases = SelectorModuleTestCases.flatMap(
 describe("selector", () => {
   test.each(RemoteAndLocaleSelectorModuleTestCases)(
     "$description",
-    ({ input, expected, remote }) => {
+    async ({ input, expected, remote }) => {
       if (input instanceof Error) {
         throw input;
       }
@@ -286,14 +286,10 @@ describe("selector", () => {
         const localeRes = input();
         expect(selectorToVal(localeRes)).toStrictEqual(expected);
       } else {
-        const res = evaluate(
+        const res = await evaluate(
           // @ts-expect-error TODO: fix this
           input()[SourceOrExpr],
-          (ref) =>
-            newSelectorProxy(
-              modules[ref as keyof typeof modules],
-              ref as SourcePath
-            ),
+          (ref) => Promise.resolve(modules[ref as keyof typeof modules]),
           []
         );
         if (result.isErr(res)) {

package/src/val/index.ts

@@ -10,7 +10,7 @@ import { FileSource } from "../source/file";
 
 export type SerializedVal = {
   val: SerializedVal | Json;
-  valPath: SourcePath | undefined;
+  valPath: SourcePath | null;
 };
 export function isSerializedVal(val: unknown): val is SerializedVal {
   return (