@cloudpss/expression 0.6.0-alpha.15 → 0.6.0-alpha.17

package/tests/definition.ts

@@ -85,8 +85,10 @@ describe('definitions', () => {
             null,
         );
         // @ts-expect-error 测试 undefined 输入
-        expect(def.toArgumentValue(undefined, { type: 'real', key: '', name: '', description: '', value: 1 })).toBe(0);
-        expect(def.toArgumentValue(null, { type: 'real', key: '', name: '', description: '', value: 1 })).toBe(0);
+        expect(def.toArgumentValue(undefined, { type: 'real', key: '', name: '', description: '', value: 1 })).toBe(
+            null,
+        );
+        expect(def.toArgumentValue(null, { type: 'real', key: '', name: '', description: '', value: 1 })).toBe(null);
         expect(def.toArgumentValue('12', { type: 'real', key: '', name: '', description: '', value: 1 })).toBe(12);
         expect(def.toArgumentValue(null, { type: 'text', key: '', name: '', description: '', value: '1' })).toBe('');
         expect(def.toArgumentValue(12, { type: 'text', key: '', name: '', description: '', value: '1' })).toBe('12');
@@ -96,7 +98,7 @@ describe('definitions', () => {
 
         expect(
             def.toArgumentValue(null, { type: 'choice', key: '', name: '', description: '', value: 1, choices: [] }),
-        ).toBe(0);
+        ).toBe(null);
         expect(
             def.toArgumentValue(null, {
                 type: 'choice',
@@ -120,7 +122,7 @@ describe('definitions', () => {
                 ],
             }),
         ).toBe('0');
-        expect(def.toArgumentValue(null, { type: 'logical', key: '', name: '', description: '', value: 1 })).toBe(0);
+        expect(def.toArgumentValue(null, { type: 'logical', key: '', name: '', description: '', value: 1 })).toBe(null);
         expect(
             def.toArgumentValue(null, {
                 type: 'logical',
@@ -142,7 +144,7 @@ describe('definitions', () => {
                 description: '',
                 value: true,
             }),
-        ).toBe(false);
+        ).toBe(null);
         expect(
             def.toArgumentValue(null, {
                 type: 'logical',
@@ -194,7 +196,7 @@ describe('definitions', () => {
                 value: [1],
                 choices: [],
             }),
-        ).toStrictEqual([0]);
+        ).toStrictEqual([]);
         expect(
             def.toArgumentValue('', {
                 type: 'multiSelect',
@@ -206,7 +208,7 @@ describe('definitions', () => {
             }),
         ).toStrictEqual(['']);
         expect(
-            def.toArgumentValue(['', '1'], {
+            def.toArgumentValue(['', '1', '  2 '], {
                 type: 'multiSelect',
                 key: '',
                 name: '',
@@ -214,9 +216,9 @@ describe('definitions', () => {
                 value: [1],
                 choices: [],
             }),
-        ).toStrictEqual([0, 1]);
+        ).toStrictEqual([1, 2]);
         expect(
-            def.toArgumentValue(['', '1'], {
+            def.toArgumentValue(['', '1', '  2 '], {
                 type: 'multiSelect',
                 key: '',
                 name: '',
@@ -224,6 +226,6 @@ describe('definitions', () => {
                 value: [1],
                 choices: Expression(''),
             }),
-        ).toStrictEqual(['', '1']);
+        ).toStrictEqual(['', '1', '  2 ']);
     });
 });

package/tests/import.ts

@@ -1,6 +1,6 @@
 import { VmFunction } from '@mirascript/mirascript';
 import { Evaluator, Expression, Scope } from '../dist/index.js';
-import { lib } from '@mirascript/mirascript/subtle';
+import { convert, lib } from '@mirascript/mirascript/subtle';
 
 const e = new Evaluator({
     logger: {
@@ -26,7 +26,7 @@ describe('Import should work correctly', () => {
         expect(e.evaluate(Expression('add(1,2)'), s)).toBe(3);
         expect(e.evaluate(Expression('add::type()'), s)).toBe('extern');
         expect(e2.evaluate(Expression('add(1,2)'), s)).toBe(null);
-        expect(e2.evaluate(Expression('add::type()'), s)).toBe('nil');
+        expect(e2.evaluate(Expression('add::type()'), s)).toBe(null);
     });
 
     it('can remove modules', () => {
@@ -39,7 +39,7 @@ describe('Import should work correctly', () => {
     it('can replace modules', () => {
         e.import({ add: (x: number, y: number) => x + y });
         expect(e.evaluate(Expression('add::type()'), s)).toBe('extern');
-        e.import({ add: VmFunction((x, y) => lib.to_number(x) + lib.to_number(y)) });
+        e.import({ add: VmFunction((x, y) => convert.toNumber(x, 0) + convert.toNumber(y, 0)) });
         expect(e.evaluate(Expression('add::type()'), s)).toBe('function');
     });
 });

package/tests/migrate.ts

@@ -1,7 +1,7 @@
 import { migrateMathJs } from '@cloudpss/expression/migrate';
 import type { ExpressionSource } from '../dist/expression.js';
 import { Scope } from '../dist/scope.js';
-import { Evaluator, Expression } from '../dist/index.js';
+import { Evaluator, Expression, VmError } from '../dist/index.js';
 import dedent from 'dedent';
 
 const s = new Scope({
@@ -40,8 +40,16 @@ describe('migrate', () => {
         ['sin(0)', 'sin(0)', 0],
         ['sin(f)', 'sin(f)', Math.sin(1)],
         ['f', 'f', 1],
-        ['$a', '$a', null],
-        ['$a + 1', 'matrix.add($a, 1)', 1],
+        ['o == null', 'o == nil', false],
+        ['o == undefined', 'o == nil', false],
+        ['o == undefined', 'o == nil', false],
+        ['b == false', 'b =~ 0', true],
+        ['true != b', '1 !~ b', true],
+        ['f == true', 'f =~ 1', true],
+        ['false == f', '0 =~ f', false],
+        ['0 <= f + 1 <= 2', 'f + 1 is 0..2', true],
+        ['$a', '$a', VmError],
+        ['$a + 1', 'matrix.add($a, 1)', VmError],
         ['size(a)[1]', 'len(a)', 3],
         ['size(s)[1]', 'len(chars(s))', 3],
         ['(a).length', 'len((a))', 3],
@@ -55,6 +63,8 @@ describe('migrate', () => {
         ['f >0', 'f > 0', true],
         ['f >=0', 'f >= 0', true],
         ['f <0', 'f < 0', false],
+        ['f == 1', 'f =~ 1', true],
+        ['f != 1', 'f !~ 1', false],
         ['1<f<2', '1 < f && f < 2', false],
         ['1 + 2 + f', '1 + 2 + f', 4],
         ['PI', '@pi', Math.PI],
@@ -78,6 +88,8 @@ describe('migrate', () => {
         ['- f', '-f', -1],
         ['size(f)', 'matrix.size(f)', []],
         ['size(m)', 'matrix.size(m)', [2, 2]],
+        [`[1,2,3] == f`, `[1, 2, 3]::map(fn { it =~ f })`, [true, false, false]],
+        [`$V != [1,2,3]`, `[1, 2, 3]::map(fn { $V !~ it })`, VmError],
         [
             'u.length',
             dedent`
@@ -88,7 +100,7 @@ describe('migrate', () => {
                 // - W: 符号 'u' 未定义
                 // # 原始 math.js 表达式
                 // u.length`,
-            null,
+            VmError,
         ],
         ['o["x"]', 'o.x', 1],
         ['o.x', 'o.x', 1],
@@ -129,7 +141,7 @@ describe('migrate', () => {
                 // - W: 符号 'u' 未定义
                 // # 原始 math.js 表达式
                 // a[u]`,
-            1,
+            VmError,
         ],
         [
             'u[1]',
@@ -141,7 +153,7 @@ describe('migrate', () => {
                 // - W: 符号 'u' 未定义
                 // # 原始 math.js 表达式
                 // u[1]`,
-            null,
+            VmError,
         ],
         [
             'm[1,2]',
@@ -166,11 +178,10 @@ describe('migrate', () => {
         [
             'filter(x) = x > 1; a.filter(filter)',
             dedent`
-                fn filter(x) { x > 1 }
+                fn filter(x) { matrix.entrywise(x, 1, fn (a, b) { a > b }) }
                 a::global.filter(filter)
                 // # 转换日志
                 // - W: 使用了非精确转换的语法或函数，结果可能不准确
-                // - W: '>' 不支持矩阵，计算结果可能不一致
                 // # 原始 math.js 表达式
                 // filter(x) = x > 1; a.filter(filter)`,
             [2, 3],
@@ -227,9 +238,38 @@ describe('migrate', () => {
         ['', '', null],
         ['#', '//', null],
         ['#xx', '//xx', null],
+        ['(random() - 1) < 0', '(random() - 1) < 0', true],
+        [
+            're(12) + im(i)',
+            dedent`
+                /* re */(12) + /* im */(i)
+                // # 转换日志
+                // - E: 不支持复数
+                // # 原始 math.js 表达式
+                // re(12) + im(i)
+                `,
+            VmError,
+        ],
+        ['is(a, "number")', "type(a) == 'number'", false],
+        ['is(a, "string")', "type(a) == 'string'", false],
+        ['is(a, "boolean")', "type(a) == 'boolean'", false],
+        ['is(a, "null")', "type(a) == 'nil'", false],
+        ['is(a, "undefined")', "type(a) == 'nil'", false],
+        [`sum([a > 1])`, `sum([matrix.entrywise(a, 1, fn (a, b) { a > b })]::flatten())`, 2],
+        [`prod(1,2,3)`, `product(1, 2, 3)`, 6],
+        [`sum(true)`, `sum(true)`, 1],
+        [`sum(m)`, `sum(m::flatten())`, 10],
+        [`prod([1,2,3])`, `product([1, 2, 3])`, 6],
+        [`prod(f)`, `product(f)`, 1],
     ])('should migrate expression: %s', (f, t, r) => {
         const migrated = migrateMathJs(f as ExpressionSource, false, s);
         expect(migrated).toBe(t);
-        expect(e.evaluate(Expression(migrated), s)).toEqual(r);
+        if (typeof r === 'function' && r.prototype instanceof Error) {
+            expect(() => {
+                e.evaluate(Expression(migrated), s);
+            }).toThrow(r);
+        } else {
+            expect(e.evaluate(Expression(migrated), s)).toEqual(r);
+        }
     });
 });

package/tests/scope.ts

@@ -10,7 +10,7 @@ describe('Scope should work correctly', () => {
     it('can create from function', () => {
         const s = new Scope((k) => (k === 'a' ? 12 : undefined), false);
         expect(e.evaluate(Expression('a'), s)).toBe(12);
-        expect(e.evaluate(Expression('b'), s)).toBe(null);
+        expect(e.evaluate(Expression('`b` in global'), s)).toBe(false);
     });
     it('can create from object', () => {
         const s = new Scope({ a: 12, b: Expression('a + 1') }, false);
@@ -22,8 +22,8 @@ describe('Scope should work correctly', () => {
 describe('Scope should not leak dangerous objects', () => {
     it('should not access prototype fields', () => {
         const s = new Scope({}, false);
-        expect(e.evaluate(Expression('__proto__'), s)).toBe(null);
-        expect(e.evaluate(Expression('toString'), s)).toBe(null);
+        expect(e.evaluate(Expression('`__proto__` in global'), s)).toBe(false);
+        expect(e.evaluate(Expression('`toString` in global'), s)).toBe(false);
     });
     it('should access same name props', () => {
         const s = new Scope({ ['__proto__']: 12, toString: 'x' }, false);