Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: evaluates option not working well #83

Merged
merged 4 commits into from
Feb 7, 2025
Merged

fix: evaluates option not working well #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cd7d2b
fix: evaluates option not working well
righ Feb 6, 2025
33a5b4d
fix: lint
righ Feb 6, 2025
fd5f134
upgrade
righ Feb 7, 2025
26efcad
fix: e2e
righ Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "22"

- name: cache
uses: actions/cache@v3
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,38 @@ jobs:
with:
python-version: "3.12"
- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "22"

- name: cache
- name: cache1
uses: actions/cache@v3
with:
path: |
node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}

- name: cache2
uses: actions/cache@v3
with:
path: |
storybook/node_modules
key: ${{ runner.os }}-${{ hashFiles('./storybook/yarn.lock') }}

- name: install
run: |
yarn install
npx playwright install --with-deps

- name: build
run: yarn run build-storybook
run: |
cd storybook
yarn install
yarn run build

- name: run server
run: |
python -m http.server 5233 --directory "${{ github.workspace }}/storybook-static" &
python -m http.server 5233 --directory "${{ github.workspace }}/storybook/storybook-static" &

- name: e2e test
run: yarn e2e
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "22"

- name: cache
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unittest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: setup
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: "22"
- name: cache
uses: actions/cache@v3
with:
Expand Down
1 change: 0 additions & 1 deletion .node-version
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions .storybook/main.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 16.14.0
nodejs 22.13.1
11 changes: 7 additions & 4 deletions e2e/event.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ import { jsonMinify, jsonQuery } from './utils';
test('show the diff', async ({ page }) => {
await page.goto('http://localhost:5233/iframe.html?id=table-operations--sheet-on-change&viewMode=story');
const b2 = page.locator("[data-address='B2']");
await b2.dblclick();
await page.keyboard.type('777');
await b2.click();
await page.keyboard.type('=sum(C1:E1)+10');
await page.keyboard.press('Enter');

const diff = page.locator('#diff');
expect(jsonMinify(await diff.inputValue())).toContain('{"B2":7777}');
const diff = page.locator('#changes');
expect(jsonMinify(await diff.inputValue())).toContain('{"B2":22}');
const evaluates = page.locator('#evaluates');
await evaluates.uncheck();
expect(jsonMinify(await diff.inputValue())).toContain('{"B2":"=sum(C1:E1)+10"}');
});

