fix: container and eval unit-test errors

Author: Codeneos

packages/core/src/__tests__/container.test.ts

@@ -136,8 +136,8 @@ describe('container', () => {
         it('should resolve circular references without creating duplicate service instances', () => {
             // Arrange
             const testContainer = new Container(Logger.null);
-            testContainer.registerType(ServiceImplCircular, [ServiceImplCircular]);
-            testContainer.registerType(CircularRef, [CircularRef]);
+            testContainer.registerType(ServiceImplCircular, [ServiceImplCircular], { lifecycle: LifecyclePolicy.singleton });
+            testContainer.registerType(CircularRef, [CircularRef], { lifecycle: LifecyclePolicy.singleton });
 
             // Act
             const result = testContainer.resolve(ServiceImplCircular)!;

packages/util/src/__tests__/string.test.ts

@@ -36,7 +36,7 @@ describe('util', () => {
             expect(string.evalExpr('\'Foo \' + bar', { bar: 'bar'})).toEqual('Foo bar');
         });
         it('complex expression should return evaluated result as string', () => {
-            expect(string.evalExpr('\'Foo \' + (i == 0 ? (bar || foo) : \'bla\')', { i: 0, foo: 'bar'})).toEqual('Foo bar');
+            expect(string.evalExpr('\'Foo \' + (i == 0 ? (bar || foo) : \'bla\')', { i: 0, foo: 'bar', bar: undefined})).toEqual('Foo bar');
         });
     });
 

packages/util/src/string.ts

@@ -76,7 +76,7 @@ export function format(formatStr: string, ...args: any[]) {
  * @param contextValues context values supplied
  */
 export function evalExpr(expr: string, contextValues: any) : string {
-    const fn = compileFunction(`return ${expr};`);
+    const fn = compileFunction(`return ${expr}`);
     return fn(contextValues, false);
 }
 
@@ -86,7 +86,7 @@ export function evalExpr(expr: string, contextValues: any) : string {
  * @param contextValues context values supplied
  */
 export function evalTemplate(expr: string, contextValues: any) : string {
-    const fn = compileFunction(`return \`${expr}\`;`);
+    const fn = compileFunction(`return \`${expr}\``);
     return fn(contextValues, false);
 }