@valbuild/core 0.13.7 → 0.14.0

package/src/expr/eval.test.ts

@@ -1,8 +1,7 @@
-import { pipe, result } from "../../fp";
+import { pipe, result } from "../fp";
 import { Path } from "../selector";
-import { newSelectorProxy, selectorToVal } from "../selector/SelectorProxy";
+import { selectorToVal } from "../selector/SelectorProxy";
 import { Source } from "../source";
-import { SourcePath } from "../val";
 import { evaluate } from "./eval";
 import { parse } from "./parser";
 
@@ -186,11 +185,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/parser.test.ts

@@ -1,4 +1,4 @@
-import { result } from "../../fp";
+import { result } from "../fp";
 import { parse } from "./parser";
 
 const ParserTestCases: {

package/src/expr/repl.ts

@@ -1,7 +1,6 @@
 import * as repl from "repl";
 import { result, pipe } from "../../fp";
-import { newSelectorProxy, selectorToVal } from "../selector/SelectorProxy";
-import { SourcePath } from "../val";
+import { selectorToVal } from "../selector/SelectorProxy";
 import { evaluate } from "./eval";
 import { parse } from "./parser";
 
@@ -57,11 +56,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/index.ts

@@ -22,10 +22,11 @@ export {
   type SourcePath,
   type JsonOfSource,
 } from "./val";
-export { type Json } from "./Json";
+export type { Json, JsonPrimitive } from "./Json";
 export * as expr from "./expr/";
 export { FILE_REF_PROP } from "./source/file";
-export { VAL_EXTENSION } from "./source";
+export { VAL_EXTENSION, type SourceArray } from "./source";
+export type { I18nSource } from "./source/i18n";
 export { derefPatch } from "./patch/deref";
 export {
   type SelectorSource,

package/src/initVal.ts

@@ -3,11 +3,7 @@
 import { content } from "./module";
 import { i18n, I18n } from "./source/i18n";
 import { InitSchema, initSchema, InitSchemaLocalized } from "./initSchema";
-import { SelectorOf } from "./selector";
-import { getValPath as getPath, Val } from "./val";
-import { SelectorSource, GenericSelector } from "./selector";
-import { JsonOfSource } from "./val";
-import { fetchVal } from "./fetchVal";
+import { getValPath as getPath } from "./val";
 import { remote } from "./source/remote";
 import { file } from "./source/file";
 import { richtext } from "./source/richtext";
@@ -15,7 +11,6 @@ import { richtext } from "./source/richtext";
 type ValConstructor = {
   content: typeof content;
   getPath: typeof getPath;
-  key: typeof getPath;
   remote: typeof remote;
   file: typeof file;
   richtext: typeof richtext;
@@ -27,21 +22,10 @@ export type InitVal<Locales extends readonly string[] | undefined> = [
       val: ValConstructor & {
         i18n: I18n<Locales>;
       };
-      fetchVal<T extends SelectorSource>(
-        selector: T,
-        locale: Locales[number]
-      ): SelectorOf<T> extends GenericSelector<infer S>
-        ? Promise<Val<JsonOfSource<S>>>
-        : never;
       s: InitSchema & InitSchemaLocalized<Locales>;
     }
   : {
       val: ValConstructor;
-      fetchVal<T extends SelectorSource>(
-        selector: T
-      ): SelectorOf<T> extends GenericSelector<infer S>
-        ? Promise<Val<JsonOfSource<S>>>
-        : never;
       s: InitSchema;
     };
 
@@ -72,11 +56,9 @@ export const initVal = <
         i18n,
         remote,
         getPath,
-        key: getPath,
         file,
         richtext,
       },
-      fetchVal: fetchVal,
       s,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any;
@@ -86,11 +68,9 @@ export const initVal = <
       content,
       remote,
       getPath,
-      key: getPath,
       file,
       richtext,
     },
-    fetchVal: fetchVal,
     s: {
       ...s,
       i18n: undefined,

package/src/selector/selector.test.ts

@@ -6,7 +6,7 @@ import { SourcePath } from "../val";
 import { Source } from "../source";
 import { evaluate } from "../expr/eval";
 import * as expr from "../expr/expr";
-import { result } from "../../fp";
+import { result } from "../fp";
 import { object } from "../schema/object";
 import { newSelectorProxy, selectorToVal } from "./SelectorProxy";
 import { newExprSelectorProxy } from "./ExprProxy";
@@ -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)) {

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

@@ -1,7 +0,0 @@
-export type Token = {
-    readonly type: "!(" | "(" | ")" | "string" | "token" | "ws" | "${" | "}" | "'";
-    readonly span: [start: number, stop: number];
-    readonly value?: string;
-    readonly unescapedValue?: string;
-};
-export declare function tokenize(input: string): [tokens: Token[], endCursor: number];

package/dist/declarations/src/selector/SelectorProxy.d.ts

@@ -1,7 +0,0 @@
-import { GenericSelector } from ".";
-import { Source } from "../source";
-import { SourcePath } from "../val";
-export declare function isSelector(source: any): source is GenericSelector<Source>;
-export declare function newSelectorProxy(source: any, path?: SourcePath, moduleSchema?: any): any;
-export declare function createValPathOfItem(arrayPath: SourcePath | undefined, prop: string | number | symbol): SourcePath | undefined;
-export declare function selectorToVal(s: any): any;