@journeyapps/evaluator - npm Package Compare versions

Comparing version 0.0.0-dev.b87c3cb.f152454 to 0.0.0-dev.bdcfe9b

dist/@types/src/index.d.ts

@@ -8,7 +8,7 @@ export * from './token-expressions/ConstantTokenExpression';
 export * from './token-expressions/TokenExpression';
-export * from './FormatString';
+export * from './token-expressions/FormatString';
+export * from './types/TypeInterface';
+export * from './types/ObjectRefInterface';
+export * from './scope/FormatStringScope';
+export * from './scope/VariableFormatStringScope';
 export * from './tools';
-export * from './TypeInterface';
-export * from './ObjectRefInterface';
-export * from './FormatStringScope';
-export * from './VariableFormatStringScope';

dist/@types/src/token-expressions/ConstantTokenExpression.d.ts

@@ -5,3 +5,3 @@ /**
 import { TokenExpression } from './TokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
+import { FormatStringScope } from '../scope/FormatStringScope';
 export declare class ConstantTokenExpression extends TokenExpression {
@@ -8,0 +8,0 @@ constructor(expression: string, start?: number);

dist/@types/src/token-expressions/FormatShorthandTokenExpression.d.ts

@@ -5,10 +5,5 @@ /**
 import { ShorthandTokenExpression } from './ShorthandTokenExpression';
-import { TokenExpression } from './TokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
-export declare class FormatShorthandTokenExpression extends TokenExpression {
-    inner: ShorthandTokenExpression;
+export declare class FormatShorthandTokenExpression extends ShorthandTokenExpression {
     constructor(expression: string, format: string, start?: number);
-    isShorthand(): boolean;
     toString(): string;
-    tokenEvaluatePromise(scope: FormatStringScope): Promise<string>;
 }

dist/@types/src/token-expressions/FunctionTokenExpression.d.ts

@@ -6,3 +6,3 @@ /**
 import { ConstantTokenExpression } from './ConstantTokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
+import { FormatStringScope } from '../scope/FormatStringScope';
 export declare class FunctionTokenExpression extends TokenExpression {
@@ -14,3 +14,2 @@ /**
     constructor(expression: string, start?: number);
-    stringify(): string;
     isFunction(): boolean;
@@ -27,2 +26,3 @@ /**
     tokenEvaluatePromise(scope: FormatStringScope): Promise<string>;
+    stringify(): string;
 }

dist/@types/src/token-expressions/LegacyFunctionTokenExpression.d.ts

@@ -6,3 +6,3 @@ /**
 import { ConstantTokenExpression } from './ConstantTokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
+import { FormatStringScope } from '../scope/FormatStringScope';
 export declare class LegacyFunctionTokenExpression extends TokenExpression {
@@ -9,0 +9,0 @@ constructor(expression: string, start?: number);

dist/@types/src/token-expressions/PrimitiveConstantTokenExpression.d.ts

 /**
  *  Non-String Constant token expression
  */
