add: ~ key operator

Author: Leif Shackelford

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-moss",
   "description": "moss is a set of parsing rules for yaml and json",
-  "version": "0.18.11",
+  "version": "0.18.13",
   "homepage": "https://github.com/1e1f/js-moss",
   "author": {
     "name": "Leif Shackelford",

src/async.ts

@@ -106,14 +106,24 @@ export const parseFunction = async (
         errorPaths: state.errorPaths,
       };
     }
-
   }
 }
 
 export const parseObject = async (current: Moss.ReturnValue) => {
   const { state } = current;
   const source: any = clone(current.data);
   const target = state.target || current.data;
+
+  // Expand has precedence
+  for (const _key of Object.keys(source)) {
+    if (_key[0] === '~' && _key.indexOf(".") != -1) {
+      const kp = _key.slice(1);
+      setValueForKeyPath(source[_key], kp, source);
+      delete source[_key];
+      delete target[_key];
+    }
+  }
+
   for (const _key of Object.keys(source)) {
     let res;
     if (!_key) {
@@ -133,12 +143,7 @@ export const parseObject = async (current: Moss.ReturnValue) => {
         if (_key[0] === "$") {
           key = <any>(await interpolate(current, _key)).data;
         } else if (_key[0] == "\\") {
-          key = key.slice(1);
-        } else if (_key.indexOf(".") != -1) {
-          const [first, ...kp] = _key.split(".");
-          key = first;
-          val = {};
-          setValueForKeyPath(source[_key], kp.join("."), val);
+          key = _key.slice(1);
         } else {
           key = _key;
         }
@@ -155,6 +160,17 @@ export const parseObject = async (current: Moss.ReturnValue) => {
   return current;
 };
 
+export const wrapFunction = (fn: Function, transformArgs?: (args: any) => any[]) => async (current: Moss.ReturnValue, args: Moss.BranchData, setRes: any) => {
+  const { data } = await continueWithNewFrame(current, args);
+  let res;
+  if (transformArgs) {
+    res = await fn(...transformArgs(data));
+  } else {
+    res = await fn(data);
+  }
+  setRes ? await setRes(res) : current.data = res;
+}
+
 export const parseArray = async (
   layer: Moss.ReturnValue,
   input: Moss.BranchData
@@ -550,7 +566,7 @@ addFunctions({
     const layer = await continueWithNewFrame(parent, args);
     const { data } = layer;
     parent.data = sum(data, (v: any) => v);
-  },
+  }
 });
 
 async function interpolate(layer: Moss.ReturnValue, input: any) {

src/index.ts

@@ -7,4 +7,6 @@ import * as Async from "./async";
 import * as Sync from "./sync";
 export { Async, Sync };
 
+import './moreFunctions';
+
 export { Moss } from './types';

src/interpolate/async.ts

@@ -65,7 +65,7 @@ export async function tokenize(str: string, options: Expand.Options) {
             str = str.slice(0, str.length - 1);
         }
         const res = str && await fn(str, { defer, required, sourceMap });
-        if (required && !(res || check(res, Number))) {
+        if (required && res === undefined) {
             throw {
                 message: `${str} doesn't exist, and is required.\nignore (non-strict) with: ${str}?`,
                 source: str
@@ -86,7 +86,7 @@ export async function tokenize(str: string, options: Expand.Options) {
             str = str.slice(0, str.length - 1);
         }
         const res = str && fn(str, { defer, required, sourceMap });
-        if (required && !(res || check(res, Number))) {
+        if (required && res === undefined) {
             throw {
                 message: `${str} doesn't exist, and is required.\nignore (non-strict) with: ${str}?`,
                 source: str

src/interpolate/sync.ts

@@ -65,7 +65,7 @@ export function tokenize(str: string, options: Expand.Options) {
             str = str.slice(0, str.length - 1);
         }
         const res = str && fn(str, { defer, required, sourceMap });
-        if (required && !(res || check(res, Number))) {
+        if (required && res === undefined) {
             throw {
                 message: `${str} doesn't exist, and is required.\nignore (non-strict) with: ${str}?`,
                 source: str

src/sync.ts

@@ -114,6 +114,17 @@ export const parseObject = (current: Moss.ReturnValue) => {
   const { state } = current;
   const source: any = clone(current.data);
   const target = state.target || current.data;
+
+    // Expand has precedence
+  for (const _key of Object.keys(source)) {
+    if (_key[0] === '~' && _key.indexOf(".") != -1) {
+      const kp = _key.slice(1);
+      setValueForKeyPath(source[_key], kp, source);
+      delete source[_key];
+      delete target[_key];
+    }
+  }
+
   for (const _key of Object.keys(source)) {
     let res;
     if (!_key) {
@@ -133,9 +144,10 @@ export const parseObject = (current: Moss.ReturnValue) => {
         if (_key[0] === "$") {
           key = <any>(interpolate(current, _key)).data;
         } else if (_key[0] == "\\") {
-          key = key.slice(1);
-        } else if (_key.indexOf(".") != -1) {
-          const [first, ...kp] = _key.split(".");
+          key = _key.slice(1);
+        } else if (_key[0] === '~' && _key.indexOf(".") != -1) {
+          key = _key.slice(1);
+          const [first, ...kp] = key.split(".");
           key = first;
           val = {};
           setValueForKeyPath(source[_key], kp.join("."), val);
@@ -155,6 +167,19 @@ export const parseObject = (current: Moss.ReturnValue) => {
   return current;
 };
 
+
+export const wrapFunction = (fn: Function, transformArgs?: (args: any) => any[]) => async (current: Moss.ReturnValue, args: Moss.BranchData, setRes: any) => {
+  const { data } = continueWithNewFrame(current, args);
+  let res;
+  if (transformArgs) {
+    res = fn(...transformArgs(data));
+  } else {
+    res = fn(data);
+  }
+  setRes ? setRes(res) : current.data = res;
+}
+
+
 export const parseArray = (
   layer: Moss.ReturnValue,
   input: Moss.BranchData

src/types.ts

@@ -74,7 +74,7 @@ export declare namespace Moss {
 
   type ErrorReporter = (error: Error) => Error;
 
-  type Function<T> = (current: Moss.ReturnValue, args: any) => T;
+  type Function<T> = (current: Moss.ReturnValue, args: any, setter?: (...args: any[]) => void) => T;
   type Resolver<T> = {
     name?: string;
     match: (uri: string) => boolean;

src/util.ts

@@ -41,9 +41,7 @@ export const handleError = (e: Moss.Error, layer: Moss.ReturnValue, input?: Moss
     if (getErrorReporter()) {
         throw (getErrorReporter()(error));
     } else {
-        throw {
-            name: 'MossError',
-            ...error
-        }
+        console.error(error)
+        throw new Error(error.message);
     }
-}
+}