test('1 operation makes 1 diff history', async ({ page }) => {
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"scripts": {
"build": "rm -rf ./dist || true && tsc --project ./src/index.ts -p ./tsconfig.json",
"audit-fix": "yarn-audit-fix --force",
"storybook": "start-storybook -p 5233",
"build-storybook": "build-storybook",
"storybook:run": "cd storybook && yarn run run",
"storybook:build": "cd storybook && yarn run build",
"less": "lessc --clean-css ./src/styles/root.less ./src/styles/root.min.css",
"generate-style": "node ./generate-style.js",
"playwright": "npx playwright test --ui",
Expand Down Expand Up @@ -45,7 +45,7 @@
"@babel/preset-env": "^7.14.4",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@playwright/test": "^1.41.1",
"@playwright/test": "^1.50.1",
"@storybook/addon-essentials": "^6.5.12",
"@storybook/addon-links": "^6.5.12",
"@storybook/react": "^6.5.12",
Expand All @@ -63,7 +63,6 @@
"jest-environment-jsdom": "^29.4.3",
"less": "^4.1.3",
"less-plugin-clean-css": "^1.5.1",
"playwright": "^1.41.1",
"prettier": "^3.2.5",
"react": ">=16.9.0",
"react-dom": ">=16.9.0",
Expand Down
2 changes: 1 addition & 1 deletion src/formula/functions/__utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const eq = (left: any, right: any): boolean => {

export const ne = (left: any, right: any): boolean => {
return !eq(left, right);
}
};

export const ensureNumber = (value: any, alternative?: number): number => {
if (typeof value === 'undefined' && typeof alternative !== 'undefined') {
Expand Down
17 changes: 15 additions & 2 deletions src/formula/solver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,27 @@ import { p2a } from '../lib/converters';

const SOLVING = new Special('solving');

export const solveFormula = ({ value, table, raise = true }: { value: any; table: Table; raise?: boolean }) => {
type SolveFormulaType = {
value: any;
table: Table;
raise?: boolean;
evaluates?: boolean | null;
};

export const solveFormula = ({ value, table, raise = true, evaluates = true }: SolveFormulaType) => {
if (evaluates === null) {
return value;
}
let solved = value;
if (typeof value === 'string') {
if (value.charAt(0) === '=') {
try {
const lexer = new Lexer(value.substring(1));
lexer.tokenize();
const parser = new Parser(lexer.tokens);
if (evaluates === false) {
return '=' + lexer.stringifyToRef(table);
}
const expr = parser.build();
solved = expr?.evaluate?.({ table });
} catch (e) {
Expand All @@ -32,7 +45,7 @@ export const solveFormula = ({ value, table, raise = true }: { value: any; table

export const solveTable = ({ table, raise = true }: { table: Table; raise?: boolean }): MatrixType => {
const area = table.getArea();
return table.getMatrixFlatten({ area, evaluates: false }).map((row, i) => {
return table.getMatrixFlatten({ area, evaluates: null }).map((row, i) => {
const y = area.top + i;
return row.map((value, j) => {
const x = area.left + j;
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export type {
WriterType,
CellsByAddressType,
CellsByIdType,
HistoryType,
} from './types';
export { ThousandSeparatorRendererMixin } from './renderers/thousand_separator';
export { CheckboxRendererMixin } from './renderers/checkbox';
Expand Down
2 changes: 1 addition & 1 deletion src/lib/autofill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class Autofill {

public get applied(): Table {
const [orientation, sign] = DirectionMapping[this.direction];
const matrix = this.table.getMatrix({ area: this.src, evaluates: false });
const matrix = this.table.getMatrix({ area: this.src, evaluates: null });
const srcShape = areaShape({ ...this.src, base: 1 });
const dstShape = areaShape({ ...this.dst, base: 1 });

Expand Down
109 changes: 51 additions & 58 deletions src/lib/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ type Props = {
const noFilter: CellFilter = () => true;

type GetProps = {
evaluates?: boolean;
// null for the system, do not use it
evaluates?: boolean | null;
raise?: boolean;
filter?: CellFilter;
};
Expand Down Expand Up @@ -495,13 +496,12 @@ export class Table implements UserTable {
if (!filter(cell)) {
continue;
}
matrix[y - top][x - left] = evaluates
? solveFormula({
value: cell[key],
table: this,
raise,
})
: cell[key];
matrix[y - top][x - left] = solveFormula({
value: cell[key],
table: this,
raise,
evaluates,
});
}
}
return matrix;
Expand All @@ -513,13 +513,12 @@ export class Table implements UserTable {
for (let x = left; x <= right; x++) {
const cell = this.getByPoint({ y: y - top, x: x - left });
if (cell != null && filter(cell)) {
result[p2a({ y, x })] = evaluates
? solveFormula({
value: cell[key],
table: this,
raise,
})
: cell[key];
result[p2a({ y, x })] = solveFormula({
value: cell[key],
table: this,
raise,
evaluates,
});
}
}
}
Expand All @@ -534,13 +533,12 @@ export class Table implements UserTable {
for (let x = left; x <= right; x++) {
const cell = this.getByPoint({ y: y - top, x: x - left });
if (cell != null && filter(cell)) {
row[x2c(x) || y2r(y)] = evaluates
? solveFormula({
value: cell[key],
table: this,
raise,
})
: cell[key];
row[x2c(x) || y2r(y)] = solveFormula({
value: cell[key],
table: this,
raise,
evaluates,
});
}
}
}
Expand All @@ -555,13 +553,12 @@ export class Table implements UserTable {
for (let y = top; y <= bottom; y++) {
const cell = this.getByPoint({ y: y - top, x: x - left });
if (cell != null && filter(cell)) {
col[y2r(y) || x2c(x)] = evaluates
? solveFormula({
value: cell[key],
table: this,
raise,
})
: cell[key];
col[y2r(y) || x2c(x)] = solveFormula({
value: cell[key],
table: this,
raise,
evaluates,
});
}
}
}
Expand All @@ -586,13 +583,12 @@ export class Table implements UserTable {
if (cell != null && filter(cell)) {
matrix[y - top][x - left] = {
...cell,
value: evaluates
? solveFormula({
value: cell?.value,
table: this,
raise,
})
: cell?.value,
value: solveFormula({
value: cell?.value,
table: this,
raise,
evaluates,
}),
};
}
}
Expand All @@ -608,13 +604,12 @@ export class Table implements UserTable {
if (cell != null && filter(cell)) {
result[p2a({ y, x })] = {
...cell,
value: evaluates
? solveFormula({
value: cell?.value,
table: this,
raise,
})
: cell?.value,
value: solveFormula({
value: cell?.value,
table: this,
raise,
evaluates,
}),
};
}
}
Expand All @@ -632,13 +627,12 @@ export class Table implements UserTable {
if (cell != null && filter(cell)) {
row[x2c(x) || y2r(y)] = {
...cell,
value: evaluates
? solveFormula({
value: cell?.value,
table: this,
raise,
})
: cell?.value,
value: solveFormula({
value: cell?.value,
table: this,
raise,
evaluates,
}),
};
}
}
Expand All @@ -656,13 +650,12 @@ export class Table implements UserTable {
if (cell != null && filter(cell)) {
col[y2r(y) || x2c(x)] = {
...cell,
value: evaluates
? solveFormula({
value: cell?.value,
table: this,
raise,
})
: cell?.value,
value: solveFormula({
value: cell?.value,
table: this,
raise,
evaluates,
}),
};
}
}
Expand Down Expand Up @@ -1324,7 +1317,7 @@ export class Table implements UserTable {

if (s[0] === '=') {
if (evaluates) {
return String(solveFormula({ value: s, table: this, raise: false }));
return String(solveFormula({ value: s, table: this, raise: false, evaluates }));
}
const lexer = new Lexer(s.substring(1));
lexer.tokenize();
Expand Down
Loading
Loading