-import { TokenExpression } from './TokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
-export declare class PrimitiveConstantTokenExpression extends TokenExpression {
+import { ConstantTokenExpression } from './ConstantTokenExpression';
+export declare class PrimitiveConstantTokenExpression extends ConstantTokenExpression {
     constructor(expression: any, start?: number);
@@ -11,9 +10,3 @@ /**
      */
-    concat(token: PrimitiveConstantTokenExpression): PrimitiveConstantTokenExpression;
-    isConstant(): boolean;
-    /**
-     * Get the value of the constant token expression.
-     */
-    valueOf(): any;
-    tokenEvaluatePromise(scope: FormatStringScope): Promise<string>;
+    concat(token: ConstantTokenExpression): PrimitiveConstantTokenExpression;
 }

dist/@types/src/token-expressions/ShorthandTokenExpression.d.ts

@@ -0,6 +1,7 @@
+import { TypeInterface } from '../types/TypeInterface';
+import { TokenExpression } from './TokenExpression';
+import { FormatStringScope } from '../scope/FormatStringScope';
 /**
  * Shorthand token expression.
  */
-import { TokenExpression } from './TokenExpression';
-import { FormatStringScope } from '../FormatStringScope';
 export declare class ShorthandTokenExpression extends TokenExpression {
@@ -11,1 +12,2 @@ constructor(expression: string, start?: number);
 }
+export declare function formatValueAsync(value: any, type: TypeInterface, format: string): Promise<string>;

dist/@types/src/token-expressions/TokenExpression.d.ts

@@ -0,5 +1,5 @@
+import { FormatStringScope } from '../scope/FormatStringScope';
 /**
  * Abstract base token expression class.
  */
-import { FormatStringScope } from '../FormatStringScope';
 export declare abstract class TokenExpression {
@@ -11,4 +11,3 @@ expression: string;
     protected constructor(expression: string, start?: number);
-    stringify(): string;
-    toString(): string;
+    abstract tokenEvaluatePromise(scope: FormatStringScope): Promise<string>;
     isConstant(): boolean;
@@ -20,3 +19,4 @@ isShorthand(): boolean;
     isFunction(): boolean;
-    abstract tokenEvaluatePromise(scope: FormatStringScope): Promise<string>;
+    stringify(): string;
+    toString(): string;
 }

dist/@types/src/tools.d.ts

@@ -1,22 +0,8 @@
-import { TokenExpression } from './token-expressions/TokenExpression';
 import { FunctionTokenExpression } from './token-expressions/FunctionTokenExpression';
 import { ShorthandTokenExpression } from './token-expressions/ShorthandTokenExpression';
 import { FormatShorthandTokenExpression } from './token-expressions/FormatShorthandTokenExpression';
-import { FormatString } from './FormatString';
-import { TypeInterface } from './TypeInterface';
+import { FormatString } from './token-expressions/FormatString';
+import { TypeInterface } from './types/TypeInterface';
 import { LegacyFunctionTokenExpression } from './token-expressions/LegacyFunctionTokenExpression';
-export declare function unescape(s: string): string;
-export declare function parseEnclosingBraces(format: string): {
-    length: number;
-};
 /**
- * Compile a format string expression into tokens.
- * @param {string} format string expression
- * @return {TokenExpression[]} compiled tokens
- */
-export declare function compile(format: string): TokenExpression[];
-export declare function getObjectType(parent: any, name: string): any;
-export declare function deepMerge(a: any, b: any): any;
-export declare function extract(type: any, expression: string, into: any, depth: number): void;
-/**
  * Create format string.
@@ -27,5 +13,2 @@ */
  # Construct a function token expression from a raw expression string.
- * @param {string} expression
- * @param {boolean} [allowLegacy=true] if legacy function token expressions are allowed (defaults to true)
- * @return {FunctionTokenExpression|LegacyFunctionTokenExpression|null}
  */
@@ -37,4 +20,8 @@ export declare function functionTokenExpression(expression: string, allowLegacy?: boolean): FunctionTokenExpression | LegacyFunctionTokenExpression;
 export declare function actionableTokenExpression(expression: string): FunctionTokenExpression | ShorthandTokenExpression | FormatShorthandTokenExpression;
+/**
+ * Format an expression with a specific format.
+ */
 export declare function formatValue(value: any, type: TypeInterface, format: string): string;
-export declare function formatValueAsync(value: any, type: TypeInterface, format: string): Promise<string>;
-export { compile as _compile, deepMerge as _deepMerge };
+export declare function extract(type: TypeInterface, expression: string, into: any, depth: number): void;
+export declare function getObjectType(parent: any, name: string): any;
+export declare function deepMerge(a: any, b: any): any;

dist/src/index.js

 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
@@ -10,3 +14,3 @@ if (k2 === undefined) k2 = k;
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -21,8 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./token-expressions/TokenExpression"), exports);
-__exportStar(require("./FormatString"), exports);
+__exportStar(require("./token-expressions/FormatString"), exports);
+__exportStar(require("./types/TypeInterface"), exports);
+__exportStar(require("./types/ObjectRefInterface"), exports);
+__exportStar(require("./scope/FormatStringScope"), exports);
+__exportStar(require("./scope/VariableFormatStringScope"), exports);
 __exportStar(require("./tools"), exports);
-__exportStar(require("./TypeInterface"), exports);
-__exportStar(require("./ObjectRefInterface"), exports);
-__exportStar(require("./FormatStringScope"), exports);
-__exportStar(require("./VariableFormatStringScope"), exports);
 //# sourceMappingURL=index.js.map

dist/src/token-expressions/FormatShorthandTokenExpression.js

@@ -8,28 +8,13 @@ "use strict";
 const ShorthandTokenExpression_1 = require("./ShorthandTokenExpression");
-const TokenExpression_1 = require("./TokenExpression");
-const tools_1 = require("../tools");
-class FormatShorthandTokenExpression extends TokenExpression_1.TokenExpression {
+class FormatShorthandTokenExpression extends ShorthandTokenExpression_1.ShorthandTokenExpression {
     constructor(expression, format, start) {
         // wraps ShorthandTokenExpression with format
         super(expression, start);
-        this.inner = new ShorthandTokenExpression_1.ShorthandTokenExpression(expression, start);
         this.format = format;
     }
-    isShorthand() {
-        return this.inner.isShorthand();
-    }
     toString() {
         return '[object ' + this.constructor.name + ' <' + this.expression + ', ' + this.start + ', ' + this.format + '>]';
     }
-    async tokenEvaluatePromise(scope) {
-        let expression = this.expression;
-        if (expression.length > 0 && expression[0] == '?') {
-            expression = expression.substring(1);
-        }
-        const value = await scope.getValuePromise(expression);
-        const type = scope.getExpressionType(expression);
-        return tools_1.formatValueAsync(value, type, this.format);
-    }
 }
 exports.FormatShorthandTokenExpression = FormatShorthandTokenExpression;
 //# sourceMappingURL=FormatShorthandTokenExpression.js.map

dist/src/token-expressions/FunctionTokenExpression.js

@@ -15,9 +15,6 @@ "use strict";
         if (processedExpression.indexOf(prefix) === 0) {
-            processedExpression = processedExpression.substr(prefix.length);
+            processedExpression = processedExpression.slice(prefix.length);
         }
         super(processedExpression, start);
     }
-    stringify() {
-        return `${FunctionTokenExpression.PREFIX}${this.expression}`;
-    }
     isFunction() {
@@ -30,3 +27,3 @@ return true;
     functionName() {
-        return this.expression.substr(0, this.expression.indexOf('('));
+        return this.expression.slice(0, this.expression.indexOf('('));
     }
@@ -37,6 +34,3 @@ /**
      */
-    toConstant(includeEscapeTags) {
-        if (typeof includeEscapeTags === 'undefined' || includeEscapeTags === null) {
-            includeEscapeTags = false;
-        }
+    toConstant(includeEscapeTags = false) {
         let constantExpression = FunctionTokenExpression.PREFIX + this.expression;
@@ -55,2 +49,5 @@ if (includeEscapeTags) {
     }
+    stringify() {
+        return `${FunctionTokenExpression.PREFIX}${this.expression}`;
+    }
 }
@@ -57,0 +54,0 @@ exports.FunctionTokenExpression = FunctionTokenExpression;

dist/src/token-expressions/LegacyFunctionTokenExpression.js

@@ -20,7 +20,4 @@ "use strict";
      */
-    toConstant(includeEscapeTags) {
-        if (includeEscapeTags == null) {
-            includeEscapeTags = false;
-        }
-        var constantExpression = this.expression;
+    toConstant(includeEscapeTags = false) {
+        let constantExpression = this.expression;
         if (includeEscapeTags) {
@@ -27,0 +24,0 @@ constantExpression = '{' + constantExpression + '}';

dist/src/token-expressions/PrimitiveConstantTokenExpression.js

@@ -7,4 +7,4 @@ "use strict";
  */
-const TokenExpression_1 = require("./TokenExpression");
-class PrimitiveConstantTokenExpression extends TokenExpression_1.TokenExpression {
+const ConstantTokenExpression_1 = require("./ConstantTokenExpression");
+class PrimitiveConstantTokenExpression extends ConstantTokenExpression_1.ConstantTokenExpression {
     constructor(expression, start) {
@@ -21,16 +21,4 @@ super(expression, start);
     }
-    isConstant() {
-        return true;
-    }
-    /**
-     * Get the value of the constant token expression.
-     */
-    valueOf() {
-        return this.expression;
-    }
-    async tokenEvaluatePromise(scope) {
-        return this.expression;
-    }
 }
 exports.PrimitiveConstantTokenExpression = PrimitiveConstantTokenExpression;
 //# sourceMappingURL=PrimitiveConstantTokenExpression.js.map

dist/src/token-expressions/ShorthandTokenExpression.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShorthandTokenExpression = void 0;
+exports.formatValueAsync = exports.ShorthandTokenExpression = void 0;
+const TokenExpression_1 = require("./TokenExpression");
+const tools_1 = require("../tools");
 /**
  * Shorthand token expression.
  */
-const TokenExpression_1 = require("./TokenExpression");
-const tools_1 = require("../tools");
 class ShorthandTokenExpression extends TokenExpression_1.TokenExpression {
@@ -23,6 +23,16 @@ constructor(expression, start) {
         const type = scope.getExpressionType(expression);
-        return tools_1.formatValueAsync(value, type, this.format);
+        return formatValueAsync(value, type, this.format);
     }
 }
 exports.ShorthandTokenExpression = ShorthandTokenExpression;
+async function formatValueAsync(value, type, format) {
+    if (value != null && typeof value._display == 'function') {
+        // Object - recursive promise-based formatting.
+        return value._display();
+    }
+    else {
+        return (0, tools_1.formatValue)(value, type, format);
+    }
+}
+exports.formatValueAsync = formatValueAsync;
 //# sourceMappingURL=ShorthandTokenExpression.js.map

dist/src/token-expressions/TokenExpression.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenExpression = void 0;
+/**
+ * Abstract base token expression class.
+ */
 class TokenExpression {
@@ -14,8 +17,2 @@ constructor(expression, start) {
     }
-    stringify() {
-        return this.expression;
-    }
-    toString() {
-        return '[object ' + this.constructor.name + ' <' + this.expression + ', ' + this.start + '>]';
-    }
     isConstant() {
@@ -35,4 +32,10 @@ // not constant by default
     }
+    stringify() {
+        return this.expression;
+    }
+    toString() {
+        return '[object ' + this.constructor.name + ' <' + this.expression + ', ' + this.start + '>]';
+    }
 }
 exports.TokenExpression = TokenExpression;
 //# sourceMappingURL=TokenExpression.js.map

dist/src/tools.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._deepMerge = exports._compile = exports.formatValueAsync = exports.formatValue = exports.actionableTokenExpression = exports.functionTokenExpression = exports.formatString = exports.extract = exports.deepMerge = exports.getObjectType = exports.compile = exports.parseEnclosingBraces = exports.unescape = void 0;
-const ConstantTokenExpression_1 = require("./token-expressions/ConstantTokenExpression");
+exports.deepMerge = exports.getObjectType = exports.extract = exports.formatValue = exports.actionableTokenExpression = exports.functionTokenExpression = exports.formatString = void 0;
 const FunctionTokenExpression_1 = require("./token-expressions/FunctionTokenExpression");
 const ShorthandTokenExpression_1 = require("./token-expressions/ShorthandTokenExpression");
 const FormatShorthandTokenExpression_1 = require("./token-expressions/FormatShorthandTokenExpression");
-const FormatString_1 = require("./FormatString");
+const FormatString_1 = require("./token-expressions/FormatString");
 const LegacyFunctionTokenExpression_1 = require("./token-expressions/LegacyFunctionTokenExpression");
-function unescape(s) {
-    var start = 0;
-    var result = '';
-    var len = s.length;
-    while (true) {
-        var i = s.indexOf('}', start);
-        if (i == -1 || i == len - 1) {
-            result += s.substring(start);
-            break;
-        }
-        result += s.substring(start, i + 1);
-        // We assume that the character at i+1 is another right brace, but we don't do any checking.
-        start = i + 2;
-    }
-    return result;
-}
-exports.unescape = unescape;
-function parseEnclosingBraces(format) {
-    var i = format.indexOf('{');
-    if (i == -1) {
-        return null;
-    }
-    // We want to skip through these sections
-    // i.e. do not match { in a string, e.g. "{"
-    var SPECIAL_SECTIONS = ["'", '"'];
-    for (var k = i + 1; k < format.length; k++) {
-        var character = format[k];
-        if (SPECIAL_SECTIONS.indexOf(character) != -1) {
-            // This is the start of a string, jump to its end
-            var endChar = format.indexOf(character, k + 1);
-            if (endChar == -1) {
-                // Unless the end doesn't exist. Error out.
-                return null;
-            }
-            k = endChar;
-            continue;
-        }
-        if (character == '{') {
-            // Start of pair of inner braces,
-            // recursively parse them
-            var inner = parseEnclosingBraces(format.substring(k));
-            if (!inner) {
-                // Faulty inner, return null
-                return null;
-            }
-            k += inner.length;
-            continue;
-        }
-        if (character == '}') {
-            // Found closing part for current level of braces
-            // Return the length to the caller
-            return {
-                length: k - i
-            };
-        }
-    }
-    // Came to end of loop without a match. Faulty, return null
-    return null;
-}
-exports.parseEnclosingBraces = parseEnclosingBraces;
 /**
- * Compile a format string expression into tokens.
- * @param {string} format string expression
- * @return {TokenExpression[]} compiled tokens
- */
-function compile(format) {
-    let start = 0;
-    let tokens = [];
-    let len = format.length;
-    while (true) {
-        const i = format.indexOf('{', start);
-        if (i < 0 || i == len - 1) {
-            // end of string - everything is normal text
-            tokens.push(new ConstantTokenExpression_1.ConstantTokenExpression(unescape(format.substring(start)), start));
-            break;
-        }
-        // normal text in the gaps between curly braces
-        tokens.push(new ConstantTokenExpression_1.ConstantTokenExpression(unescape(format.substring(start, i)), start));
-        if (format[i + 1] == '{') {
-            // Double left brace - escape and continue
-            tokens.push(new ConstantTokenExpression_1.ConstantTokenExpression('{', start));
-            start = i + 2;
-            continue;
-        }
-        const parsedBraces = parseEnclosingBraces(format.substring(i));
-        if (!parsedBraces) {
-            // Brace pair faulty (no closing brace), return as a constant
-            tokens.push(new ConstantTokenExpression_1.ConstantTokenExpression(format.substring(i), start));
-            break;
-        }
-        // Next start is at the end of the currently parsed brace pair
-        start = i + parsedBraces.length + 1;
-        // `spec` is everything between the curly braces "{" and "}".
-        const spec = format.substring(i + 1, i + parsedBraces.length);
-        // test for function token prefix
-        if (spec.trim().indexOf(FunctionTokenExpression_1.FunctionTokenExpression.PREFIX) === 0) {
-            // function token because the function name has "$:" as prefix (leading whitespace is ignored)
-            tokens.push(new FunctionTokenExpression_1.FunctionTokenExpression(spec, i));
-        }
-        else {
-            // shorthand token
-            const colon = spec.indexOf(':');
-            if (colon == -1) {
-                tokens.push(new ShorthandTokenExpression_1.ShorthandTokenExpression(spec, i));
-            }
-            else {
-                tokens.push(new FormatShorthandTokenExpression_1.FormatShorthandTokenExpression(spec.substring(0, colon), spec.substring(colon + 1), i));
-            }
-        }
-    }
-    // concatenate any neighbouring constant token expressions
-    let result = [];
-    let last = null;
-    for (var j = 0; j < tokens.length; j++) {
-        var token = tokens[j];
-        if (token instanceof ConstantTokenExpression_1.ConstantTokenExpression) {
-            if (last == null) {
-                if (token.expression.length > 0) {
-                    last = token;
-                }
-            }
-            else {
-                last = last.concat(token);
-            }
-        }
-        else {
-            if (last != null) {
-                result.push(last);
-                last = null;
-            }
-            result.push(token);
-        }
-    }
-    if (last != null) {
-        result.push(last);
-    }
-    return result;
-}
-exports.compile = compile;
-exports._compile = compile;
-function getObjectType(parent, name) {
-    var variable = parent.getAttribute(name);
-    if (variable != null) {
-        var type = variable.type;
-        if (type.isObject) {
-            return type;
-        }
-    }
-    return null;
-}
-exports.getObjectType = getObjectType;
-// Merge hashes of hashes (no non-hash values)
-// Sample:
-//   deepMerge({a: {}}, {b: {}}) => {a: {}, b: {}}
-//   deepMerge({a: {b: {c: {}}}, d: {}}, {a: {e: {}}}) => {a: {b: {c: {}}, e: {}}, d: {}}
-function deepMerge(a, b) {
-    if (typeof a != 'object' || typeof b != 'object') {
-        throw new Error('Parameters must be objects only');
-    }
-    Object.keys(b).forEach(function (key) {
-        if (!(key in a)) {
-            // There are no actual "values" here, except for more nested hashes.
-            // The presence of keys is the important part.
-            a[key] = {};
-        }
-        deepMerge(a[key], b[key]);
-    });
-    return a;
-}
-exports.deepMerge = deepMerge;
-exports._deepMerge = deepMerge;
-function extract(type, expression, into, depth) {
-    var dot = expression.indexOf('.');
-    if (dot < 0) {
-        var objectType = getObjectType(type, expression);
-        if (objectType == null) {
-            // Not an object - don't continue
-        }
-        else {
-            var b = {};
-            b[expression] = objectType.displayFormat.extractRelationshipStructure(objectType, depth + 1);
-            deepMerge(into, b);
-        }
-    }
-    else {
-        var head = expression.substring(0, dot); // The first part of the expression
-        var tail = expression.substring(dot + 1); // The rest of the expression
-        var child = getObjectType(type, head);
-        if (child == null) {
-            // nothing
-        }
-        else {
-            if (!(head in into)) {
-                into[head] = {};
-            }
-            extract(child, tail, into[head], depth + 1);
-        }
-    }
-}
-exports.extract = extract;
-/**
  * Create format string.
@@ -224,10 +23,4 @@ */
  # Construct a function token expression from a raw expression string.
- * @param {string} expression
- * @param {boolean} [allowLegacy=true] if legacy function token expressions are allowed (defaults to true)
- * @return {FunctionTokenExpression|LegacyFunctionTokenExpression|null}
  */
-function functionTokenExpression(expression, allowLegacy) {
-    if (typeof allowLegacy === 'undefined' || allowLegacy == null) {
-        allowLegacy = true; // default value
-    }
+function functionTokenExpression(expression, allowLegacy = true) {
     if (expression == null) {
@@ -256,3 +49,3 @@ return null;
     }
-    var colon = expression.indexOf(':');
+    const colon = expression.indexOf(':');
     if (colon == -1) {
@@ -264,4 +57,5 @@ return new ShorthandTokenExpression_1.ShorthandTokenExpression(expression);
 exports.actionableTokenExpression = actionableTokenExpression;
-// Format an expression with a specific format.
-// Return a promise resolving with the formatted value.
+/**
+ * Format an expression with a specific format.
+ */
 function formatValue(value, type, format) {
@@ -281,12 +75,61 @@ if (value == null) {
 exports.formatValue = formatValue;
-async function formatValueAsync(value, type, format) {
-    if (value != null && typeof value._display == 'function') {
-        // Object - recursive promise-based formatting.
-        return value._display();
+function extract(type, expression, into, depth) {
+    const dot = expression.indexOf('.');
+    if (dot < 0) {
+        const objectType = getObjectType(type, expression);
+        if (objectType == null) {
+            // Not an object - don't continue
+        }
+        else {
+            const b = {};
+            b[expression] = objectType.displayFormat.extractRelationshipStructure(objectType, depth + 1);
+            deepMerge(into, b);
+        }
     }
     else {
-        return formatValue(value, type, format);
+        const head = expression.substring(0, dot); // The first part of the expression
+        const tail = expression.substring(dot + 1); // The rest of the expression
+        const child = getObjectType(type, head);
+        if (child == null) {
+            // nothing
+        }
+        else {
+            if (!(head in into)) {
+                into[head] = {};
+            }
+            extract(child, tail, into[head], depth + 1);
+        }
     }
 }
-exports.formatValueAsync = formatValueAsync;
+exports.extract = extract;
+function getObjectType(parent, name) {
+    const variable = parent.getAttribute(name);
+    if (variable != null) {
+        const type = variable.type;
+        if (type.isObject) {
+            return type;
+        }
+    }
+    return null;
+}
+exports.getObjectType = getObjectType;
+// Merge hashes of hashes (no non-hash values)
+// Sample:
+//   deepMerge({a: {}}, {b: {}}) => {a: {}, b: {}}
+//   deepMerge({a: {b: {c: {}}}, d: {}}, {a: {e: {}}}) => {a: {b: {c: {}}, e: {}}, d: {}}
+function deepMerge(a, b) {
+    if (typeof a != 'object' || typeof b != 'object') {
+        throw new Error('Parameters must be objects only');
+    }
+    Object.keys(b).forEach(function (key) {
+        if (!(key in a)) {
+            // There are no actual "values" here, except for more nested hashes.
+            // The presence of keys is the important part.
+            a[key] = {};
+        }
+        deepMerge(a[key], b[key]);
+    });
+    return a;
+}
+exports.deepMerge = deepMerge;
 //# sourceMappingURL=tools.js.map

package.json

 {
   "name": "@journeyapps/evaluator",
-  "version": "0.0.0-dev.b87c3cb.f152454",
-  "description": "Journey JS library",
+  "version": "0.0.0-dev.bdcfe9b",
+  "description": "Journey Evaluator library",
   "main": "./dist/src/index.js",
   "typings": "./dist/@types/src/index",
-  "scripts": {
-    "build": "../node_modules/.bin/tsc --build",
-    "test": "yarn build && yarn test:node && yarn test:browser",
-    "test:browser": "karma start karma.conf.js --single-run",
-    "test:node": "jasmine dist/test/unit/all.js"
-  },
-  "dependencies": {
-    "@journeyapps/core-xml": "0.0.0-dev.b87c3cb.f152454"
-  },
   "files": [
@@ -20,3 +11,14 @@ "dist/src",
   ],
-  "gitHead": "72f18d4d41af20af55fd1c2a21efca09f5150b31"
-}
+  "dependencies": {
+    "@journeyapps/core-xml": "0.0.0-dev.bdcfe9b"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "build": "tsc --build",
+    "watch": "tsc -b --watch",
+    "clean": "tsc -b --clean && rm -rf dist",
+    "test": "pnpm build && pnpm test:node && pnpm test:browser",
+    "test:browser": "vitest --run --config vitest.config.browser.ts",
+    "test:node": "vitest --run --config vitest.config.unit.ts"
+  }
+}

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

120863

increased by30.3%

Worsened metrics

Number of package files

44

decreased by-4.35%

Lines of code

1105

decreased by-3.66%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@journeyapps/[e-mail]9b(transitive)

• + Added@journeyapps/domparser@0.4.1(transitive)

• + Addedxmldom@0.6.0(transitive)

• - Removed@journeyapps/core-xml@0.0.0-dev.b87c3cb.f152454(transitive)

• - Removed@journeyapps/domparser@0.3.0(transitive)

• Updated@journeyapps/[e-mail]9b