@valbuild/core 0.13.7 → 0.13.8

package/dist/declarations/src/expr/eval.d.ts

@@ -3,6 +3,7 @@ import { Source } from "../source";
 import { result } from "../fp";
 import { Path, SourceOrExpr } from "../selector";
 import { SourcePath } from "../val";
+import { Json } from "../Json";
 export declare class EvalError {
     readonly message: string;
     readonly expr: Expr;
@@ -15,5 +16,5 @@ type LocalSelector<S extends Source> = {
     [SourceOrExpr]: S;
     [Path]: SourcePath | undefined;
 };
-export declare function evaluate(expr: Expr, source: (ref: string) => LocalSelector<Source>, stack: readonly LocalSelector<Source>[][]): result.Result<LocalSelector<Source>, EvalError>;
+export declare function evaluate(expr: Expr, source: (ref: string) => Json, stack: readonly LocalSelector<Source>[][]): result.Result<LocalSelector<Source>, EvalError>;
 export {};

package/dist/{index-b861a6d2.esm.js → index-296cb2b6.esm.js}

@@ -844,7 +844,8 @@ function evaluateSync(expr, getSource, stack) {
           throw new EvalError("cannot call 'val' as anonymous function", expr);
         }
         if (expr.children[1] instanceof StringLiteral) {
-          return getSource(expr.children[1].value);
+          var _path = expr.children[1].value;
+          return newSelectorProxy(getSource(_path), _path);
         } else {
           throw new EvalError("argument of 'val' must be a string literal", expr);
         }
@@ -911,7 +912,8 @@ function evaluateSync(expr, getSource, stack) {
         if (expr.children[0] instanceof Sym) {
           if (expr.children[0].value === "val") {
             if (expr.children[1] instanceof StringLiteral) {
-              return getSource(expr.children[1].value);
+              var _path2 = expr.children[1].value;
+              return newSelectorProxy(getSource(_path2), _path2);
             } else {
               throw new EvalError("argument of 'val' must be a string literal", expr);
             }

package/dist/{index-2f65eaa1.cjs.dev.js → index-9663f28a.cjs.dev.js}

@@ -846,7 +846,8 @@ function evaluateSync(expr, getSource, stack) {
           throw new EvalError("cannot call 'val' as anonymous function", expr);
         }
         if (expr.children[1] instanceof StringLiteral) {
-          return getSource(expr.children[1].value);
+          var _path = expr.children[1].value;
+          return newSelectorProxy(getSource(_path), _path);
         } else {
           throw new EvalError("argument of 'val' must be a string literal", expr);
         }
@@ -913,7 +914,8 @@ function evaluateSync(expr, getSource, stack) {
         if (expr.children[0] instanceof Sym) {
           if (expr.children[0].value === "val") {
             if (expr.children[1] instanceof StringLiteral) {
-              return getSource(expr.children[1].value);
+              var _path2 = expr.children[1].value;
+              return newSelectorProxy(getSource(_path2), _path2);
             } else {
               throw new EvalError("argument of 'val' must be a string literal", expr);
             }

package/dist/{index-104b3b67.cjs.prod.js → index-b2270f8f.cjs.prod.js}

@@ -846,7 +846,8 @@ function evaluateSync(expr, getSource, stack) {
           throw new EvalError("cannot call 'val' as anonymous function", expr);
         }
         if (expr.children[1] instanceof StringLiteral) {
-          return getSource(expr.children[1].value);
+          var _path = expr.children[1].value;
+          return newSelectorProxy(getSource(_path), _path);
         } else {
           throw new EvalError("argument of 'val' must be a string literal", expr);
         }
@@ -913,7 +914,8 @@ function evaluateSync(expr, getSource, stack) {
         if (expr.children[0] instanceof Sym) {
           if (expr.children[0].value === "val") {
             if (expr.children[1] instanceof StringLiteral) {
-              return getSource(expr.children[1].value);
+              var _path2 = expr.children[1].value;
+              return newSelectorProxy(getSource(_path2), _path2);
             } else {
               throw new EvalError("argument of 'val' must be a string literal", expr);
             }

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-9663f28a.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');

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-b2270f8f.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');

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-296cb2b6.esm.js';
+export { F as FILE_REF_PROP, G as GenericSelector, S as Schema, V as VAL_EXTENSION, p as expr } from './index-296cb2b6.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';

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-9663f28a.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-b2270f8f.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-296cb2b6.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.7",
+  "version": "0.13.8",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {

package/src/expr/eval.test.ts

@@ -186,11 +186,8 @@ describe("eval", () => {
       pipe(
         evaluate(
           parseRes.value,
-          (ref) => {
-            return newSelectorProxy(
-              sources[ref as keyof typeof sources],
-              ref as SourcePath
-            );
+          (path) => {
+            return sources[path as keyof typeof sources];
           },
           []
         ),

package/src/expr/eval.ts

@@ -5,6 +5,7 @@ import { result } from "../fp";
 import { Path, SourceOrExpr } from "../selector";
 import { newSelectorProxy } from "../selector/SelectorProxy";
 import { isSerializedVal, SourcePath } from "../val";
+import { Json } from "../Json";
 
 export class EvalError {
   constructor(public readonly message: string, public readonly expr: Expr) {}
@@ -26,7 +27,7 @@ type LocalSelector<S extends Source> = {
 const MAX_STACK_SIZE = 100; // an arbitrary semi-large number
 function evaluateSync(
   expr: Expr,
-  getSource: (ref: string) => LocalSelector<Source>,
+  getSource: (path: string) => Json,
   stack: readonly LocalSelector<Source>[][]
 ): LocalSelector<Source> {
   // TODO: amount of evaluates should be limited?
@@ -48,7 +49,8 @@ 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 as SourcePath;
+          return newSelectorProxy(getSource(path), path);
         } else {
           throw new EvalError(
             "argument of 'val' must be a string literal",
@@ -148,7 +150,8 @@ 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 as SourcePath;
+              return newSelectorProxy(getSource(path), path);
             } else {
               throw new EvalError(
                 "argument of 'val' must be a string literal",
@@ -234,7 +237,7 @@ function evaluateSync(
 
 export function evaluate(
   expr: Expr,
-  source: (ref: string) => LocalSelector<Source>,
+  source: (ref: string) => Json,
   stack: readonly LocalSelector<Source>[][]
 ): result.Result<LocalSelector<Source>, EvalError> {
   try {

package/src/expr/repl.ts

@@ -57,11 +57,7 @@ repl
         pipe(
           evaluate(
             res.value,
-            (ref) =>
-              newSelectorProxy(
-                sources[ref as keyof typeof sources],
-                ref as SourcePath
-              ),
+            (path) => sources[path as keyof typeof sources],
 
             []
           ),

package/src/selector/selector.test.ts

@@ -289,11 +289,7 @@ describe("selector", () => {
         const res = evaluate(
           // @ts-expect-error TODO: fix this
           input()[SourceOrExpr],
-          (ref) =>
-            newSelectorProxy(
-              modules[ref as keyof typeof modules],
-              ref as SourcePath
-            ),
+          (path) => modules[path as keyof typeof modules],
           []
         );
         if (result.isErr(res)) {