BOB

.github/workflows/npm.yml

@@ -1,446 +0,0 @@
-name: nodejs
-env:
-  DEBUG: napi:*
-  APP_NAME: nodejs
-  MACOSX_DEPLOYMENT_TARGET: '10.13'
-permissions:
-  contents: write
-  id-token: write
-'on':
-  workflow_dispatch:
-    inputs:
-      publish:
-        description: "Publish to npm"
-        required: true
-        type: boolean
-defaults:
-  run:
-    working-directory: ./bindings/nodejs
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        settings:
-          - host: macos-latest
-            target: x86_64-apple-darwin
-            build: yarn build --target x86_64-apple-darwin
-          - host: windows-latest
-            build: yarn build --target x86_64-pc-windows-msvc
-            target: x86_64-pc-windows-msvc
-          - host: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
-            build: yarn build --target x86_64-unknown-linux-gnu
-          - host: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-            build: yarn build --target x86_64-unknown-linux-musl
-          - host: macos-latest
-            target: aarch64-apple-darwin
-            build: yarn build --target aarch64-apple-darwin
-          - host: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
-            build: yarn build --target aarch64-unknown-linux-gnu
-          - host: ubuntu-latest
-            target: armv7-unknown-linux-gnueabihf
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-arm-linux-gnueabihf -y
-            build: yarn build --target armv7-unknown-linux-gnueabihf
-          - host: ubuntu-latest
-            target: armv7-unknown-linux-musleabihf
-            build: yarn build --target armv7-unknown-linux-musleabihf
-          - host: ubuntu-latest
-            target: aarch64-linux-android
-            build: yarn build --target aarch64-linux-android
-          - host: ubuntu-latest
-            target: armv7-linux-androideabi
-            build: yarn build --target armv7-linux-androideabi
-          - host: ubuntu-latest
-            target: aarch64-unknown-linux-musl
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-            build: |-
-              set -e &&
-              rustup target add aarch64-unknown-linux-musl &&
-              yarn build --target aarch64-unknown-linux-musl
-          - host: windows-latest
-            target: aarch64-pc-windows-msvc
-            build: yarn build --target aarch64-pc-windows-msvc
-          - host: ubuntu-latest
-            target: riscv64gc-unknown-linux-gnu
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-riscv64-linux-gnu -y
-            build: yarn build --target riscv64gc-unknown-linux-gnu
-    name: stable - ${{ matrix.settings.target }} - node@20
-    runs-on: ${{ matrix.settings.host }}
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        if: ${{ !matrix.settings.docker }}
-        with:
-          node-version: 20
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-      - name: Install
-        uses: dtolnay/rust-toolchain@stable
-        if: ${{ !matrix.settings.docker }}
-        with:
-          toolchain: stable
-          targets: ${{ matrix.settings.target }}
-      - name: Cache cargo
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            .cargo-cache
-            target/
-          key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
-      - uses: goto-bus-stop/setup-zig@v2
-        if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }}
-        with:
-          version: 0.13.0
-      - name: Setup toolchain
-        run: ${{ matrix.settings.setup }}
-        if: ${{ matrix.settings.setup }}
-        shell: bash
-      - name: Install dependencies
-        run: yarn install
-      - name: Build in docker
-        uses: addnab/docker-run-action@v3
-        if: ${{ matrix.settings.docker }}
-        with:
-          image: ${{ matrix.settings.docker }}
-          options: '--user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build/bindings/nodejs'
-          run: ${{ matrix.settings.build }}
-      - name: Build
-        run: ${{ matrix.settings.build }}
-        if: ${{ !matrix.settings.docker }}
-        shell: bash
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bindings-${{ matrix.settings.target }}
-          path: bindings/nodejs/${{ env.APP_NAME }}.*.node
-          if-no-files-found: error
-  test-macOS-windows-binding:
-    name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        settings:
-          - host: macos-latest
-            target: x86_64-apple-darwin
-          - host: windows-latest
-            target: x86_64-pc-windows-msvc
-        node:
-          - '18'
-          - '20'
-    runs-on: ${{ matrix.settings.host }}
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-          architecture: x64
-      - name: Install dependencies
-        run: yarn install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-${{ matrix.settings.target }}
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Test bindings
-        run: yarn test
-  test-linux-x64-gnu-binding:
-    name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-      - name: Install dependencies
-        run: yarn install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-x86_64-unknown-linux-gnu
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build/bindings/nodejs node:${{ matrix.node }}-slim yarn test
-  test-linux-x64-musl-binding:
-    name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.libc "musl"
-          yarn install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-x86_64-unknown-linux-musl
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build/bindings/nodejs node:${{ matrix.node }}-alpine yarn test
-  test-linux-aarch64-gnu-binding:
-    name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-aarch64-unknown-linux-gnu
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "glibc"
-          yarn install
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: node:${{ matrix.node }}-slim
-          options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build/bindings/nodejs'
-          run: |
-            set -e
-            yarn test
-            ls -la
-  test-linux-aarch64-musl-binding:
-    name: Test bindings on aarch64-unknown-linux-musl - node@${{ matrix.node }}
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-aarch64-unknown-linux-musl
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "musl"
-          yarn install
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: node:lts-alpine
-          options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build/bindings/nodejs'
-          run: |
-            set -e
-            yarn test
-  test-linux-arm-gnueabihf-binding:
-    name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-armv7-unknown-linux-gnueabihf
-          path: bindings/nodejs/
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.cpu "arm"
-          yarn install
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: node:${{ matrix.node }}-bullseye-slim
-          options: '--platform linux/arm/v7 -v ${{ github.workspace }}:/build -w /build/bindings/nodejs'
-          run: |
-            set -e
-            yarn test
-            ls -la
-  universal-macOS:
-    name: Build universal macOS binary
-    needs:
-      - build
-    runs-on: macos-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-      - name: Install dependencies
-        run: yarn install
-      - name: Download macOS x64 artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-x86_64-apple-darwin
-          path: bindings/nodejs/artifacts
-      - name: Download macOS arm64 artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-aarch64-apple-darwin
-          path: bindings/nodejs/artifacts
-      - name: Combine binaries
-        run: yarn universal
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bindings-universal-apple-darwin
-          path: bindings/nodejs/${{ env.APP_NAME }}.*.node
-          if-no-files-found: error
-  publish:
-    name: Publish
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./bindings/nodejs
-    needs:
-      - test-macOS-windows-binding
-      - test-linux-x64-gnu-binding
-      - test-linux-x64-musl-binding
-      - test-linux-aarch64-gnu-binding
-      - test-linux-aarch64-musl-binding
-      - test-linux-arm-gnueabihf-binding
-      - universal-macOS
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: yarn
-          cache-dependency-path: "bindings/nodejs"
-      - name: Install dependencies
-        run: yarn install
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: bindings/nodejs/artifacts
-      - name: Move artifacts
-        run: yarn artifacts
-      - name: List packages
-        run: ls -R ./npm
-        shell: bash
-      - name: Publish
-        run: |
-          echo "${{ github.event.inputs.publish }}"
-          if [ "${{ github.event.inputs.publish }}" = "true" ]; then
-            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-            npm publish --access public
-            echo "Published to npm"
-          else
-            echo "Not a release, skipping publish"
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/pypi.yml

@@ -1,143 +0,0 @@
-name: Upload component to Python Package Index
-
-on:
-  workflow_dispatch:
-    inputs:
-      release:
-        type: boolean
-        default: false
-        required: false
-        description: "Release? If false, publish to test.pypi.org, if true, publish to pypi.org"
-
-permissions:
-  contents: read
-
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
-          sccache: 'true'
-          manylinux: auto
-          working-directory: bindings/python
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/dist
-
-  windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        target: [x64, x86]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-          architecture: ${{ matrix.target }}
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
-          sccache: 'true'
-          working-directory: bindings/python
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/dist
-
-  macos:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        target: [x86_64, aarch64]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Build wheels
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
-          sccache: 'true'
-          working-directory: bindings/python
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/dist
-
-  sdist:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build sdist
-        uses: PyO3/maturin-action@v1
-        with:
-          command: sdist
-          args: --out dist
-          working-directory: bindings/python
-      - name: Upload sdist
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/dist
-
-  publish-to-test-pypi:
-    if: ${{ github.event.inputs.release != 'true' }}
-    name: >-
-        Publish Python 🐍 distribution 📦 to Test PyPI
-    runs-on: ubuntu-latest
-    needs: [linux, windows, macos, sdist]
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/
-      - name: Publish distribution 📦 to Test PyPI
-        uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TEST_API_TOKEN }}
-          MATURIN_REPOSITORY_URL: "https://test.pypi.org/legacy/"
-        with:
-          command: upload
-          args: --skip-existing *
-          working-directory: bindings/python
-
-  publish-pypi:
-    if: ${{ github.event.inputs.release == 'true' }}
-    name: >-
-        Publish Python 🐍 distribution 📦 to PyPI
-    runs-on: ubuntu-latest
-    needs: [linux, windows, macos, sdist]
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: wheels
-          path: bindings/python/
-      - name: Publish distribution 📦 to PyPI
-        uses: PyO3/maturin-action@v1
-        env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-          MATURIN_REPOSITORY_URL: "https://upload.pypi.org/legacy/"
-        with:
-          command: upload
-          args: --skip-existing *
-          working-directory: bindings/python

.github/workflows/test-coverage.yaml

@@ -17,9 +17,8 @@ jobs:
       - name: Generate code coverage
         run: cargo llvm-cov --all-features --workspace --exclude pyroncalc --exclude wasm --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        uses: codecov/codecov-action@v3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: lcov.info
           fail_ci_if_error: true

.gitignore

@@ -1,3 +1,2 @@
 target/*
-**/node_modules/**
-.DS_Store
+.DS_Store

CHANGELOG.md

@@ -7,21 +7,12 @@
 - New function UNICODE ([#128](https://github.com/ironcalc/IronCalc/pull/128))
 - New document server (Thanks Dani!)
 - New function FORMULATEXT
-- Name Manager ([#212](https://github.com/ironcalc/IronCalc/pull/212) [#220](https://github.com/ironcalc/IronCalc/pull/220))
-- Add context menu. We can now insert rows and columns. Freeze and unfreeze rows and columns. Delete rows and columns [#271]
-- Add nodejs bindings [#254]
-- Add python bindings for all platforms
-- Add is split into the product and widget
-- Add Python documentation [#260]
 
 ### Fixed
 
 - Fixed several issues with pasting content
 - Fixed several issues with borders
 - Fixed bug where columns and rows could be resized to negative width and height, respectively
-- Undo/redo when add/delete sheet now works [#270]
-- Numerous small fixes
-- Multiple fixes to the documentation
 
 ## [0.2.0] - 2024-11-06 (The HN release)
 

Cargo.lock

@@ -85,12 +85,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "bitflags"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -216,15 +210,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
@@ -286,16 +271,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -414,7 +389,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc"
-version = "0.3.0"
+version = "0.2.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -430,7 +405,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_base"
-version = "0.3.0"
+version = "0.2.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -446,17 +421,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "ironcalc_nodejs"
-version = "0.3.1"
-dependencies = [
- "ironcalc",
- "napi",
- "napi-build",
- "napi-derive",
- "serde",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -496,16 +460,6 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
-[[package]]
-name = "libloading"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
-dependencies = [
- "cfg-if",
- "windows-targets",
-]
-
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -536,65 +490,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "napi"
-version = "2.16.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b"
-dependencies = [
- "bitflags",
- "ctor",
- "napi-derive",
- "napi-sys",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "napi-build"
-version = "2.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19"
-
-[[package]]
-name = "napi-derive"
-version = "2.16.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c"
-dependencies = [
- "cfg-if",
- "convert_case",
- "napi-derive-backend",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "napi-derive-backend"
-version = "1.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf"
-dependencies = [
- "convert_case",
- "once_cell",
- "proc-macro2",
- "quote",
- "regex",
- "semver",
- "syn",
-]
-
-[[package]]
-name = "napi-sys"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3"
-dependencies = [
- "libloading",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -721,9 +616,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.23.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
+checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -739,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
+checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -749,9 +644,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
+checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -759,9 +654,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
+checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -771,9 +666,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
+checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -784,7 +679,7 @@ dependencies = [
 
 [[package]]
 name = "pyroncalc"
-version = "0.3.0"
+version = "0.1.2"
 dependencies = [
  "ironcalc",
  "pyo3",
@@ -884,12 +779,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
-[[package]]
-name = "semver"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
-
 [[package]]
 name = "serde"
 version = "1.0.197"
@@ -1034,12 +923,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
 [[package]]
 name = "unindent"
 version = "0.2.3"
@@ -1070,7 +953,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm"
-version = "0.3.2"
+version = "0.1.3"
 dependencies = [
  "ironcalc_base",
  "serde",

Cargo.toml

@@ -6,12 +6,10 @@ members = [
   "xlsx",
   "bindings/wasm",
   "bindings/python",
-  "bindings/nodejs",
 ]
 
 exclude = [
   "generate_locale",
-  "webapp/app.ironcalc.com/server",
 ]
 
 [profile.release]

Makefile

@@ -2,8 +2,7 @@
 lint:
 	cargo fmt -- --check
 	cargo clippy --all-targets --all-features -- -W clippy::unwrap_used -W clippy::expect_used -W clippy::panic -D warnings
-	cd webapp/IronCalc/ && npm install && npm run check
-	cd webapp/app.ironcalc.com/frontend/ && npm install && npm run check
+	cd webapp && npm install && npm run check
 
 .PHONY: format
 format:
@@ -16,7 +15,7 @@ tests: lint
 	# Regretabbly we need to build the wasm twice, once for the nodejs tests
 	# and a second one for the vitest.
 	cd bindings/wasm/ && wasm-pack build --target nodejs && node tests/test.mjs && make
-	cd webapp/IronCalc/ && npm run test
+	cd webapp && npm run test
 	cd bindings/python && ./run_tests.sh && ./run_examples.sh
 
 .PHONY: remove-artifacts

base/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "ironcalc_base"
-version = "0.3.0"
+version = "0.2.0"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
-edition = "2024"
+edition = "2021"
 homepage = "https://www.ironcalc.com"
 repository = "https://github.com/ironcalc/ironcalc/"
-description = "Open source spreadsheet engine"
+description = "The democratization of spreadsheets"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

base/examples/formulas_and_errors.rs

@@ -1,4 +1,4 @@
-use ironcalc_base::{Model, types::CellType};
+use ironcalc_base::{types::CellType, Model};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;

base/examples/hello_world.rs

@@ -1,4 +1,4 @@
-use ironcalc_base::{Model, cell::CellValue};
+use ironcalc_base::{cell::CellValue, Model};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("hello-world", "en", "UTC")?;

base/src/actions.rs

@@ -136,33 +136,6 @@ impl Model {
             }),
         );
 
-        // In the list of columns:
-        // * Keep all the columns to the left
-        // * Displace all the columns to the right
-
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-
-        let mut new_columns = Vec::new();
-        for col in worksheet.cols.iter_mut() {
-            // range under study
-            let min = col.min;
-            let max = col.max;
-            if column > max {
-                // If the range under study is to our left, this is a noop
-            } else if column <= min {
-                // If the range under study is to our right, we displace it
-                col.min = min + column_count;
-                col.max = max + column_count;
-            } else {
-                // If the range under study is in the middle we augment it
-                col.max = max + column_count;
-            }
-            new_columns.push(col.clone());
-        }
-        // TODO: If in a row the cell to the right and left have the same style we should copy it
-
-        worksheet.cols = new_columns;
-
         Ok(())
     }
 

base/src/calc_result.rs

@@ -2,7 +2,6 @@ use std::cmp::Ordering;
 
 use crate::expressions::{token::Error, types::CellReferenceIndex};
 
-#[derive(Clone)]
 pub struct Range {
     pub left: CellReferenceIndex,
     pub right: CellReferenceIndex,

base/src/constants.rs

@@ -16,10 +16,3 @@ pub(crate) const LAST_ROW: i32 = 1_048_576;
 // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
 // The 2 days offset is because of Excel 1900 bug
 pub(crate) const EXCEL_DATE_BASE: i32 = 693_594;
-
-// We do not support dates before 1899-12-31.
-pub(crate) const MINIMUM_DATE_SERIAL_NUMBER: i32 = 1;
-
-// Excel can handle dates until the year 9999-12-31
-// 2958465 is the number of days from 1900-01-01 to 9999-12-31
-pub(crate) const MAXIMUM_DATE_SERIAL_NUMBER: i32 = 2_958_465;

base/src/diffs.rs

@@ -2,7 +2,7 @@ use crate::{
     expressions::{
         parser::{
             move_formula::ref_is_in_area,
-            stringify::{DisplaceData, to_string, to_string_displaced},
+            stringify::{to_string, to_string_displaced, DisplaceData},
             walk::forward_references,
         },
         types::{Area, CellReferenceIndex, CellReferenceRC},

base/src/expressions/lexer/ranges.rs

@@ -149,16 +149,14 @@ impl Lexer {
                         Ok(n) => n,
                         Err(_) => {
                             return Err(self
-                                .set_error(&format!("Failed parsing row {}", row_left), position));
+                                .set_error(&format!("Failed parsing row {}", row_left), position))
                         }
                     };
                     let row_right = match row_right.parse::<i32>() {
                         Ok(n) => n,
                         Err(_) => {
-                            return Err(self.set_error(
-                                &format!("Failed parsing row {}", row_right),
-                                position,
-                            ));
+                            return Err(self
+                                .set_error(&format!("Failed parsing row {}", row_right), position))
                         }
                     };
                     if row_left > LAST_ROW {

base/src/expressions/parser/mod.rs

@@ -164,9 +164,7 @@ pub enum Node {
         args: Vec<Node>,
     },
     ArrayKind(Vec<Node>),
-    DefinedNameKind((String, Option<u32>)),
-    TableNameKind(String),
-    WrongVariableKind(String),
+    VariableKind(String),
     CompareKind {
         kind: OpCompare,
         left: Box<Node>,
@@ -189,17 +187,12 @@ pub enum Node {
 pub struct Parser {
     lexer: lexer::Lexer,
     worksheets: Vec<String>,
-    defined_names: Vec<(String, Option<u32>)>,
-    context: CellReferenceRC,
+    context: Option<CellReferenceRC>,
     tables: HashMap<String, Table>,
 }
 
 impl Parser {
-    pub fn new(
-        worksheets: Vec<String>,
-        defined_names: Vec<(String, Option<u32>)>,
-        tables: HashMap<String, Table>,
-    ) -> Parser {
+    pub fn new(worksheets: Vec<String>, tables: HashMap<String, Table>) -> Parser {
         let lexer = lexer::Lexer::new(
             "",
             lexer::LexerMode::A1,
@@ -208,16 +201,10 @@ impl Parser {
             #[allow(clippy::expect_used)]
             get_language("en").expect(""),
         );
-        let context = CellReferenceRC {
-            sheet: worksheets.first().map_or("", |v| v).to_string(),
-            column: 1,
-            row: 1,
-        };
         Parser {
             lexer,
             worksheets,
-            defined_names,
-            context,
+            context: None,
             tables,
         }
     }
@@ -225,18 +212,13 @@ impl Parser {
         self.lexer.set_lexer_mode(mode)
     }
 
-    pub fn set_worksheets_and_names(
-        &mut self,
-        worksheets: Vec<String>,
-        defined_names: Vec<(String, Option<u32>)>,
-    ) {
+    pub fn set_worksheets(&mut self, worksheets: Vec<String>) {
         self.worksheets = worksheets;
-        self.defined_names = defined_names;
     }
 
-    pub fn parse(&mut self, formula: &str, context: &CellReferenceRC) -> Node {
+    pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node {
         self.lexer.set_formula(formula);
-        self.context = context.clone();
+        self.context.clone_from(context);
         self.parse_expr()
     }
 
@@ -250,24 +232,6 @@ impl Parser {
         None
     }
 
-    // Returns:
-    //  * None: If there is no defined name by that name
-    //  * Some(Some(index)): If there is a defined name local to that sheet
-    //  * Some(None): If there is a global defined name
-    fn get_defined_name(&self, name: &str, sheet: u32) -> Option<Option<u32>> {
-        for (df_name, df_scope) in &self.defined_names {
-            if name.to_lowercase() == df_name.to_lowercase() && df_scope == &Some(sheet) {
-                return Some(*df_scope);
-            }
-        }
-        for (df_name, df_scope) in &self.defined_names {
-            if name.to_lowercase() == df_name.to_lowercase() && df_scope.is_none() {
-                return Some(None);
-            }
-        }
-        None
-    }
-
     fn parse_expr(&mut self) -> Node {
         let mut t = self.parse_concat();
         if let Node::ParseErrorKind { .. } = t {
@@ -482,7 +446,16 @@ impl Parser {
                 absolute_column,
                 absolute_row,
             } => {
-                let context = &self.context;
+                let context = match &self.context {
+                    Some(c) => c,
+                    None => {
+                        return Node::ParseErrorKind {
+                            formula: self.lexer.get_formula(),
+                            position: self.lexer.get_position() as usize,
+                            message: "Expected context for the reference".to_string(),
+                        }
+                    }
+                };
                 let sheet_index = match &sheet {
                     Some(name) => self.get_sheet_index_by_name(name),
                     None => self.get_sheet_index_by_name(&context.sheet),
@@ -517,7 +490,16 @@ impl Parser {
                 }
             }
             TokenType::Range { sheet, left, right } => {
-                let context = &self.context;
+                let context = match &self.context {
+                    Some(c) => c,
+                    None => {
+                        return Node::ParseErrorKind {
+                            formula: self.lexer.get_formula(),
+                            position: self.lexer.get_position() as usize,
+                            message: "Expected context for the reference".to_string(),
+                        }
+                    }
+                };
                 let sheet_index = match &sheet {
                     Some(name) => self.get_sheet_index_by_name(name),
                     None => self.get_sheet_index_by_name(&context.sheet),
@@ -603,33 +585,11 @@ impl Parser {
                             kind: function_kind,
                             args,
                         };
-                    }
-                    return Node::InvalidFunctionKind { name, args };
-                }
-                let context = &self.context;
-
-                let context_sheet_index = match self.get_sheet_index_by_name(&context.sheet) {
-                    Some(i) => i,
-                    None => {
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: 0,
-                            message: "sheet not found".to_string(),
-                        };
-                    }
-                };
-
-                // Could be a defined name or a table
-                if let Some(scope) = self.get_defined_name(&name, context_sheet_index) {
-                    return Node::DefinedNameKind((name, scope));
-                }
-                let name_lower = name.to_lowercase();
-                for table_name in self.tables.keys() {
-                    if table_name.to_lowercase() == name_lower {
-                        return Node::TableNameKind(name);
+                    } else {
+                        return Node::InvalidFunctionKind { name, args };
                     }
                 }
-                Node::WrongVariableKind(name)
+                Node::VariableKind(name)
             }
             TokenType::Error(kind) => Node::ErrorKind(kind),
             TokenType::Illegal(error) => Node::ParseErrorKind {
@@ -642,38 +602,7 @@ impl Parser {
                 position: 0,
                 message: "Unexpected end of input.".to_string(),
             },
-            TokenType::Boolean(value) => {
-                // Could be a function call "TRUE()"
-                let next_token = self.lexer.peek_token();
-                if next_token == TokenType::LeftParenthesis {
-                    self.lexer.advance_token();
-                    // We parse all the arguments, although technically this is moot
-                    // But is has the upside of transforming `=TRUE( 4 )` into `=TRUE(4)`
-                    let args = match self.parse_function_args() {
-                        Ok(s) => s,
-                        Err(e) => return e,
-                    };
-                    if let Err(err) = self.lexer.expect(TokenType::RightParenthesis) {
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: err.position,
-                            message: err.message,
-                        };
-                    }
-                    if value {
-                        return Node::FunctionKind {
-                            kind: Function::True,
-                            args,
-                        };
-                    } else {
-                        return Node::FunctionKind {
-                            kind: Function::False,
-                            args,
-                        };
-                    }
-                }
-                Node::BooleanKind(value)
-            }
+            TokenType::Boolean(value) => Node::BooleanKind(value),
             TokenType::Compare(_) => {
                 // A primary Node cannot start with an operator
                 Node::ParseErrorKind {
@@ -732,177 +661,187 @@ impl Parser {
                 // We will try to convert to a normal reference
                 // table_name[column_name] => cell1:cell2
                 // table_name[[#This Row], [column_name]:[column_name]] => cell1:cell2
-                let context = &self.context;
-                let context_sheet_index = match self.get_sheet_index_by_name(&context.sheet) {
-                    Some(i) => i,
-                    None => {
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: 0,
-                            message: "sheet not found".to_string(),
-                        };
-                    }
-                };
-                // table-name => table
-                let table = match self.tables.get(&table_name) {
-                    Some(t) => t,
-                    None => {
-                        let message = format!(
-                            "Table not found: '{table_name}' at '{}!{}{}'",
-                            context.sheet,
-                            number_to_column(context.column)
-                                .unwrap_or(format!("{}", context.column)),
-                            context.row
-                        );
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: 0,
-                            message,
-                        };
-                    }
-                };
-                let table_sheet_index = match self.get_sheet_index_by_name(&table.sheet_name) {
-                    Some(i) => i,
-                    None => {
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: 0,
-                            message: "sheet not found".to_string(),
-                        };
-                    }
-                };
-
-                let sheet_name = if table_sheet_index == context_sheet_index {
-                    None
-                } else {
-                    Some(table.sheet_name.clone())
-                };
-
-                // context must be with tables.reference
-                #[allow(clippy::expect_used)]
-                let (column_start, mut row_start, column_end, mut row_end) =
-                    parse_range(&table.reference).expect("Failed parsing range");
-
-                let totals_row_count = table.totals_row_count as i32;
-                let header_row_count = table.header_row_count as i32;
-                row_end -= totals_row_count;
-
-                match specifier {
-                    Some(token::TableSpecifier::ThisRow) => {
-                        row_start = context.row;
-                        row_end = context.row;
-                    }
-                    Some(token::TableSpecifier::Totals) => {
-                        if totals_row_count != 0 {
-                            row_start = row_end + 1;
-                            row_end = row_start;
-                        } else {
-                            // Table1[#Totals] is #REF! if Table1 does not have totals
-                            return Node::ErrorKind(token::Error::REF);
-                        }
-                    }
-                    Some(token::TableSpecifier::Headers) => {
-                        row_end = row_start;
-                    }
-                    Some(token::TableSpecifier::Data) => {
-                        row_start += header_row_count;
-                    }
-                    Some(token::TableSpecifier::All) => {
-                        if totals_row_count != 0 {
-                            row_end += 1;
-                        }
-                    }
-                    None => {
-                        // skip the headers
-                        row_start += header_row_count;
-                    }
-                }
-                match table_reference {
-                    None => Node::RangeKind {
-                        sheet_name,
-                        sheet_index: table_sheet_index,
-                        absolute_row1: true,
-                        absolute_column1: true,
-                        row1: row_start,
-                        column1: column_start,
-                        absolute_row2: true,
-                        absolute_column2: true,
-                        row2: row_end,
-                        column2: column_end,
-                    },
-                    Some(TableReference::ColumnReference(s)) => {
-                        let column_index = match get_table_column_by_name(&s, table) {
-                            Some(s) => s + column_start,
-                            None => {
-                                return Node::ParseErrorKind {
-                                    formula: self.lexer.get_formula(),
-                                    position: self.lexer.get_position() as usize,
-                                    message: format!("Expecting column: {s} in table {table_name}"),
-                                };
-                            }
-                        };
-                        if row_start == row_end {
-                            return Node::ReferenceKind {
-                                sheet_name,
-                                sheet_index: table_sheet_index,
-                                absolute_row: true,
-                                absolute_column: true,
-                                row: row_start,
-                                column: column_index,
+                if let Some(context) = &self.context {
+                    let context_sheet_index = match self.get_sheet_index_by_name(&context.sheet) {
+                        Some(i) => i,
+                        None => {
+                            return Node::ParseErrorKind {
+                                formula: self.lexer.get_formula(),
+                                position: 0,
+                                message: "sheet not found".to_string(),
                             };
                         }
-                        Node::RangeKind {
-                            sheet_name,
-                            sheet_index: table_sheet_index,
-                            absolute_row1: true,
-                            absolute_column1: true,
-                            row1: row_start,
-                            column1: column_index,
-                            absolute_row2: true,
-                            absolute_column2: true,
-                            row2: row_end,
-                            column2: column_index,
+                    };
+                    // table-name => table
+                    let table = match self.tables.get(&table_name) {
+                        Some(t) => t,
+                        None => {
+                            let message = format!(
+                                "Table not found: '{table_name}' at '{}!{}{}'",
+                                context.sheet,
+                                number_to_column(context.column)
+                                    .unwrap_or(format!("{}", context.column)),
+                                context.row
+                            );
+                            return Node::ParseErrorKind {
+                                formula: self.lexer.get_formula(),
+                                position: 0,
+                                message,
+                            };
                         }
-                    }
-                    Some(TableReference::RangeReference((left, right))) => {
-                        let left_column_index = match get_table_column_by_name(&left, table) {
-                            Some(f) => f + column_start,
-                            None => {
-                                return Node::ParseErrorKind {
-                                    formula: self.lexer.get_formula(),
-                                    position: self.lexer.get_position() as usize,
-                                    message: format!(
-                                        "Expecting column: {left} in table {table_name}"
-                                    ),
-                                };
-                            }
-                        };
+                    };
+                    let table_sheet_index = match self.get_sheet_index_by_name(&table.sheet_name) {
+                        Some(i) => i,
+                        None => {
+                            return Node::ParseErrorKind {
+                                formula: self.lexer.get_formula(),
+                                position: 0,
+                                message: "sheet not found".to_string(),
+                            };
+                        }
+                    };
 
-                        let right_column_index = match get_table_column_by_name(&right, table) {
-                            Some(f) => f + column_start,
-                            None => {
-                                return Node::ParseErrorKind {
-                                    formula: self.lexer.get_formula(),
-                                    position: self.lexer.get_position() as usize,
-                                    message: format!(
-                                        "Expecting column: {right} in table {table_name}"
-                                    ),
-                                };
+                    let sheet_name = if table_sheet_index == context_sheet_index {
+                        None
+                    } else {
+                        Some(table.sheet_name.clone())
+                    };
+
+                    // context must be with tables.reference
+                    #[allow(clippy::expect_used)]
+                    let (column_start, mut row_start, column_end, mut row_end) =
+                        parse_range(&table.reference).expect("Failed parsing range");
+
+                    let totals_row_count = table.totals_row_count as i32;
+                    let header_row_count = table.header_row_count as i32;
+                    row_end -= totals_row_count;
+
+                    match specifier {
+                        Some(token::TableSpecifier::ThisRow) => {
+                            row_start = context.row;
+                            row_end = context.row;
+                        }
+                        Some(token::TableSpecifier::Totals) => {
+                            if totals_row_count != 0 {
+                                row_start = row_end + 1;
+                                row_end = row_start;
+                            } else {
+                                // Table1[#Totals] is #REF! if Table1 does not have totals
+                                return Node::ErrorKind(token::Error::REF);
                             }
-                        };
-                        Node::RangeKind {
-                            sheet_name,
-                            sheet_index: table_sheet_index,
-                            absolute_row1: true,
-                            absolute_column1: true,
-                            row1: row_start,
-                            column1: left_column_index,
-                            absolute_row2: true,
-                            absolute_column2: true,
-                            row2: row_end,
-                            column2: right_column_index,
+                        }
+                        Some(token::TableSpecifier::Headers) => {
+                            row_end = row_start;
+                        }
+                        Some(token::TableSpecifier::Data) => {
+                            row_start += header_row_count;
+                        }
+                        Some(token::TableSpecifier::All) => {
+                            if totals_row_count != 0 {
+                                row_end += 1;
+                            }
+                        }
+                        None => {
+                            // skip the headers
+                            row_start += header_row_count;
                         }
                     }
+                    match table_reference {
+                        None => {
+                            return Node::RangeKind {
+                                sheet_name,
+                                sheet_index: table_sheet_index,
+                                absolute_row1: true,
+                                absolute_column1: true,
+                                row1: row_start,
+                                column1: column_start,
+                                absolute_row2: true,
+                                absolute_column2: true,
+                                row2: row_end,
+                                column2: column_end,
+                            };
+                        }
+                        Some(TableReference::ColumnReference(s)) => {
+                            let column_index = match get_table_column_by_name(&s, table) {
+                                Some(s) => s + column_start,
+                                None => {
+                                    return Node::ParseErrorKind {
+                                        formula: self.lexer.get_formula(),
+                                        position: self.lexer.get_position() as usize,
+                                        message: format!(
+                                            "Expecting column: {s} in table {table_name}"
+                                        ),
+                                    };
+                                }
+                            };
+                            if row_start == row_end {
+                                return Node::ReferenceKind {
+                                    sheet_name,
+                                    sheet_index: table_sheet_index,
+                                    absolute_row: true,
+                                    absolute_column: true,
+                                    row: row_start,
+                                    column: column_index,
+                                };
+                            }
+                            return Node::RangeKind {
+                                sheet_name,
+                                sheet_index: table_sheet_index,
+                                absolute_row1: true,
+                                absolute_column1: true,
+                                row1: row_start,
+                                column1: column_index,
+                                absolute_row2: true,
+                                absolute_column2: true,
+                                row2: row_end,
+                                column2: column_index,
+                            };
+                        }
+                        Some(TableReference::RangeReference((left, right))) => {
+                            let left_column_index = match get_table_column_by_name(&left, table) {
+                                Some(f) => f + column_start,
+                                None => {
+                                    return Node::ParseErrorKind {
+                                        formula: self.lexer.get_formula(),
+                                        position: self.lexer.get_position() as usize,
+                                        message: format!(
+                                            "Expecting column: {left} in table {table_name}"
+                                        ),
+                                    };
+                                }
+                            };
+
+                            let right_column_index = match get_table_column_by_name(&right, table) {
+                                Some(f) => f + column_start,
+                                None => {
+                                    return Node::ParseErrorKind {
+                                        formula: self.lexer.get_formula(),
+                                        position: self.lexer.get_position() as usize,
+                                        message: format!(
+                                            "Expecting column: {right} in table {table_name}"
+                                        ),
+                                    };
+                                }
+                            };
+                            return Node::RangeKind {
+                                sheet_name,
+                                sheet_index: table_sheet_index,
+                                absolute_row1: true,
+                                absolute_column1: true,
+                                row1: row_start,
+                                column1: left_column_index,
+                                absolute_row2: true,
+                                absolute_column2: true,
+                                row2: row_end,
+                                column2: right_column_index,
+                            };
+                        }
+                    }
+                }
+                Node::ParseErrorKind {
+                    formula: self.lexer.get_formula(),
+                    position: 0,
+                    message: "Structured references not supported in R1C1 mode".to_string(),
                 }
             }
         }

base/src/expressions/parser/move_formula.rs

@@ -1,6 +1,6 @@
 use super::{
+    stringify::{stringify_reference, DisplaceData},
     Node, Reference,
-    stringify::{DisplaceData, stringify_reference},
 };
 use crate::{
     constants::{LAST_COLUMN, LAST_ROW},
@@ -375,9 +375,7 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
             }
             format!("{{{}}}", arguments)
         }
-        DefinedNameKind((name, _)) => name.to_string(),
-        TableNameKind(name) => name.to_string(),
-        WrongVariableKind(name) => name.to_string(),
+        VariableKind(value) => value.to_string(),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
             to_string_moved(left, move_context),

base/src/expressions/parser/stringify.rs

@@ -464,9 +464,7 @@ fn stringify(
                 | ReferenceKind { .. }
                 | RangeKind { .. }
                 | WrongReferenceKind { .. }
-                | DefinedNameKind(_)
-                | TableNameKind(_)
-                | WrongVariableKind(_)
+                | VariableKind(_)
                 | WrongRangeKind { .. } => {
                     stringify(left, context, displace_data, use_original_name)
                 }
@@ -494,9 +492,7 @@ fn stringify(
                 | ReferenceKind { .. }
                 | RangeKind { .. }
                 | WrongReferenceKind { .. }
-                | DefinedNameKind(_)
-                | TableNameKind(_)
-                | WrongVariableKind(_)
+                | VariableKind(_)
                 | WrongRangeKind { .. } => {
                     stringify(right, context, displace_data, use_original_name)
                 }
@@ -547,9 +543,7 @@ fn stringify(
             }
             format!("{{{}}}", arguments)
         }
-        TableNameKind(value) => value.to_string(),
-        DefinedNameKind((name, _)) => name.to_string(),
-        WrongVariableKind(name) => name.to_string(),
+        VariableKind(value) => value.to_string(),
         UnaryKind { kind, right } => match kind {
             OpUnary::Minus => {
                 format!(
@@ -666,90 +660,7 @@ pub(crate) fn rename_sheet_in_node(node: &mut Node, sheet_index: u32, new_name:
         Node::ErrorKind(_) => {}
         Node::ParseErrorKind { .. } => {}
         Node::ArrayKind(_) => {}
-        Node::DefinedNameKind(_) => {}
-        Node::TableNameKind(_) => {}
-        Node::WrongVariableKind(_) => {}
+        Node::VariableKind(_) => {}
         Node::EmptyArgKind => {}
     }
 }
-
-pub(crate) fn rename_defined_name_in_node(
-    node: &mut Node,
-    name: &str,
-    scope: Option<u32>,
-    new_name: &str,
-) {
-    match node {
-        // Rename
-        Node::DefinedNameKind((n, s)) => {
-            if name.to_lowercase() == n.to_lowercase() && *s == scope {
-                *n = new_name.to_string();
-            }
-        }
-        // Go next level
-        Node::OpRangeKind { left, right } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::OpConcatenateKind { left, right } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::OpSumKind {
-            kind: _,
-            left,
-            right,
-        } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::OpProductKind {
-            kind: _,
-            left,
-            right,
-        } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::OpPowerKind { left, right } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::FunctionKind { kind: _, args } => {
-            for arg in args {
-                rename_defined_name_in_node(arg, name, scope, new_name);
-            }
-        }
-        Node::InvalidFunctionKind { name: _, args } => {
-            for arg in args {
-                rename_defined_name_in_node(arg, name, scope, new_name);
-            }
-        }
-        Node::CompareKind {
-            kind: _,
-            left,
-            right,
-        } => {
-            rename_defined_name_in_node(left, name, scope, new_name);
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-        Node::UnaryKind { kind: _, right } => {
-            rename_defined_name_in_node(right, name, scope, new_name);
-        }
-
-        // Do nothing
-        Node::BooleanKind(_) => {}
-        Node::NumberKind(_) => {}
-        Node::StringKind(_) => {}
-        Node::ErrorKind(_) => {}
-        Node::ParseErrorKind { .. } => {}
-        Node::ArrayKind(_) => {}
-        Node::EmptyArgKind => {}
-        Node::ReferenceKind { .. } => {}
-        Node::RangeKind { .. } => {}
-        Node::WrongReferenceKind { .. } => {}
-        Node::WrongRangeKind { .. } => {}
-        Node::TableNameKind(_) => {}
-        Node::WrongVariableKind(_) => {}
-    }
-}

base/src/expressions/parser/tests/test_general.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 use crate::expressions::parser::stringify::{
-    DisplaceData, to_rc_format, to_string, to_string_displaced,
+    to_rc_format, to_string, to_string_displaced, DisplaceData,
 };
 use crate::expressions::parser::{Node, Parser};
 use crate::expressions::types::CellReferenceRC;
@@ -17,7 +17,7 @@ struct Formula<'a> {
 #[test]
 fn test_parser_reference() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -25,14 +25,14 @@ fn test_parser_reference() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("A2", &cell_reference);
+    let t = parser.parse("A2", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R[1]C[0]");
 }
 
 #[test]
 fn test_parser_absolute_column() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -40,14 +40,14 @@ fn test_parser_absolute_column() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("$A1", &cell_reference);
+    let t = parser.parse("$A1", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R[0]C1");
 }
 
 #[test]
 fn test_parser_absolute_row_col() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -55,14 +55,14 @@ fn test_parser_absolute_row_col() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("$C$5", &cell_reference);
+    let t = parser.parse("$C$5", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R5C3");
 }
 
 #[test]
 fn test_parser_absolute_row_col_1() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -70,14 +70,14 @@ fn test_parser_absolute_row_col_1() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("$A$1", &cell_reference);
+    let t = parser.parse("$A$1", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R1C1");
 }
 
 #[test]
 fn test_parser_simple_formula() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -86,14 +86,14 @@ fn test_parser_simple_formula() {
         column: 1,
     };
 
-    let t = parser.parse("C3+Sheet2!D4", &cell_reference);
+    let t = parser.parse("C3+Sheet2!D4", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R[2]C[2]+Sheet2!R[3]C[3]");
 }
 
 #[test]
 fn test_parser_boolean() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -102,14 +102,14 @@ fn test_parser_boolean() {
         column: 1,
     };
 
-    let t = parser.parse("true", &cell_reference);
+    let t = parser.parse("true", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "TRUE");
 }
 
 #[test]
 fn test_parser_bad_formula() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -117,7 +117,7 @@ fn test_parser_bad_formula() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("#Value", &cell_reference);
+    let t = parser.parse("#Value", &Some(cell_reference));
     match &t {
         Node::ParseErrorKind {
             formula,
@@ -138,7 +138,7 @@ fn test_parser_bad_formula() {
 #[test]
 fn test_parser_bad_formula_1() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -146,7 +146,7 @@ fn test_parser_bad_formula_1() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("<5", &cell_reference);
+    let t = parser.parse("<5", &Some(cell_reference));
     match &t {
         Node::ParseErrorKind {
             formula,
@@ -167,7 +167,7 @@ fn test_parser_bad_formula_1() {
 #[test]
 fn test_parser_bad_formula_2() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -175,7 +175,7 @@ fn test_parser_bad_formula_2() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("*5", &cell_reference);
+    let t = parser.parse("*5", &Some(cell_reference));
     match &t {
         Node::ParseErrorKind {
             formula,
@@ -196,7 +196,7 @@ fn test_parser_bad_formula_2() {
 #[test]
 fn test_parser_bad_formula_3() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -204,7 +204,7 @@ fn test_parser_bad_formula_3() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("SUM(#VALVE!)", &cell_reference);
+    let t = parser.parse("SUM(#VALVE!)", &Some(cell_reference));
     match &t {
         Node::ParseErrorKind {
             formula,
@@ -225,7 +225,7 @@ fn test_parser_bad_formula_3() {
 #[test]
 fn test_parser_formulas() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -259,11 +259,11 @@ fn test_parser_formulas() {
     for formula in formulas {
         let t = parser.parse(
             formula.initial,
-            &CellReferenceRC {
+            &Some(CellReferenceRC {
                 sheet: "Sheet1".to_string(),
                 row: 1,
                 column: 1,
-            },
+            }),
         );
         assert_eq!(to_rc_format(&t), formula.expected);
         assert_eq!(to_string(&t, &cell_reference), formula.initial);
@@ -273,7 +273,7 @@ fn test_parser_formulas() {
 #[test]
 fn test_parser_r1c1_formulas() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
     parser.set_lexer_mode(LexerMode::R1C1);
 
     let formulas = vec![
@@ -324,11 +324,11 @@ fn test_parser_r1c1_formulas() {
     for formula in formulas {
         let t = parser.parse(
             formula.initial,
-            &CellReferenceRC {
+            &Some(CellReferenceRC {
                 sheet: "Sheet1".to_string(),
                 row: 1,
                 column: 1,
-            },
+            }),
         );
         assert_eq!(to_string(&t, &cell_reference), formula.expected);
         assert_eq!(to_rc_format(&t), formula.initial);
@@ -338,7 +338,7 @@ fn test_parser_r1c1_formulas() {
 #[test]
 fn test_parser_quotes() {
     let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -347,14 +347,14 @@ fn test_parser_quotes() {
         column: 1,
     };
 
-    let t = parser.parse("C3+'Second Sheet'!D4", &cell_reference);
+    let t = parser.parse("C3+'Second Sheet'!D4", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R[2]C[2]+'Second Sheet'!R[3]C[3]");
 }
 
 #[test]
 fn test_parser_escape_quotes() {
     let worksheets = vec!["Sheet1".to_string(), "Second '2' Sheet".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -363,14 +363,14 @@ fn test_parser_escape_quotes() {
         column: 1,
     };
 
-    let t = parser.parse("C3+'Second ''2'' Sheet'!D4", &cell_reference);
+    let t = parser.parse("C3+'Second ''2'' Sheet'!D4", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "R[2]C[2]+'Second ''2'' Sheet'!R[3]C[3]");
 }
 
 #[test]
 fn test_parser_parenthesis() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -379,14 +379,14 @@ fn test_parser_parenthesis() {
         column: 1,
     };
 
-    let t = parser.parse("(C3=\"Yes\")*5", &cell_reference);
+    let t = parser.parse("(C3=\"Yes\")*5", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "(R[2]C[2]=\"Yes\")*5");
 }
 
 #[test]
 fn test_parser_excel_xlfn() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -395,7 +395,7 @@ fn test_parser_excel_xlfn() {
         column: 1,
     };
 
-    let t = parser.parse("_xlfn.CONCAT(C3)", &cell_reference);
+    let t = parser.parse("_xlfn.CONCAT(C3)", &Some(cell_reference));
     assert_eq!(to_rc_format(&t), "CONCAT(R[2]C[2])");
 }
 
@@ -407,9 +407,9 @@ fn test_to_string_displaced() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
-    let node = parser.parse("C3", context);
+    let node = parser.parse("C3", &Some(context.clone()));
     let displace_data = DisplaceData::Column {
         sheet: 0,
         column: 1,
@@ -427,9 +427,9 @@ fn test_to_string_displaced_full_ranges() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
-    let node = parser.parse("SUM(3:3)", context);
+    let node = parser.parse("SUM(3:3)", &Some(context.clone()));
     let displace_data = DisplaceData::Column {
         sheet: 0,
         column: 1,
@@ -440,7 +440,7 @@ fn test_to_string_displaced_full_ranges() {
         "SUM(3:3)".to_string()
     );
 
-    let node = parser.parse("SUM(D:D)", context);
+    let node = parser.parse("SUM(D:D)", &Some(context.clone()));
     let displace_data = DisplaceData::Row {
         sheet: 0,
         row: 3,
@@ -460,9 +460,9 @@ fn test_to_string_displaced_too_low() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
-    let node = parser.parse("C3", context);
+    let node = parser.parse("C3", &Some(context.clone()));
     let displace_data = DisplaceData::Column {
         sheet: 0,
         column: 1,
@@ -480,9 +480,9 @@ fn test_to_string_displaced_too_high() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
-    let node = parser.parse("C3", context);
+    let node = parser.parse("C3", &Some(context.clone()));
     let displace_data = DisplaceData::Column {
         sheet: 0,
         column: 1,

base/src/expressions/parser/tests/test_issue_155.rs

@@ -2,14 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::Parser;
 use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn issue_155_parser() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -17,14 +17,14 @@ fn issue_155_parser() {
         row: 2,
         column: 2,
     };
-    let t = parser.parse("A$1:A2", &cell_reference);
+    let t = parser.parse("A$1:A2", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "A$1:A2");
 }
 
 #[test]
 fn issue_155_parser_case_2() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -32,14 +32,14 @@ fn issue_155_parser_case_2() {
         row: 20,
         column: 20,
     };
-    let t = parser.parse("C$1:D2", &cell_reference);
+    let t = parser.parse("C$1:D2", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "C$1:D2");
 }
 
 #[test]
 fn issue_155_parser_only_row() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -48,14 +48,14 @@ fn issue_155_parser_only_row() {
         column: 20,
     };
     // This is tricky, I am not sure what to do in these cases
-    let t = parser.parse("A$2:B1", &cell_reference);
+    let t = parser.parse("A$2:B1", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "A1:B$2");
 }
 
 #[test]
 fn issue_155_parser_only_column() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -64,6 +64,6 @@ fn issue_155_parser_only_column() {
         column: 20,
     };
     // This is tricky, I am not sure what to do in these cases
-    let t = parser.parse("D1:$A3", &cell_reference);
+    let t = parser.parse("D1:$A3", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "$A1:D3");
 }

base/src/expressions/parser/tests/test_move_formula.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
+use crate::expressions::parser::move_formula::{move_formula, MoveContext};
 use crate::expressions::parser::Parser;
-use crate::expressions::parser::move_formula::{MoveContext, move_formula};
 use crate::expressions::types::{Area, CellReferenceRC};
 
 #[test]
@@ -15,7 +15,7 @@ fn test_move_formula() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -27,7 +27,7 @@ fn test_move_formula() {
     };
 
     // formula AB31 will not change
-    let node = parser.parse("AB31", context);
+    let node = parser.parse("AB31", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -43,7 +43,7 @@ fn test_move_formula() {
     assert_eq!(t, "AB31");
 
     // formula $AB$31 will not change
-    let node = parser.parse("AB31", context);
+    let node = parser.parse("AB31", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -59,7 +59,7 @@ fn test_move_formula() {
     assert_eq!(t, "AB31");
 
     // but formula D5 will change to N15  (N = D + 10)
-    let node = parser.parse("D5", context);
+    let node = parser.parse("D5", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -75,7 +75,7 @@ fn test_move_formula() {
     assert_eq!(t, "N15");
 
     // Also formula $D$5 will change to N15  (N = D + 10)
-    let node = parser.parse("$D$5", context);
+    let node = parser.parse("$D$5", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -102,7 +102,7 @@ fn test_move_formula_context_offset() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -113,7 +113,7 @@ fn test_move_formula_context_offset() {
         height: 5,
     };
 
-    let node = parser.parse("-X9+C2%", context);
+    let node = parser.parse("-X9+C2%", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -140,7 +140,7 @@ fn test_move_formula_area_limits() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -152,7 +152,7 @@ fn test_move_formula_area_limits() {
     };
 
     // Outside of the area. Not moved
-    let node = parser.parse("B2+B3+C1+G6+H5", context);
+    let node = parser.parse("B2+B3+C1+G6+H5", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -168,7 +168,7 @@ fn test_move_formula_area_limits() {
     assert_eq!(t, "B2+B3+C1+G6+H5");
 
     // In the area. Moved
-    let node = parser.parse("C2+F4+F5+F6", context);
+    let node = parser.parse("C2+F4+F5+F6", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -195,7 +195,7 @@ fn test_move_formula_ranges() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     let area = &Area {
         sheet: 0,
@@ -205,7 +205,7 @@ fn test_move_formula_ranges() {
         height: 5,
     };
     // Ranges inside the area are fully displaced (absolute or not)
-    let node = parser.parse("SUM(C2:F5)", context);
+    let node = parser.parse("SUM(C2:F5)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -220,7 +220,7 @@ fn test_move_formula_ranges() {
     );
     assert_eq!(t, "SUM(M12:P15)");
 
-    let node = parser.parse("SUM($C$2:$F$5)", context);
+    let node = parser.parse("SUM($C$2:$F$5)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -236,7 +236,7 @@ fn test_move_formula_ranges() {
     assert_eq!(t, "SUM($M$12:$P$15)");
 
     // Ranges completely outside of the area are not touched
-    let node = parser.parse("SUM(A1:B3)", context);
+    let node = parser.parse("SUM(A1:B3)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -251,7 +251,7 @@ fn test_move_formula_ranges() {
     );
     assert_eq!(t, "SUM(A1:B3)");
 
-    let node = parser.parse("SUM($A$1:$B$3)", context);
+    let node = parser.parse("SUM($A$1:$B$3)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -267,7 +267,7 @@ fn test_move_formula_ranges() {
     assert_eq!(t, "SUM($A$1:$B$3)");
 
     // Ranges that overlap with the area are also NOT displaced
-    let node = parser.parse("SUM(A1:F5)", context);
+    let node = parser.parse("SUM(A1:F5)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -283,7 +283,7 @@ fn test_move_formula_ranges() {
     assert_eq!(t, "SUM(A1:F5)");
 
     // Ranges that contain the area are also NOT displaced
-    let node = parser.parse("SUM(A1:X50)", context);
+    let node = parser.parse("SUM(A1:X50)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -318,10 +318,10 @@ fn test_move_formula_wrong_reference() {
         height: 5,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Wrong formulas will NOT be displaced
-    let node = parser.parse("Sheet3!AB31", context);
+    let node = parser.parse("Sheet3!AB31", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -335,7 +335,7 @@ fn test_move_formula_wrong_reference() {
         },
     );
     assert_eq!(t, "Sheet3!AB31");
-    let node = parser.parse("Sheet3!$X$9", context);
+    let node = parser.parse("Sheet3!$X$9", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -350,7 +350,7 @@ fn test_move_formula_wrong_reference() {
     );
     assert_eq!(t, "Sheet3!$X$9");
 
-    let node = parser.parse("SUM(Sheet3!D2:D3)", context);
+    let node = parser.parse("SUM(Sheet3!D2:D3)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -377,7 +377,7 @@ fn test_move_formula_misc() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -387,7 +387,7 @@ fn test_move_formula_misc() {
         width: 4,
         height: 5,
     };
-    let node = parser.parse("X9^C2-F4*H2", context);
+    let node = parser.parse("X9^C2-F4*H2", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -402,7 +402,7 @@ fn test_move_formula_misc() {
     );
     assert_eq!(t, "X9^M12-P14*H2");
 
-    let node = parser.parse("F5*(-D5)*SUM(A1, X9, $D$5)", context);
+    let node = parser.parse("F5*(-D5)*SUM(A1, X9, $D$5)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -417,7 +417,7 @@ fn test_move_formula_misc() {
     );
     assert_eq!(t, "P15*(-N15)*SUM(A1,X9,$N$15)");
 
-    let node = parser.parse("IF(F5 < -D5, X9 & F5, FALSE)", context);
+    let node = parser.parse("IF(F5 < -D5, X9 & F5, FALSE)", &Some(context.clone()));
     let t = move_formula(
         &node,
         &MoveContext {
@@ -445,7 +445,7 @@ fn test_move_formula_another_sheet() {
     };
     // we add two sheets and we cut/paste from Sheet1 to Sheet2
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -457,7 +457,10 @@ fn test_move_formula_another_sheet() {
     };
 
     // Formula AB31 and JJ3:JJ4 refers to original Sheet1!AB31 and Sheet1!JJ3:JJ4
-    let node = parser.parse("AB31*SUM(JJ3:JJ4)+SUM(Sheet2!C2:F6)*SUM(C2:F6)", context);
+    let node = parser.parse(
+        "AB31*SUM(JJ3:JJ4)+SUM(Sheet2!C2:F6)*SUM(C2:F6)",
+        &Some(context.clone()),
+    );
     let t = move_formula(
         &node,
         &MoveContext {

base/src/expressions/parser/tests/test_ranges.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 
-use crate::expressions::parser::Parser;
 use crate::expressions::parser::stringify::{to_rc_format, to_string};
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {
@@ -14,7 +14,7 @@ struct Formula<'a> {
 #[test]
 fn test_parser_formulas_with_full_ranges() {
     let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -52,11 +52,11 @@ fn test_parser_formulas_with_full_ranges() {
     for formula in &formulas {
         let t = parser.parse(
             formula.formula_a1,
-            &CellReferenceRC {
+            &Some(CellReferenceRC {
                 sheet: "Sheet1".to_string(),
                 row: 1,
                 column: 1,
-            },
+            }),
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
         assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
@@ -67,11 +67,11 @@ fn test_parser_formulas_with_full_ranges() {
     for formula in &formulas {
         let t = parser.parse(
             formula.formula_r1c1,
-            &CellReferenceRC {
+            &Some(CellReferenceRC {
                 sheet: "Sheet1".to_string(),
                 row: 1,
                 column: 1,
-            },
+            }),
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
         assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
@@ -81,7 +81,7 @@ fn test_parser_formulas_with_full_ranges() {
 #[test]
 fn test_range_inverse_order() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -93,7 +93,7 @@ fn test_range_inverse_order() {
     // D4:C2 => C2:D4
     let t = parser.parse(
         "SUM(D4:C2)*SUM(Sheet2!D4:C20)*SUM($C$20:D4)",
-        &cell_reference,
+        &Some(cell_reference.clone()),
     );
     assert_eq!(
         to_string(&t, &cell_reference),

base/src/expressions/parser/tests/test_stringify.rs

@@ -2,14 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::Parser;
 use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn exp_order() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -17,18 +17,18 @@ fn exp_order() {
         row: 1,
         column: 1,
     };
-    let t = parser.parse("(1 + 2)^3  + 4", &cell_reference);
+    let t = parser.parse("(1 + 2)^3  + 4", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "(1+2)^3+4");
 
-    let t = parser.parse("(C5 + 3)^R4", &cell_reference);
+    let t = parser.parse("(C5 + 3)^R4", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "(C5+3)^R4");
 
-    let t = parser.parse("(C5 + 3)^(R4*6)", &cell_reference);
+    let t = parser.parse("(C5 + 3)^(R4*6)", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "(C5+3)^(R4*6)");
 
-    let t = parser.parse("(C5)^(R4)", &cell_reference);
+    let t = parser.parse("(C5)^(R4)", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "C5^R4");
 
-    let t = parser.parse("(5)^(4)", &cell_reference);
+    let t = parser.parse("(5)^(4)", &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "5^4");
 }

base/src/expressions/parser/tests/test_tables.rs

@@ -63,7 +63,7 @@ fn simple_table() {
     let row_count = 3;
     let tables = create_test_table("tblIncome", &column_names, "A1", row_count);
 
-    let mut parser = Parser::new(worksheets, vec![], tables);
+    let mut parser = Parser::new(worksheets, tables);
     // Reference cell is 'Sheet One'!F2
     let cell_reference = CellReferenceRC {
         sheet: "Sheet One".to_string(),
@@ -72,7 +72,7 @@ fn simple_table() {
     };
 
     let formula = "SUM(tblIncome[[#This Row],[Jan]:[Dec]])";
-    let t = parser.parse(formula, &cell_reference);
+    let t = parser.parse(formula, &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "SUM($A$2:$E$2)");
 
     // Cell A3
@@ -82,7 +82,7 @@ fn simple_table() {
         column: 1,
     };
     let formula = "SUBTOTAL(109, tblIncome[Jan])";
-    let t = parser.parse(formula, &cell_reference);
+    let t = parser.parse(formula, &Some(cell_reference.clone()));
     assert_eq!(to_string(&t, &cell_reference), "SUBTOTAL(109,$A$2:$A$3)");
 
     // Cell A3 in 'Second Sheet'
@@ -92,7 +92,7 @@ fn simple_table() {
         column: 1,
     };
     let formula = "SUBTOTAL(109, tblIncome[Jan])";
-    let t = parser.parse(formula, &cell_reference);
+    let t = parser.parse(formula, &Some(cell_reference.clone()));
     assert_eq!(
         to_string(&t, &cell_reference),
         "SUBTOTAL(109,'Sheet One'!$A$2:$A$3)"

base/src/expressions/parser/walk.rs

@@ -1,4 +1,4 @@
-use super::{Node, move_formula::ref_is_in_area};
+use super::{move_formula::ref_is_in_area, Node};
 
 use crate::expressions::types::{Area, CellReferenceIndex};
 
@@ -263,9 +263,7 @@ pub(crate) fn forward_references(
         // TODO: Not implemented
         Node::ArrayKind(_) => {}
         // Do nothing. Note: we could do a blanket _ => {}
-        Node::DefinedNameKind(_) => {}
-        Node::TableNameKind(_) => {}
-        Node::WrongVariableKind(_) => {}
+        Node::VariableKind(_) => {}
         Node::ErrorKind(_) => {}
         Node::ParseErrorKind { .. } => {}
         Node::EmptyArgKind => {}

base/src/formatter/dates.rs

@@ -1,158 +1,18 @@
 use chrono::Datelike;
-use chrono::Days;
 use chrono::Duration;
-use chrono::Months;
 use chrono::NaiveDate;
 
 use crate::constants::EXCEL_DATE_BASE;
-use crate::constants::MAXIMUM_DATE_SERIAL_NUMBER;
-use crate::constants::MINIMUM_DATE_SERIAL_NUMBER;
 
-#[inline]
-fn convert_to_serial_number(date: NaiveDate) -> i32 {
-    date.num_days_from_ce() - EXCEL_DATE_BASE
-}
-
-fn is_date_within_range(date: NaiveDate) -> bool {
-    convert_to_serial_number(date) >= MINIMUM_DATE_SERIAL_NUMBER
-        && convert_to_serial_number(date) <= MAXIMUM_DATE_SERIAL_NUMBER
-}
-
-pub fn from_excel_date(days: i64) -> Result<NaiveDate, String> {
-    if days < MINIMUM_DATE_SERIAL_NUMBER as i64 {
-        return Err(format!(
-            "Excel date must be greater than {}",
-            MINIMUM_DATE_SERIAL_NUMBER
-        ));
-    };
-    if days > MAXIMUM_DATE_SERIAL_NUMBER as i64 {
-        return Err(format!(
-            "Excel date must be less than {}",
-            MAXIMUM_DATE_SERIAL_NUMBER
-        ));
-    };
+pub fn from_excel_date(days: i64) -> NaiveDate {
     #[allow(clippy::expect_used)]
     let dt = NaiveDate::from_ymd_opt(1900, 1, 1).expect("problem with chrono::NaiveDate");
-    Ok(dt + Duration::days(days - 2))
+    dt + Duration::days(days - 2)
 }
 
 pub fn date_to_serial_number(day: u32, month: u32, year: i32) -> Result<i32, String> {
     match NaiveDate::from_ymd_opt(year, month, day) {
-        Some(native_date) => Ok(convert_to_serial_number(native_date)),
+        Some(native_date) => Ok(native_date.num_days_from_ce() - EXCEL_DATE_BASE),
         None => Err("Out of range parameters for date".to_string()),
     }
 }
-
-pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Result<i32, String> {
-    // Excel parses `DATE` very permissively. It allows not just for valid date values, but it
-    // allows for invalid dates as well. If you for example enter `DATE(1900, 1, 32)` it will
-    // return the date `1900-02-01`. Despite giving a day that is out of range it will just
-    // wrap the month and year around.
-    //
-    // This function applies that same logic to dates. And does it in the most compatible way as
-    // possible.
-
-    // Special case for the minimum date
-    if year == 1899 && month == 12 && day == 31 {
-        return Ok(MINIMUM_DATE_SERIAL_NUMBER);
-    }
-    let Some(mut date) = NaiveDate::from_ymd_opt(year, 1, 1) else {
-        return Err("Out of range parameters for date".to_string());
-    };
-
-    // One thing to note for example is that even if you started with a year out of range
-    // but tried to increment the months so that it wraps around into within range, excel
-    // would still return an error.
-    //
-    // I.E. DATE(0,13,-1) will return an error, despite it being equivalent to DATE(1,1,0) which
-    // is within range.
-    //
-    // As a result, we have to run range checks as we parse the date from the biggest unit to the
-    // smallest unit.
-    if !is_date_within_range(date) {
-        return Err("Out of range parameters for date".to_string());
-    }
-
-    date = {
-        let month_diff = month - 1;
-        let abs_month = month_diff.unsigned_abs();
-        if month_diff <= 0 {
-            date = date - Months::new(abs_month);
-        } else {
-            date = date + Months::new(abs_month);
-        }
-        if !is_date_within_range(date) {
-            return Err("Out of range parameters for date".to_string());
-        }
-        date
-    };
-
-    date = {
-        let day_diff = day - 1;
-        let abs_day = day_diff.unsigned_abs() as u64;
-        if day_diff <= 0 {
-            date = date - Days::new(abs_day);
-        } else {
-            date = date + Days::new(abs_day);
-        }
-        if !is_date_within_range(date) {
-            return Err("Out of range parameters for date".to_string());
-        }
-        date
-    };
-
-    Ok(convert_to_serial_number(date))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_permissive_date_to_serial_number() {
-        assert_eq!(
-            permissive_date_to_serial_number(42, 42, 2002),
-            date_to_serial_number(12, 7, 2005)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 42, 2002),
-            date_to_serial_number(1, 6, 2005)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 15, 2000),
-            date_to_serial_number(1, 3, 2001)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 49, 2000),
-            date_to_serial_number(1, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(1, 49, 2000),
-            date_to_serial_number(1, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(31, 49, 2000),
-            date_to_serial_number(31, 1, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(256, 49, 2000),
-            date_to_serial_number(12, 9, 2004)
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(256, 1, 2004),
-            date_to_serial_number(12, 9, 2004)
-        );
-    }
-
-    #[test]
-    fn test_max_and_min_dates() {
-        assert_eq!(
-            permissive_date_to_serial_number(31, 12, 9999),
-            Ok(MAXIMUM_DATE_SERIAL_NUMBER),
-        );
-        assert_eq!(
-            permissive_date_to_serial_number(31, 12, 1899),
-            Ok(MINIMUM_DATE_SERIAL_NUMBER),
-        );
-    }
-}

base/src/formatter/format.rs

@@ -154,16 +154,15 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
         ParsePart::Date(p) => {
             let tokens = &p.tokens;
             let mut text = "".to_string();
-            let date = match from_excel_date(value as i64) {
-                Ok(d) => d,
-                Err(e) => {
-                    return Formatted {
-                        text: "#VALUE!".to_owned(),
-                        color: None,
-                        error: Some(e),
-                    };
-                }
-            };
+            if !(1.0..=2_958_465.0).contains(&value) {
+                // 2_958_465 is 31 December 9999
+                return Formatted {
+                    text: "#VALUE!".to_owned(),
+                    color: None,
+                    error: Some("Date negative or too long".to_owned()),
+                };
+            }
+            let date = from_excel_date(value as i64);
             for token in tokens {
                 match token {
                     TextToken::Literal(c) => {
@@ -391,7 +390,11 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                             if l_exp <= p.exponent_digit_count {
                                 if !(number_index < 0 && digit.kind == '#') {
                                     let c = if number_index < 0 {
-                                        if digit.kind == '?' { ' ' } else { '0' }
+                                        if digit.kind == '?' {
+                                            ' '
+                                        } else {
+                                            '0'
+                                        }
                                     } else {
                                         exponent_part[number_index as usize]
                                     };

base/src/formatter/test/test_general.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     formatter::format::format_number,
-    locale::{Locale, get_locale},
+    locale::{get_locale, Locale},
 };
 
 fn get_default_locale() -> &'static Locale {

base/src/functions/date_and_time.rs

@@ -3,11 +3,8 @@ use chrono::Datelike;
 use chrono::Months;
 use chrono::Timelike;
 
-use crate::constants::MAXIMUM_DATE_SERIAL_NUMBER;
-use crate::constants::MINIMUM_DATE_SERIAL_NUMBER;
 use crate::expressions::types::CellReferenceIndex;
 use crate::formatter::dates::date_to_serial_number;
-use crate::formatter::dates::permissive_date_to_serial_number;
 use crate::model::get_milliseconds_since_epoch;
 use crate::{
     calc_result::CalcResult, constants::EXCEL_DATE_BASE, expressions::parser::Node,
@@ -21,19 +18,20 @@ impl Model {
             return CalcResult::new_args_number_error(cell);
         }
         let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function DAY parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
             Err(s) => return s,
         };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                };
-            }
-        };
+        let date = from_excel_date(serial_number);
         let day = date.day() as f64;
         CalcResult::Number(day)
     }
@@ -44,19 +42,20 @@ impl Model {
             return CalcResult::new_args_number_error(cell);
         }
         let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function MONTH parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
             Err(s) => return s,
         };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                };
-            }
-        };
+        let date = from_excel_date(serial_number);
         let month = date.month() as f64;
         CalcResult::Number(month)
     }
@@ -80,23 +79,6 @@ impl Model {
             }
             Err(s) => return s,
         };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                };
-            }
-        };
-        if serial_number > MAXIMUM_DATE_SERIAL_NUMBER as i64 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Function DAY parameter 1 value is too large.".to_string(),
-            };
-        }
 
         let months = match self.get_number_no_bools(&args[1], cell) {
             Ok(c) => {
@@ -109,9 +91,9 @@ impl Model {
         let months_abs = months.unsigned_abs();
 
         let native_date = if months > 0 {
-            date + Months::new(months_abs)
+            from_excel_date(serial_number) + Months::new(months_abs)
         } else {
-            date - Months::new(months_abs)
+            from_excel_date(serial_number) - Months::new(months_abs)
         };
 
         // Instead of calculating the end of month we compute the first day of the following month
@@ -155,18 +137,32 @@ impl Model {
         let month = match self.get_number(&args[1], cell) {
             Ok(c) => {
                 let t = c.floor();
-                t as i32
+                if t < 0.0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Out of range parameters for date".to_string(),
+                    };
+                }
+                t as u32
             }
             Err(s) => return s,
         };
         let day = match self.get_number(&args[2], cell) {
             Ok(c) => {
                 let t = c.floor();
-                t as i32
+                if t < 0.0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Out of range parameters for date".to_string(),
+                    };
+                }
+                t as u32
             }
             Err(s) => return s,
         };
-        match permissive_date_to_serial_number(day, month, year) {
+        match date_to_serial_number(day, month, year) {
             Ok(serial_number) => CalcResult::Number(serial_number as f64),
             Err(message) => CalcResult::Error {
                 error: Error::NUM,
@@ -182,19 +178,20 @@ impl Model {
             return CalcResult::new_args_number_error(cell);
         }
         let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Function YEAR parameter 1 value is negative. It should be positive or zero.".to_string(),
+                    };
+                }
+                t
+            }
             Err(s) => return s,
         };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                };
-            }
-        };
+        let date = from_excel_date(serial_number);
         let year = date.year() as f64;
         CalcResult::Number(year)
     }
@@ -206,18 +203,19 @@ impl Model {
             return CalcResult::new_args_number_error(cell);
         }
         let serial_number = match self.get_number(&args[0], cell) {
-            Ok(c) => c.floor() as i64,
-            Err(s) => return s,
-        };
-        let date = match from_excel_date(serial_number) {
-            Ok(date) => date,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Out of range parameters for date".to_string(),
-                };
+            Ok(c) => {
+                let t = c.floor() as i64;
+                if t < 0 {
+                    return CalcResult::Error {
+                        error: Error::NUM,
+                        origin: cell,
+                        message: "Parameter 1 value is negative. It should be positive or zero."
+                            .to_string(),
+                    };
+                }
+                t
             }
+            Err(s) => return s,
         };
 
         let months = match self.get_number(&args[1], cell) {
@@ -231,13 +229,13 @@ impl Model {
         let months_abs = months.unsigned_abs();
 
         let native_date = if months > 0 {
-            date + Months::new(months_abs)
+            from_excel_date(serial_number) + Months::new(months_abs)
         } else {
-            date - Months::new(months_abs)
+            from_excel_date(serial_number) - Months::new(months_abs)
         };
 
         let serial_number = native_date.num_days_from_ce() - EXCEL_DATE_BASE;
-        if serial_number < MINIMUM_DATE_SERIAL_NUMBER {
+        if serial_number < 0 {
             return CalcResult::Error {
                 error: Error::NUM,
                 origin: cell,
@@ -266,7 +264,7 @@ impl Model {
                     error: Error::ERROR,
                     origin: cell,
                     message: "Invalid date".to_string(),
-                };
+                }
             }
         };
         // 693_594 is computed as:
@@ -296,7 +294,7 @@ impl Model {
                     error: Error::ERROR,
                     origin: cell,
                     message: "Invalid date".to_string(),
-                };
+                }
             }
         };
         // 693_594 is computed as:

base/src/functions/engineering/complex.rs

@@ -188,7 +188,10 @@ impl Model {
         node: &Node,
         cell: CellReferenceIndex,
     ) -> Result<(f64, f64, Suffix), CalcResult> {
-        let value = self.get_string(node, cell)?;
+        let value = match self.get_string(node, cell) {
+            Ok(s) => s,
+            Err(s) => return Err(s),
+        };
         if value.is_empty() {
             return Ok((0.0, 0.0, Suffix::I));
         }

base/src/functions/engineering/transcendental/bessel_j0_y0.rs

@@ -57,7 +57,7 @@
 
 use std::f64::consts::FRAC_2_PI;
 
-use super::bessel_util::{FRAC_2_SQRT_PI, HUGE, high_word, split_words};
+use super::bessel_util::{high_word, split_words, FRAC_2_SQRT_PI, HUGE};
 
 // R0/S0 on [0, 2.00]
 const R02: f64 = 1.562_499_999_999_999_5e-2; // 0x3F8FFFFF, 0xFFFFFFFD

base/src/functions/engineering/transcendental/bessel_j1_y1.rs

@@ -56,7 +56,7 @@
 
 use std::f64::consts::FRAC_2_PI;
 
-use super::bessel_util::{FRAC_2_SQRT_PI, HUGE, high_word, split_words};
+use super::bessel_util::{high_word, split_words, FRAC_2_SQRT_PI, HUGE};
 
 // R0/S0 on [0,2]
 const R00: f64 = -6.25e-2; // 0xBFB00000, 0x00000000

base/src/functions/engineering/transcendental/bessel_jn_yn.rs

@@ -40,7 +40,7 @@
 use super::{
     bessel_j0_y0::{j0, y0},
     bessel_j1_y1::{j1, y1},
-    bessel_util::{FRAC_2_SQRT_PI, split_words},
+    bessel_util::{split_words, FRAC_2_SQRT_PI},
 };
 
 // Special cases are:
@@ -232,7 +232,11 @@ pub(crate) fn jn(n: i32, x: f64) -> f64 {
             }
         }
     };
-    if sign == 1 { -b } else { b }
+    if sign == 1 {
+        -b
+    } else {
+        b
+    }
 }
 
 // Yn returns the order-n Bessel function of the second kind.
@@ -317,5 +321,9 @@ pub(crate) fn yn(n: i32, x: f64) -> f64 {
         }
         b
     };
-    if sign > 0 { b } else { -b }
+    if sign > 0 {
+        b
+    } else {
+        -b
+    }
 }

base/src/functions/engineering/transcendental/erf.rs

@@ -45,5 +45,9 @@ pub(crate) fn erf(x: f64) -> f64 {
     }
 
     let res = t * f64::exp(-x_abs * x_abs + 0.5 * (cof[0] + ty * d) - dd);
-    if x < 0.0 { res - 1.0 } else { 1.0 - res }
+    if x < 0.0 {
+        res - 1.0
+    } else {
+        1.0 - res
+    }
 }

base/src/functions/financial.rs

@@ -2,7 +2,7 @@ use chrono::Datelike;
 
 use crate::{
     calc_result::CalcResult,
-    constants::{LAST_COLUMN, LAST_ROW, MAXIMUM_DATE_SERIAL_NUMBER, MINIMUM_DATE_SERIAL_NUMBER},
+    constants::{LAST_COLUMN, LAST_ROW},
     expressions::{parser::Node, token::Error, types::CellReferenceIndex},
     formatter::dates::from_excel_date,
     model::Model,
@@ -13,32 +13,37 @@ use super::financial_util::{compute_irr, compute_npv, compute_rate, compute_xirr
 // See:
 // https://github.com/apache/openoffice/blob/c014b5f2b55cff8d4b0c952d5c16d62ecde09ca1/main/scaddins/source/analysis/financial.cxx
 
-fn is_less_than_one_year(start_date: i64, end_date: i64) -> Result<bool, String> {
-    let end = from_excel_date(end_date)?;
-    let start = from_excel_date(start_date)?;
+// FIXME: Is this enough?
+fn is_valid_date(date: f64) -> bool {
+    date > 0.0
+}
+
+fn is_less_than_one_year(start_date: i64, end_date: i64) -> bool {
     if end_date - start_date < 365 {
-        return Ok(true);
+        return true;
     }
+    let end = from_excel_date(end_date);
+    let start = from_excel_date(start_date);
     let end_year = end.year();
     let start_year = start.year();
     if end_year == start_year {
-        return Ok(true);
+        return true;
     }
     if end_year != start_year + 1 {
-        return Ok(false);
+        return false;
     }
     let start_month = start.month();
     let end_month = end.month();
     if end_month < start_month {
-        return Ok(true);
+        return true;
     }
     if end_month > start_month {
-        return Ok(false);
+        return false;
     }
     // we are one year later same month
     let start_day = start.day();
     let end_day = end.day();
-    Ok(end_day <= start_day)
+    end_day <= start_day
 }
 
 fn compute_payment(
@@ -431,7 +436,7 @@ impl Model {
         }
         if rate == -1.0 {
             return CalcResult::Error {
-                error: Error::DIV,
+                error: Error::NUM,
                 origin: cell,
                 message: "Rate must be != -1".to_string(),
             };
@@ -698,7 +703,7 @@ impl Model {
                     error: error.0,
                     origin: cell,
                     message: error.1,
-                };
+                }
             }
         };
         CalcResult::Number(ipmt)
@@ -762,7 +767,7 @@ impl Model {
                     error: error.0,
                     origin: cell,
                     message: error.1,
-                };
+                }
             }
         };
         CalcResult::Number(ppmt)
@@ -918,9 +923,7 @@ impl Model {
         }
         let first_date = dates[0];
         for date in &dates {
-            if *date < MINIMUM_DATE_SERIAL_NUMBER as f64
-                || *date > MAXIMUM_DATE_SERIAL_NUMBER as f64
-            {
+            if !is_valid_date(*date) {
                 // Excel docs claim that if any number in dates is not a valid date,
                 // XNPV returns the #VALUE! error value, but it seems to return #VALUE!
                 return CalcResult::new_error(
@@ -986,9 +989,7 @@ impl Model {
         }
         let first_date = dates[0];
         for date in &dates {
-            if *date < MINIMUM_DATE_SERIAL_NUMBER as f64
-                || *date > MAXIMUM_DATE_SERIAL_NUMBER as f64
-            {
+            if !is_valid_date(*date) {
                 return CalcResult::new_error(
                     Error::NUM,
                     cell,
@@ -1075,7 +1076,7 @@ impl Model {
                         error,
                         origin: cell,
                         message,
-                    };
+                    }
                 }
             }
         };
@@ -1096,7 +1097,7 @@ impl Model {
                         error,
                         origin: cell,
                         message,
-                    };
+                    }
                 }
             }
         };
@@ -1372,10 +1373,9 @@ impl Model {
             Ok(f) => f,
             Err(s) => return s,
         };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
         if settlement > maturity {
             return CalcResult::new_error(
                 Error::NUM,
@@ -1383,7 +1383,7 @@ impl Model {
                 "settlement should be <= maturity".to_string(),
             );
         }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
             return CalcResult::new_error(
                 Error::NUM,
                 cell,
@@ -1437,10 +1437,9 @@ impl Model {
             Ok(f) => f,
             Err(s) => return s,
         };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
         if settlement > maturity {
             return CalcResult::new_error(
                 Error::NUM,
@@ -1448,7 +1447,7 @@ impl Model {
                 "settlement should be <= maturity".to_string(),
             );
         }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
             return CalcResult::new_error(
                 Error::NUM,
                 cell,
@@ -1488,10 +1487,9 @@ impl Model {
             Ok(f) => f,
             Err(s) => return s,
         };
-        let less_than_one_year = match is_less_than_one_year(settlement as i64, maturity as i64) {
-            Ok(f) => f,
-            Err(_) => return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string()),
-        };
+        if !is_valid_date(settlement) || !is_valid_date(maturity) {
+            return CalcResult::new_error(Error::NUM, cell, "Invalid date".to_string());
+        }
         if settlement > maturity {
             return CalcResult::new_error(
                 Error::NUM,
@@ -1499,7 +1497,7 @@ impl Model {
                 "settlement should be <= maturity".to_string(),
             );
         }
-        if !less_than_one_year {
+        if !is_less_than_one_year(settlement as i64, maturity as i64) {
             return CalcResult::new_error(
                 Error::NUM,
                 cell,
@@ -1634,7 +1632,7 @@ impl Model {
                         error: error.0,
                         origin: cell,
                         message: error.1,
-                    };
+                    }
                 }
             }
         }
@@ -1702,7 +1700,7 @@ impl Model {
                         error: error.0,
                         origin: cell,
                         message: error.1,
-                    };
+                    }
                 }
             }
         }
@@ -1750,7 +1748,11 @@ impl Model {
             rate = 1.0
         };
         let value = if rate == 1.0 {
-            if period == 1.0 { cost } else { 0.0 }
+            if period == 1.0 {
+                cost
+            } else {
+                0.0
+            }
         } else {
             cost * (1.0 - rate).powf(period - 1.0)
         };

base/src/functions/information.rs

@@ -247,68 +247,46 @@ impl Model {
             return CalcResult::Number(cell.sheet as f64 + 1.0);
         }
         // The arg could be a defined name or a table
-        // let  = &args[0];
-        match &args[0] {
-            Node::DefinedNameKind((name, scope)) => {
-                // Let's see if it is a defined name
-                if let Some(defined_name) = self
-                    .parsed_defined_names
-                    .get(&(*scope, name.to_lowercase()))
-                {
-                    match defined_name {
-                        ParsedDefinedName::CellReference(reference) => {
-                            return CalcResult::Number(reference.sheet as f64 + 1.0);
-                        }
-                        ParsedDefinedName::RangeReference(range) => {
-                            return CalcResult::Number(range.left.sheet as f64 + 1.0);
-                        }
-                        ParsedDefinedName::InvalidDefinedNameFormula => {
-                            return CalcResult::Error {
-                                error: Error::ERROR,
-                                origin: cell,
-                                message: "Invalid name".to_string(),
-                            };
-                        }
+        let arg = &args[0];
+        if let Node::VariableKind(name) = arg {
+            // Let's see if it is a defined name
+            if let Some(defined_name) = self.parsed_defined_names.get(&(None, name.to_lowercase()))
+            {
+                match defined_name {
+                    ParsedDefinedName::CellReference(reference) => {
+                        return CalcResult::Number(reference.sheet as f64 + 1.0)
                     }
-                } else {
-                    // This should never happen
-                    return CalcResult::Error {
-                        error: Error::ERROR,
-                        origin: cell,
-                        message: "Invalid name".to_string(),
-                    };
-                }
-            }
-            Node::TableNameKind(name) => {
-                // Now let's see if it is a table
-                for (table_name, table) in &self.workbook.tables {
-                    if table_name == name {
-                        if let Some(sheet_index) = self.get_sheet_index_by_name(&table.sheet_name) {
-                            return CalcResult::Number(sheet_index as f64 + 1.0);
-                        } else {
-                            break;
-                        }
+                    ParsedDefinedName::RangeReference(range) => {
+                        return CalcResult::Number(range.left.sheet as f64 + 1.0)
+                    }
+                    ParsedDefinedName::InvalidDefinedNameFormula => {
+                        return CalcResult::Error {
+                            error: Error::NA,
+                            origin: cell,
+                            message: "Invalid name".to_string(),
+                        };
                     }
                 }
             }
-            Node::WrongVariableKind(name) => {
-                return CalcResult::Error {
-                    error: Error::NAME,
-                    origin: cell,
-                    message: format!("Name not found: {name}"),
-                };
-            }
-            arg => {
-                // Now it should be the name of a sheet
-                let sheet_name = match self.get_string(arg, cell) {
-                    Ok(s) => s,
-                    Err(e) => return e,
-                };
-                if let Some(sheet_index) = self.get_sheet_index_by_name(&sheet_name) {
-                    return CalcResult::Number(sheet_index as f64 + 1.0);
+            // Now let's see if it is a table
+            for (table_name, table) in &self.workbook.tables {
+                if table_name == name {
+                    if let Some(sheet_index) = self.get_sheet_index_by_name(&table.sheet_name) {
+                        return CalcResult::Number(sheet_index as f64 + 1.0);
+                    } else {
+                        break;
+                    }
                 }
             }
         }
+        // Now it should be the name of a sheet
+        let sheet_name = match self.get_string(arg, cell) {
+            Ok(s) => s,
+            Err(e) => return e,
+        };
+        if let Some(sheet_index) = self.get_sheet_index_by_name(&sheet_name) {
+            return CalcResult::Number(sheet_index as f64 + 1.0);
+        }
         CalcResult::Error {
             error: Error::NA,
             origin: cell,

base/src/functions/logical.rs

@@ -7,22 +7,6 @@ use crate::{
 use super::util::compare_values;
 
 impl Model {
-    pub(crate) fn fn_true(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            CalcResult::Boolean(true)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
-    pub(crate) fn fn_false(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            CalcResult::Boolean(false)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
     pub(crate) fn fn_if(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() == 2 || args.len() == 3 {
             let cond_result = self.get_boolean(&args[0], cell);
@@ -82,61 +66,24 @@ impl Model {
     }
 
     pub(crate) fn fn_and(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        self.logical_nary(
-            args,
-            cell,
-            |acc, value| acc.unwrap_or(true) && value,
-            Some(false),
-        )
-    }
-
-    pub(crate) fn fn_or(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        self.logical_nary(
-            args,
-            cell,
-            |acc, value| acc.unwrap_or(false) || value,
-            Some(true),
-        )
-    }
-
-    pub(crate) fn fn_xor(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        self.logical_nary(args, cell, |acc, value| acc.unwrap_or(false) ^ value, None)
-    }
-
-    /// Base function for AND, OR, XOR. These are all n-ary functions that perform a boolean operation on a series of
-    /// boolean values. These boolean values are sourced from `args`. Note that there is not a 1-1 relationship between
-    /// arguments and boolean values evaluated (see how Ranges are handled for example).
-    ///
-    /// Each argument in `args` is evaluated and the resulting value is interpreted as a boolean as follows:
-    /// - Boolean: The value is used directly.
-    /// - Number: 0 is FALSE, all other values are TRUE.
-    /// - Range: Each cell in the range is evaluated as if they were individual arguments with some caveats
-    /// - Empty arg: FALSE
-    /// - Empty cell & String: Ignored, behaves exactly like the argument wasn't passed in at all
-    /// - Error: Propagated
-    ///
-    /// If no arguments are provided, or all arguments are ignored, the function returns a #VALUE! error
-    ///
-    /// **`fold_fn`:** The function that combines the running result with the next value boolean value. The running result
-    /// starts as `None`.
-    ///
-    /// **`short_circuit_value`:** If the running result reaches `short_circuit_value`, the function returns early.
-    fn logical_nary(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-        fold_fn: fn(Option<bool>, bool) -> bool,
-        short_circuit_value: Option<bool>,
-    ) -> CalcResult {
-        if args.is_empty() {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let mut result = None;
+        let mut true_count = 0;
         for arg in args {
             match self.evaluate_node_in_context(arg, cell) {
-                CalcResult::Boolean(value) => result = Some(fold_fn(result, value)),
-                CalcResult::Number(value) => result = Some(fold_fn(result, value != 0.0)),
+                CalcResult::Boolean(b) => {
+                    if !b {
+                        return CalcResult::Boolean(false);
+                    }
+                    true_count += 1;
+                }
+                CalcResult::Number(value) => {
+                    if value == 0.0 {
+                        return CalcResult::Boolean(false);
+                    }
+                    true_count += 1;
+                }
+                CalcResult::String(_value) => {
+                    true_count += 1;
+                }
                 CalcResult::Range { left, right } => {
                     if left.sheet != right.sheet {
                         return CalcResult::new_error(
@@ -152,58 +99,161 @@ impl Model {
                                 row,
                                 column,
                             }) {
-                                CalcResult::Boolean(value) => result = Some(fold_fn(result, value)),
+                                CalcResult::Boolean(b) => {
+                                    if !b {
+                                        return CalcResult::Boolean(false);
+                                    }
+                                    true_count += 1;
+                                }
                                 CalcResult::Number(value) => {
-                                    result = Some(fold_fn(result, value != 0.0))
+                                    if value == 0.0 {
+                                        return CalcResult::Boolean(false);
+                                    }
+                                    true_count += 1;
+                                }
+                                CalcResult::String(_value) => {
+                                    true_count += 1;
                                 }
                                 error @ CalcResult::Error { .. } => return error,
-                                CalcResult::EmptyArg => {} // unreachable
-                                CalcResult::Range { .. }
-                                | CalcResult::String { .. }
-                                | CalcResult::EmptyCell => {}
-                            }
-                            if let (Some(current_result), Some(short_circuit_value)) =
-                                (result, short_circuit_value)
-                            {
-                                if current_result == short_circuit_value {
-                                    return CalcResult::Boolean(current_result);
-                                }
+                                CalcResult::Range { .. } => {}
+                                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
                             }
                         }
                     }
                 }
                 error @ CalcResult::Error { .. } => return error,
-                CalcResult::EmptyArg => result = Some(result.unwrap_or(false)),
-                // Strings are ignored unless they are "TRUE" or "FALSE" (case insensitive). EXCEPT if the string value
-                // comes from a reference, in which case it is always ignored regardless of its value.
-                CalcResult::String(..) => {
-                    if !matches!(arg, Node::ReferenceKind { .. }) {
-                        if let Ok(f) = self.get_boolean(arg, cell) {
-                            result = Some(fold_fn(result, f));
+                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+            };
+        }
+        if true_count == 0 {
+            return CalcResult::new_error(
+                Error::VALUE,
+                cell,
+                "Boolean values not found".to_string(),
+            );
+        }
+        CalcResult::Boolean(true)
+    }
+
+    pub(crate) fn fn_or(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut result = false;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Boolean(value) => result = value || result,
+                CalcResult::Number(value) => {
+                    if value != 0.0 {
+                        return CalcResult::Boolean(true);
+                    }
+                }
+                CalcResult::String(_value) => {
+                    return CalcResult::Boolean(true);
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::Boolean(value) => {
+                                    result = value || result;
+                                }
+                                CalcResult::Number(value) => {
+                                    if value != 0.0 {
+                                        return CalcResult::Boolean(true);
+                                    }
+                                }
+                                CalcResult::String(_value) => {
+                                    return CalcResult::Boolean(true);
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                CalcResult::Range { .. } => {}
+                                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+                            }
                         }
                     }
                 }
-                // References to empty cells are ignored. If all args are ignored the result is #VALUE!
-                CalcResult::EmptyCell => {}
-            }
+                error @ CalcResult::Error { .. } => return error,
+                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+            };
+        }
+        CalcResult::Boolean(result)
+    }
 
-            if let (Some(current_result), Some(short_circuit_value)) = (result, short_circuit_value)
-            {
-                if current_result == short_circuit_value {
-                    return CalcResult::Boolean(current_result);
+    /// XOR(logical1, [logical]*,...)
+    /// Logical1 is required, subsequent logical values are optional. Can be logical values, arrays, or references.
+    /// The result of XOR is TRUE when the number of TRUE inputs is odd and FALSE when the number of TRUE inputs is even.
+    pub(crate) fn fn_xor(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let mut true_count = 0;
+        let mut false_count = 0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Boolean(b) => {
+                    if b {
+                        true_count += 1;
+                    } else {
+                        false_count += 1;
+                    }
                 }
-            }
+                CalcResult::Number(value) => {
+                    if value != 0.0 {
+                        true_count += 1;
+                    } else {
+                        false_count += 1;
+                    }
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::Boolean(b) => {
+                                    if b {
+                                        true_count += 1;
+                                    } else {
+                                        false_count += 1;
+                                    }
+                                }
+                                CalcResult::Number(value) => {
+                                    if value != 0.0 {
+                                        true_count += 1;
+                                    } else {
+                                        false_count += 1;
+                                    }
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            };
         }
-
-        if let Some(result) = result {
-            CalcResult::Boolean(result)
-        } else {
-            CalcResult::new_error(
-                Error::VALUE,
-                cell,
-                "No logical values in argument list".to_string(),
-            )
+        if true_count == 0 && false_count == 0 {
+            return CalcResult::new_error(Error::VALUE, cell, "No booleans found".to_string());
         }
+        CalcResult::Boolean(true_count % 2 == 1)
     }
 
     /// =SWITCH(expression, case1, value1, [case, value]*, [default])

base/src/functions/mod.rs

@@ -949,7 +949,7 @@ impl Model {
         match kind {
             // Logical
             Function::And => self.fn_and(args, cell),
-            Function::False => self.fn_false(args, cell),
+            Function::False => CalcResult::Boolean(false),
             Function::If => self.fn_if(args, cell),
             Function::Iferror => self.fn_iferror(args, cell),
             Function::Ifna => self.fn_ifna(args, cell),
@@ -957,7 +957,7 @@ impl Model {
             Function::Not => self.fn_not(args, cell),
             Function::Or => self.fn_or(args, cell),
             Function::Switch => self.fn_switch(args, cell),
-            Function::True => self.fn_true(args, cell),
+            Function::True => CalcResult::Boolean(true),
             Function::Xor => self.fn_xor(args, cell),
             // Math and trigonometry
             Function::Sin => self.fn_sin(args, cell),

base/src/functions/statistical.rs

@@ -388,7 +388,7 @@ impl Model {
                     Error::ERROR,
                     cell,
                     format!("Invalid worksheet index: '{}'", first_range.left.sheet),
-                );
+                )
             }
         };
         let max_row = dimension.max_row;

base/src/functions/subtotal.rs

@@ -1,7 +1,7 @@
 use crate::{
     calc_result::CalcResult,
     expressions::{
-        parser::{Node, parse_range},
+        parser::{parse_range, Node},
         token::Error,
         types::CellReferenceIndex,
     },

base/src/functions/text.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 
 use super::{
-    text_util::{Case, substitute, text_after, text_before},
+    text_util::{substitute, text_after, text_before, Case},
     util::from_wildcard_to_regex,
 };
 
@@ -368,7 +368,7 @@ impl Model {
                         error: Error::VALUE,
                         origin: cell,
                         message: "Empty cell".to_string(),
-                    };
+                    }
                 }
             };
 
@@ -629,7 +629,7 @@ impl Model {
                     error: Error::VALUE,
                     origin: cell,
                     message: "Expecting number".to_string(),
-                };
+                }
             }
             error @ CalcResult::Error { .. } => return error,
             CalcResult::Range { .. } => {

base/src/lib.rs

@@ -25,8 +25,6 @@
 #![doc = include_str!("../examples/formulas_and_errors.rs")]
 //! ```
 
-#![warn(clippy::print_stdout)]
-
 pub mod calc_result;
 pub mod cell;
 pub mod expressions;
@@ -57,8 +55,8 @@ mod test;
 #[cfg(test)]
 pub mod mock_time;
 
-pub use model::Model;
 pub use model::get_milliseconds_since_epoch;
+pub use model::Model;
 pub use user_model::BorderArea;
 pub use user_model::ClipboardData;
 pub use user_model::UserModel;

base/src/model.rs

@@ -8,15 +8,14 @@ use crate::{
     cell::CellValue,
     constants::{self, LAST_COLUMN, LAST_ROW},
     expressions::{
-        lexer::LexerMode,
         parser::{
+            move_formula::{move_formula, MoveContext},
+            stringify::{to_rc_format, to_string},
             Node, Parser,
-            move_formula::{MoveContext, move_formula},
-            stringify::{rename_defined_name_in_node, to_rc_format, to_string},
         },
-        token::{Error, OpCompare, OpProduct, OpSum, OpUnary, get_error_by_name},
+        token::{get_error_by_name, Error, OpCompare, OpProduct, OpSum, OpUnary},
         types::*,
-        utils::{self, is_valid_column_number, is_valid_identifier, is_valid_row},
+        utils::{self, is_valid_column_number, is_valid_row},
     },
     formatter::{
         format::{format_number, parse_formatted_number},
@@ -24,8 +23,8 @@ use crate::{
     },
     functions::util::compare_values,
     implicit_intersection::implicit_intersection,
-    language::{Language, get_language},
-    locale::{Currency, Locale, get_locale},
+    language::{get_language, Language},
+    locale::{get_locale, Currency, Locale},
     types::*,
     utils as common,
 };
@@ -73,7 +72,6 @@ pub(crate) enum CellState {
 }
 
 /// A parsed formula for a defined name
-#[derive(Clone)]
 pub(crate) enum ParsedDefinedName {
     /// CellReference (`=C4`)
     CellReference(CellReferenceIndex),
@@ -81,6 +79,9 @@ pub(crate) enum ParsedDefinedName {
     RangeReference(Range),
     /// `=SomethingElse`
     InvalidDefinedNameFormula,
+    // TODO: Support constants in defined names
+    // TODO: Support formulas in defined names
+    // TODO: Support tables in defined names
 }
 
 /// A dynamical IronCalc model.
@@ -416,40 +417,40 @@ impl Model {
                 // TODO: NOT IMPLEMENTED
                 CalcResult::new_error(Error::NIMPL, cell, "Arrays not implemented".to_string())
             }
-            DefinedNameKind((name, scope)) => {
-                if let Ok(Some(parsed_defined_name)) = self.get_parsed_defined_name(name, *scope) {
+            VariableKind(defined_name) => {
+                println!("{:?}", defined_name);
+                let parsed_defined_name = self
+                    .parsed_defined_names
+                    .get(&(Some(cell.sheet), defined_name.to_lowercase())) // try getting local defined name
+                    .or_else(|| {
+                        self.parsed_defined_names
+                            .get(&(None, defined_name.to_lowercase()))
+                    }); // fallback to global
+
+                println!("Parsed: {:?}", defined_name);
+                if let Some(parsed_defined_name) = parsed_defined_name {
                     match parsed_defined_name {
                         ParsedDefinedName::CellReference(reference) => {
-                            self.evaluate_cell(reference)
+                            self.evaluate_cell(*reference)
                         }
                         ParsedDefinedName::RangeReference(range) => CalcResult::Range {
                             left: range.left,
                             right: range.right,
                         },
                         ParsedDefinedName::InvalidDefinedNameFormula => CalcResult::new_error(
-                            Error::NAME,
+                            Error::NIMPL,
                             cell,
-                            format!("Defined name \"{}\" is not a reference.", name),
+                            format!("Defined name \"{}\" is not a reference.", defined_name),
                         ),
                     }
                 } else {
                     CalcResult::new_error(
                         Error::NAME,
                         cell,
-                        format!("Defined name \"{}\" not found.", name),
+                        format!("Defined name \"{}\" not found.", defined_name),
                     )
                 }
             }
-            TableNameKind(s) => CalcResult::new_error(
-                Error::NAME,
-                cell,
-                format!("table name \"{}\" not supported.", s),
-            ),
-            WrongVariableKind(s) => CalcResult::new_error(
-                Error::NAME,
-                cell,
-                format!("Variable name \"{}\" not found.", s),
-            ),
             CompareKind { kind, left, right } => {
                 let l = self.evaluate_node_in_context(left, cell);
                 if l.is_error() {
@@ -683,13 +684,6 @@ impl Model {
         Err(format!("Invalid color: {}", color))
     }
 
-    /// Changes the visibility of a sheet
-    pub fn set_sheet_state(&mut self, sheet: u32, state: SheetState) -> Result<(), String> {
-        let worksheet = self.workbook.worksheet_mut(sheet)?;
-        worksheet.state = state;
-        Ok(())
-    }
-
     /// Makes the grid lines in the sheet visible (`true`) or hidden (`false`)
     pub fn set_show_grid_lines(&mut self, sheet: u32, show_grid_lines: bool) -> Result<(), String> {
         let worksheet = self.workbook.worksheet_mut(sheet)?;
@@ -865,11 +859,6 @@ impl Model {
 
         let worksheet_names = worksheets.iter().map(|s| s.get_name()).collect();
 
-        let defined_names = workbook
-            .get_defined_names_with_scope()
-            .iter()
-            .map(|s| (s.0.to_owned(), s.1))
-            .collect();
         // add all tables
         // let mut tables = Vec::new();
         // for worksheet in worksheets {
@@ -879,7 +868,7 @@ impl Model {
         //     }
         //     tables.push(tables_in_sheet);
         // }
-        let parser = Parser::new(worksheet_names, defined_names, workbook.tables.clone());
+        let parser = Parser::new(worksheet_names, workbook.tables.clone());
         let cells = HashMap::new();
         let locale = get_locale(&workbook.settings.locale)
             .map_err(|_| "Invalid locale".to_string())?
@@ -960,7 +949,10 @@ impl Model {
                 }
             }
         }
-        let sheet = self.get_sheet_index_by_name(&sheet_name)?;
+        let sheet = match self.get_sheet_index_by_name(&sheet_name) {
+            Some(s) => s,
+            None => return None,
+        };
         let row = match row.parse::<i32>() {
             Ok(r) => r,
             Err(_) => return None,
@@ -1037,7 +1029,7 @@ impl Model {
                 column: source.column,
             };
             let formula_str = move_formula(
-                &self.parser.parse(formula, &cell_reference),
+                &self.parser.parse(formula, &Some(cell_reference)),
                 &MoveContext {
                     source_sheet_name: &source_sheet_name,
                     row: source.row,
@@ -1145,7 +1137,7 @@ impl Model {
                 row: source.row,
                 column: source.column,
             };
-            let formula = &self.parser.parse(formula_str, &cell_reference);
+            let formula = &self.parser.parse(formula_str, &Some(cell_reference));
             let cell_reference = CellReferenceRC {
                 sheet: target_sheet_name,
                 row: target.row,
@@ -1521,11 +1513,13 @@ impl Model {
             column,
         };
         let shared_formulas = &mut worksheet.shared_formulas;
-        let mut parsed_formula = self.parser.parse(formula, &cell_reference);
+        let mut parsed_formula = self.parser.parse(formula, &Some(cell_reference.clone()));
         // If the formula fails to parse try adding a parenthesis
         // SUM(A1:A3  => SUM(A1:A3)
         if let Node::ParseErrorKind { .. } = parsed_formula {
-            let new_parsed_formula = self.parser.parse(&format!("{})", formula), &cell_reference);
+            let new_parsed_formula = self
+                .parser
+                .parse(&format!("{})", formula), &Some(cell_reference));
             match new_parsed_formula {
                 Node::ParseErrorKind { .. } => {}
                 _ => parsed_formula = new_parsed_formula,
@@ -1604,42 +1598,6 @@ impl Model {
             .set_cell_with_number(row, column, value, style)
     }
 
-    // Helper function that returns a defined name given the name and scope
-    fn get_parsed_defined_name(
-        &self,
-        name: &str,
-        scope: Option<u32>,
-    ) -> Result<Option<ParsedDefinedName>, String> {
-        let name_upper = name.to_uppercase();
-
-        for (key, df) in &self.parsed_defined_names {
-            if key.1.to_uppercase() == name_upper && key.0 == scope {
-                return Ok(Some(df.clone()));
-            }
-        }
-        Ok(None)
-    }
-
-    // Returns the formula for a defined name
-    pub(crate) fn get_defined_name_formula(
-        &self,
-        name: &str,
-        scope: Option<u32>,
-    ) -> Result<String, String> {
-        let name_upper = name.to_uppercase();
-        let defined_names = &self.workbook.defined_names;
-        let sheet_id = match scope {
-            Some(index) => Some(self.workbook.worksheet(index)?.sheet_id),
-            None => None,
-        };
-        for df in defined_names {
-            if df.name.to_uppercase() == name_upper && df.sheet_id == sheet_id {
-                return Ok(df.formula.clone());
-            }
-        }
-        Err("Defined name not found".to_string())
-    }
-
     /// Gets the Excel Value (Bool, Number, String) of a cell
     ///
     /// See also:
@@ -1872,29 +1830,12 @@ impl Model {
     }
 
     /// Returns the style for cell (`sheet`, `row`, `column`)
-    /// If the cell does not have a style defined we check the row, otherwise the column and finally a default
     pub fn get_style_for_cell(&self, sheet: u32, row: i32, column: i32) -> Result<Style, String> {
         let style_index = self.get_cell_style_index(sheet, row, column)?;
         let style = self.workbook.styles.get_style(style_index)?;
         Ok(style)
     }
 
-    /// Returns the style defined in a cell if any.
-    pub fn get_cell_style_or_none(
-        &self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-    ) -> Result<Option<Style>, String> {
-        let style = self
-            .workbook
-            .worksheet(sheet)?
-            .cell(row, column)
-            .map(|c| self.workbook.styles.get_style(c.get_style()))
-            .transpose();
-        style
-    }
-
     /// Returns an internal binary representation of the workbook
     ///
     /// See also:
@@ -2055,28 +1996,20 @@ impl Model {
         scope: Option<u32>,
         formula: &str,
     ) -> Result<(), String> {
-        if !is_valid_identifier(name) {
-            return Err("Invalid defined name".to_string());
-        };
         let name_upper = name.to_uppercase();
         let defined_names = &self.workbook.defined_names;
-        let sheet_id = match scope {
-            Some(index) => Some(self.workbook.worksheet(index)?.sheet_id),
-            None => None,
-        };
         // if the defined name already exist return error
         for df in defined_names {
-            if df.name.to_uppercase() == name_upper && df.sheet_id == sheet_id {
+            if df.name.to_uppercase() == name_upper && df.sheet_id == scope {
                 return Err("Defined name already exists".to_string());
             }
         }
         self.workbook.defined_names.push(DefinedName {
             name: name.to_string(),
             formula: formula.to_string(),
-            sheet_id,
+            sheet_id: scope,
         });
         self.reset_parsed_structures();
-
         Ok(())
     }
 
@@ -2084,13 +2017,9 @@ impl Model {
     pub fn delete_defined_name(&mut self, name: &str, scope: Option<u32>) -> Result<(), String> {
         let name_upper = name.to_uppercase();
         let defined_names = &self.workbook.defined_names;
-        let sheet_id = match scope {
-            Some(index) => Some(self.workbook.worksheet(index)?.sheet_id),
-            None => None,
-        };
         let mut index = None;
         for (i, df) in defined_names.iter().enumerate() {
-            if df.name.to_uppercase() == name_upper && df.sheet_id == sheet_id {
+            if df.name.to_uppercase() == name_upper && df.sheet_id == scope {
                 index = Some(i);
             }
         }
@@ -2103,7 +2032,23 @@ impl Model {
         }
     }
 
-    /// Update defined name
+    /// returns the formula for a defined name
+    pub fn get_defined_name_formula(
+        &self,
+        name: &str,
+        scope: Option<u32>,
+    ) -> Result<String, String> {
+        let name_upper = name.to_uppercase();
+        let defined_names = &self.workbook.defined_names;
+        for df in defined_names {
+            if df.name.to_uppercase() == name_upper && df.sheet_id == scope {
+                return Ok(df.formula.clone());
+            }
+        }
+        Err("Defined name not found".to_string())
+    }
+
+    /// update defined name
     pub fn update_defined_name(
         &mut self,
         name: &str,
@@ -2112,64 +2057,18 @@ impl Model {
         new_scope: Option<u32>,
         new_formula: &str,
     ) -> Result<(), String> {
-        if !is_valid_identifier(new_name) {
-            return Err("Invalid defined name".to_string());
-        };
         let name_upper = name.to_uppercase();
-        let new_name_upper = new_name.to_uppercase();
-
-        if name_upper != new_name_upper || scope != new_scope {
-            for key in self.parsed_defined_names.keys() {
-                if key.1.to_uppercase() == new_name_upper && key.0 == new_scope {
-                    return Err("Defined name already exists".to_string());
-                }
-            }
-        }
         let defined_names = &self.workbook.defined_names;
-        let sheet_id = match scope {
-            Some(index) => Some(self.workbook.worksheet(index)?.sheet_id),
-            None => None,
-        };
-
-        let new_sheet_id = match new_scope {
-            Some(index) => Some(self.workbook.worksheet(index)?.sheet_id),
-            None => None,
-        };
-
         let mut index = None;
         for (i, df) in defined_names.iter().enumerate() {
-            if df.name.to_uppercase() == name_upper && df.sheet_id == sheet_id {
+            if df.name.to_uppercase() == name_upper && df.sheet_id == scope {
                 index = Some(i);
             }
         }
         if let Some(i) = index {
             if let Some(df) = self.workbook.defined_names.get_mut(i) {
-                if new_name != df.name {
-                    // We need to rename the name in every formula:
-
-                    // Parse all formulas with the old name
-                    // All internal formulas are R1C1
-                    self.parser.set_lexer_mode(LexerMode::R1C1);
-                    let worksheets = &mut self.workbook.worksheets;
-                    for worksheet in worksheets {
-                        let cell_reference = CellReferenceRC {
-                            sheet: worksheet.get_name(),
-                            row: 1,
-                            column: 1,
-                        };
-                        let mut formulas = Vec::new();
-                        for formula in &worksheet.shared_formulas {
-                            let mut t = self.parser.parse(formula, &cell_reference);
-                            rename_defined_name_in_node(&mut t, name, scope, new_name);
-                            formulas.push(to_rc_format(&t));
-                        }
-                        worksheet.shared_formulas = formulas;
-                    }
-                    // Se the mode back to A1
-                    self.parser.set_lexer_mode(LexerMode::A1);
-                }
                 df.name = new_name.to_string();
-                df.sheet_id = new_sheet_id;
+                df.sheet_id = new_scope;
                 df.formula = new_formula.to_string();
                 self.reset_parsed_structures();
             }
@@ -2178,73 +2077,6 @@ impl Model {
             Err("Defined name not found".to_string())
         }
     }
-    /// Returns the style object of a column, if any
-    pub fn get_column_style(&self, sheet: u32, column: i32) -> Result<Option<Style>, String> {
-        if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
-            let cols = &worksheet.cols;
-            for col in cols {
-                if column >= col.min && column <= col.max {
-                    if let Some(style_index) = col.style {
-                        let style = self.workbook.styles.get_style(style_index)?;
-                        return Ok(Some(style));
-                    }
-                    return Ok(None);
-                }
-            }
-            Ok(None)
-        } else {
-            Err("Invalid sheet".to_string())
-        }
-    }
-
-    /// Returns the style object of a row, if any
-    pub fn get_row_style(&self, sheet: u32, row: i32) -> Result<Option<Style>, String> {
-        if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
-            let rows = &worksheet.rows;
-            for r in rows {
-                if row == r.r {
-                    let style = self.workbook.styles.get_style(r.s)?;
-                    return Ok(Some(style));
-                }
-            }
-            Ok(None)
-        } else {
-            Err("Invalid sheet".to_string())
-        }
-    }
-
-    /// Sets a column with style
-    pub fn set_column_style(
-        &mut self,
-        sheet: u32,
-        column: i32,
-        style: &Style,
-    ) -> Result<(), String> {
-        let style_index = self.workbook.styles.get_style_index_or_create(style);
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_column_style(column, style_index)
-    }
-
-    /// Sets a row with style
-    pub fn set_row_style(&mut self, sheet: u32, row: i32, style: &Style) -> Result<(), String> {
-        let style_index = self.workbook.styles.get_style_index_or_create(style);
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_row_style(row, style_index)
-    }
-
-    /// Deletes the style of a column if the is any
-    pub fn delete_column_style(&mut self, sheet: u32, column: i32) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .delete_column_style(column)
-    }
-
-    /// Deletes the style of a row if there is any
-    pub fn delete_row_style(&mut self, sheet: u32, row: i32) -> Result<(), String> {
-        self.workbook.worksheet_mut(sheet)?.delete_row_style(row)
-    }
 }
 
 #[cfg(test)]

base/src/new_empty.rs

@@ -8,14 +8,14 @@ use crate::{
     expressions::{
         lexer::LexerMode,
         parser::{
-            Parser,
             stringify::{rename_sheet_in_node, to_rc_format},
+            Parser,
         },
         types::CellReferenceRC,
     },
     language::get_language,
     locale::get_locale,
-    model::{Model, ParsedDefinedName, get_milliseconds_since_epoch},
+    model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
     types::{
         Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
     },
@@ -85,14 +85,14 @@ impl Model {
         let worksheets = &self.workbook.worksheets;
         for worksheet in worksheets {
             let shared_formulas = &worksheet.shared_formulas;
-            let cell_reference = CellReferenceRC {
+            let cell_reference = &Some(CellReferenceRC {
                 sheet: worksheet.get_name(),
                 row: 1,
                 column: 1,
-            };
+            });
             let mut parse_formula = Vec::new();
             for formula in shared_formulas {
-                let t = self.parser.parse(formula, &cell_reference);
+                let t = self.parser.parse(formula, cell_reference);
                 parse_formula.push(t);
             }
             self.parsed_formulas.push(parse_formula);
@@ -144,14 +144,8 @@ impl Model {
 
     /// Reparses all formulas and defined names
     pub(crate) fn reset_parsed_structures(&mut self) {
-        let defined_names = self
-            .workbook
-            .get_defined_names_with_scope()
-            .iter()
-            .map(|s| (s.0.to_owned(), s.1))
-            .collect();
         self.parser
-            .set_worksheets_and_names(self.workbook.get_worksheet_names(), defined_names);
+            .set_worksheets(self.workbook.get_worksheet_names());
         self.parsed_formulas = vec![];
         self.parse_formulas();
         self.parsed_defined_names = HashMap::new();
@@ -268,11 +262,11 @@ impl Model {
         // We use iter because the default would be a mut_iter and we don't need a mutable reference
         let worksheets = &mut self.workbook.worksheets;
         for worksheet in worksheets {
-            let cell_reference = &CellReferenceRC {
+            let cell_reference = &Some(CellReferenceRC {
                 sheet: worksheet.get_name(),
                 row: 1,
                 column: 1,
-            };
+            });
             let mut formulas = Vec::new();
             for formula in &worksheet.shared_formulas {
                 let mut t = self.parser.parse(formula, cell_reference);
@@ -301,7 +295,7 @@ impl Model {
         };
         if sheet_index >= sheet_count {
             return Err("Sheet index too large".to_string());
-        };
+        }
         self.workbook.worksheets.remove(sheet_index as usize);
         self.reset_parsed_structures();
         Ok(())
@@ -394,7 +388,7 @@ impl Model {
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;
         let worksheet_names = worksheets.iter().map(|s| s.get_name()).collect();
-        let parser = Parser::new(worksheet_names, vec![], HashMap::new());
+        let parser = Parser::new(worksheet_names, HashMap::new());
         let cells = HashMap::new();
 
         // FIXME: Add support for display languages

base/src/number_format.rs

@@ -150,7 +150,7 @@ pub fn format_number(value: f64, format_code: &str, locale: &str) -> Formatted {
                 text: "#ERROR!".to_owned(),
                 color: None,
                 error: Some("Invalid locale".to_string()),
-            };
+            }
         }
     };
     formatter::format::format_number(value, format_code, locale)

base/src/styles.rs

@@ -4,6 +4,8 @@ use crate::{
     types::{Border, CellStyles, CellXfs, Fill, Font, NumFmt, Style, Styles},
 };
 
+// TODO: Move Styles and all related types from crate::types here
+// Not doing it right now to not have conflicts with exporter branch
 impl Styles {
     fn get_font_index(&self, font: &Font) -> Option<i32> {
         for (font_index, item) in self.fonts.iter().enumerate() {

base/src/test/mod.rs

@@ -13,14 +13,12 @@ mod test_fn_averageifs;
 mod test_fn_choose;
 mod test_fn_concatenate;
 mod test_fn_count;
-mod test_fn_day;
 mod test_fn_exact;
 mod test_fn_financial;
 mod test_fn_formulatext;
 mod test_fn_if;
 mod test_fn_maxifs;
 mod test_fn_minifs;
-mod test_fn_or_xor;
 mod test_fn_product;
 mod test_fn_rept;
 mod test_fn_sum;
@@ -37,19 +35,18 @@ mod test_model_cell_clear_all;
 mod test_model_is_empty_cell;
 mod test_move_formula;
 mod test_quote_prefix;
-mod test_row_column_styles;
 mod test_set_user_input;
 mod test_sheet_markup;
 mod test_sheets;
 mod test_styles;
 mod test_trigonometric;
-mod test_true_false;
 mod test_workbook;
 mod test_worksheet;
 pub(crate) mod util;
 
 mod engineering;
 mod test_fn_offset;
+mod test_fn_or;
 mod test_number_format;
 
 mod test_escape_quotes;

base/src/test/test_actions.rs

@@ -206,11 +206,9 @@ fn test_delete_column_width() {
     let (sheet, column) = (0, 5);
     let normal_width = model.get_column_width(sheet, column).unwrap();
     // Set the width of one column to 5 times the normal width
-    assert!(
-        model
-            .set_column_width(sheet, column, normal_width * 5.0)
-            .is_ok()
-    );
+    assert!(model
+        .set_column_width(sheet, column, normal_width * 5.0)
+        .is_ok());
 
     // delete it
     assert!(model.delete_columns(sheet, column, 1).is_ok());

base/src/test/test_date_and_time.rs

@@ -37,12 +37,12 @@ fn test_fn_date_arguments() {
     assert_eq!(model._get_text("A3"), *"#ERROR!");
     assert_eq!(model._get_text("A4"), *"#ERROR!");
 
-    assert_eq!(model._get_text("A5"), *"10/10/1974");
-    assert_eq!(model._get_text("A6"), *"21/01/1975");
-    assert_eq!(model._get_text("A7"), *"10/02/1976");
-    assert_eq!(model._get_text("A8"), *"02/03/1975");
+    assert_eq!(model._get_text("A5"), *"#NUM!");
+    assert_eq!(model._get_text("A6"), *"#NUM!");
+    assert_eq!(model._get_text("A7"), *"#NUM!");
+    assert_eq!(model._get_text("A8"), *"#NUM!");
 
-    assert_eq!(model._get_text("A9"), *"01/03/1975");
+    assert_eq!(model._get_text("A9"), *"#NUM!");
     assert_eq!(model._get_text("A10"), *"29/02/1976");
     assert_eq!(
         model.get_cell_value_by_ref("Sheet1!A10"),
@@ -64,18 +64,15 @@ fn test_date_out_of_range() {
 
     // year (actually years < 1900 don't really make sense)
     model._set("C1", "=DATE(-1, 5, 5)");
-    // excel is not compatible with years past 9999
-    model._set("C2", "=DATE(10000, 5, 5)");
 
     model.evaluate();
 
-    assert_eq!(model._get_text("A1"), *"10/12/2021");
-    assert_eq!(model._get_text("A2"), *"10/01/2023");
-    assert_eq!(model._get_text("B1"), *"30/04/2042");
-    assert_eq!(model._get_text("B2"), *"01/06/2025");
+    assert_eq!(model._get_text("A1"), *"#NUM!");
+    assert_eq!(model._get_text("A2"), *"#NUM!");
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
 
     assert_eq!(model._get_text("C1"), *"#NUM!");
-    assert_eq!(model._get_text("C2"), *"#NUM!");
 }
 
 #[test]
@@ -132,7 +129,8 @@ fn test_day_small_serial() {
     model.evaluate();
 
     assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"30");
     // Excel thinks is Feb 29, 1900
     assert_eq!(model._get_text("A3"), *"28");
 
@@ -152,7 +150,8 @@ fn test_month_small_serial() {
     model.evaluate();
 
     assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"12");
     // We agree with Excel here (We are both in Feb)
     assert_eq!(model._get_text("A3"), *"2");
 
@@ -172,7 +171,8 @@ fn test_year_small_serial() {
     model.evaluate();
 
     assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"#NUM!");
+    // This agrees with Google Docs and disagrees with Excel
+    assert_eq!(model._get_text("A2"), *"1899");
 
     assert_eq!(model._get_text("A3"), *"1900");
 
@@ -204,10 +204,7 @@ fn test_date_early_dates() {
         model.get_cell_value_by_ref("Sheet1!A2"),
         Ok(CellValue::Number(60.0))
     );
-
-    // This does not agree with Excel, instead of mistakenly allowing
-    // for Feb 29, it will auto-wrap to the next day after Feb 28.
-    assert_eq!(model._get_text("B2"), *"01/03/1900");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
 
     // This agrees with Excel from he onward
     assert_eq!(model._get_text("A3"), *"01/03/1900");

base/src/test/test_fn_day.rs

@@ -1,15 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn test_fn_date_arguments() {
-    let mut model = new_empty_model();
-
-    model._set("A1", "=DAY(95051806)");
-    model._set("A2", "=DAY(2958465)");
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"#NUM!");
-    assert_eq!(model._get_text("A2"), *"31");
-}

base/src/test/test_fn_or.rs

@@ -0,0 +1,36 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn fn_or() {
+    let mut model = new_empty_model();
+    model._set("A1", "=OR(1, 0)");
+    model._set("A2", "=OR(0, 0)");
+    model._set("A3", "=OR(true, false)");
+    model._set("A4", "=OR(false, false)");
+
+    model.evaluate();
+    assert_eq!(model._get_text("A1"), *"TRUE");
+    assert_eq!(model._get_text("A2"), *"FALSE");
+    assert_eq!(model._get_text("A3"), *"TRUE");
+    assert_eq!(model._get_text("A4"), *"FALSE");
+}
+
+#[test]
+fn fn_or_no_arguments() {
+    let mut model = new_empty_model();
+    model._set("A1", "=OR()");
+    model.evaluate();
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
+}
+
+#[test]
+fn fn_or_missing_arguments() {
+    let mut model = new_empty_model();
+    model._set("A1", "=OR(,)");
+    model._set("A2", "=OR(,1)");
+    model.evaluate();
+    assert_eq!(model._get_text("A1"), *"FALSE");
+    assert_eq!(model._get_text("A2"), *"TRUE");
+}

base/src/test/test_fn_or_xor.rs

@@ -1,204 +0,0 @@
-#![allow(clippy::unwrap_used)]
-#![allow(clippy::print_stdout)]
-use crate::test::util::new_empty_model;
-
-// These tests are grouped because in many cases XOR and OR have similar behaviour.
-
-// Test specific to xor
-#[test]
-fn fn_xor() {
-    let mut model = new_empty_model();
-
-    model._set("A1", "=XOR(1, 1, 1, 0, 0)");
-    model._set("A2", "=XOR(1, 1, 0, 0, 0)");
-    model._set("A3", "=XOR(TRUE, TRUE, TRUE, FALSE, FALSE)");
-    model._set("A4", "=XOR(TRUE, TRUE, FALSE, FALSE, FALSE)");
-    model._set("A5", "=XOR(FALSE, FALSE, FALSE, FALSE, FALSE)");
-    model._set("A6", "=XOR(TRUE, TRUE)");
-    model._set("A7", "=XOR(0,0,0)");
-    model._set("A8", "=XOR(0,0,1)");
-    model._set("A9", "=XOR(0,1,0)");
-    model._set("A10", "=XOR(0,1,1)");
-    model._set("A11", "=XOR(1,0,0)");
-    model._set("A12", "=XOR(1,0,1)");
-    model._set("A13", "=XOR(1,1,0)");
-    model._set("A14", "=XOR(1,1,1)");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"TRUE");
-    assert_eq!(model._get_text("A2"), *"FALSE");
-    assert_eq!(model._get_text("A3"), *"TRUE");
-    assert_eq!(model._get_text("A4"), *"FALSE");
-    assert_eq!(model._get_text("A5"), *"FALSE");
-    assert_eq!(model._get_text("A6"), *"FALSE");
-    assert_eq!(model._get_text("A7"), *"FALSE");
-    assert_eq!(model._get_text("A8"), *"TRUE");
-    assert_eq!(model._get_text("A9"), *"TRUE");
-    assert_eq!(model._get_text("A10"), *"FALSE");
-    assert_eq!(model._get_text("A11"), *"TRUE");
-    assert_eq!(model._get_text("A12"), *"FALSE");
-    assert_eq!(model._get_text("A13"), *"FALSE");
-    assert_eq!(model._get_text("A14"), *"TRUE");
-}
-
-#[test]
-fn fn_or() {
-    let mut model = new_empty_model();
-
-    model._set("A1", "=OR(1, 1, 1, 0, 0)");
-    model._set("A2", "=OR(1, 1, 0, 0, 0)");
-    model._set("A3", "=OR(TRUE, TRUE, TRUE, FALSE, FALSE)");
-    model._set("A4", "=OR(TRUE, TRUE, FALSE, FALSE, FALSE)");
-    model._set("A5", "=OR(FALSE, FALSE, FALSE, FALSE, FALSE)");
-    model._set("A6", "=OR(TRUE, TRUE)");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"TRUE");
-    assert_eq!(model._get_text("A2"), *"TRUE");
-    assert_eq!(model._get_text("A3"), *"TRUE");
-    assert_eq!(model._get_text("A4"), *"TRUE");
-    assert_eq!(model._get_text("A5"), *"FALSE");
-    assert_eq!(model._get_text("A6"), *"TRUE");
-}
-
-#[test]
-fn fn_or_xor() {
-    inner("or");
-    inner("xor");
-
-    fn inner(func: &str) {
-        println!("Testing function: {func}");
-
-        let mut model = new_empty_model();
-
-        // Text args
-        model._set("A1", &format!(r#"={func}("")"#));
-        model._set("A2", &format!(r#"={func}("", "")"#));
-        model._set("A3", &format!(r#"={func}("", TRUE)"#));
-        model._set("A4", &format!(r#"={func}("", FALSE)"#));
-
-        model._set("A5", &format!("={func}(FALSE, TRUE)"));
-        model._set("A6", &format!("={func}(FALSE, FALSE)"));
-        model._set("A7", &format!("={func}(TRUE, FALSE)"));
-
-        // Reference to empty cell, plus true argument
-        model._set("A8", &format!("={func}(Z99, 1)"));
-
-        // Reference to empty cell/range
-        model._set("A9", &format!("={func}(Z99)"));
-        model._set("A10", &format!("={func}(X99:Z99"));
-
-        // Reference to cell with reference to empty range
-        model._set("B11", "=X99:Z99");
-        model._set("A11", &format!("={func}(B11)"));
-
-        // Reference to cell with non-empty range
-        model._set("X12", "1");
-        model._set("B12", "=X12:Z12");
-        model._set("A12", &format!("={func}(B12)"));
-
-        // Reference to text cell
-        model._set("B13", "some_text");
-        model._set("A13", &format!("={func}(B13)"));
-        model._set("A14", &format!("={func}(B13, 0)"));
-        model._set("A15", &format!("={func}(B13, 1)"));
-
-        // Reference to Implicit intersection
-        model._set("X16", "1");
-        model._set("B16", "=@X15:X16");
-        model._set("A16", &format!("={func}(B16)"));
-
-        // Non-empty range
-        model._set("B17", "1");
-        model._set("A17", &format!("={func}(B17:C17)"));
-
-        // Non-empty range with text
-        model._set("B18", "text");
-        model._set("A18", &format!("={func}(B18:C18)"));
-
-        // Non-empty range with text and number
-        model._set("B19", "text");
-        model._set("C19", "1");
-        model._set("A19", &format!("={func}(B19:C19)"));
-
-        // range with error
-        model._set("B20", "=1/0");
-        model._set("A20", &format!("={func}(B20:C20)"));
-
-        model.evaluate();
-
-        assert_eq!(model._get_text("A1"), *"#VALUE!");
-        assert_eq!(model._get_text("A2"), *"#VALUE!");
-        assert_eq!(model._get_text("A3"), *"TRUE");
-        assert_eq!(model._get_text("A4"), *"FALSE");
-
-        assert_eq!(model._get_text("A5"), *"TRUE");
-        assert_eq!(model._get_text("A6"), *"FALSE");
-        assert_eq!(model._get_text("A7"), *"TRUE");
-
-        assert_eq!(model._get_text("A8"), *"TRUE");
-
-        assert_eq!(model._get_text("A9"), *"#VALUE!");
-        assert_eq!(model._get_text("A10"), *"#VALUE!");
-
-        assert_eq!(model._get_text("A11"), *"#VALUE!");
-
-        // TODO: This one depends on spill behaviour which isn't implemented yet
-        // assert_eq!(model._get_text("A12"), *"TRUE");
-
-        assert_eq!(model._get_text("A13"), *"#VALUE!");
-        assert_eq!(model._get_text("A14"), *"FALSE");
-        assert_eq!(model._get_text("A15"), *"TRUE");
-
-        // TODO: This one depends on @ implicit intersection behaviour which isn't implemented yet
-        // assert_eq!(model._get_text("A16"), *"TRUE");
-
-        assert_eq!(model._get_text("A17"), *"TRUE");
-
-        assert_eq!(model._get_text("A18"), *"#VALUE!");
-
-        assert_eq!(model._get_text("A19"), *"TRUE");
-
-        assert_eq!(model._get_text("A20"), *"#DIV/0!");
-    }
-}
-
-#[test]
-fn fn_or_xor_no_arguments() {
-    inner("or");
-    inner("xor");
-
-    fn inner(func: &str) {
-        println!("Testing function: {func}");
-
-        let mut model = new_empty_model();
-        model._set("A1", &format!("={}()", func));
-        model.evaluate();
-        assert_eq!(model._get_text("A1"), *"#ERROR!");
-    }
-}
-
-#[test]
-fn fn_or_xor_missing_arguments() {
-    inner("or");
-    inner("xor");
-
-    fn inner(func: &str) {
-        println!("Testing function: {func}");
-
-        let mut model = new_empty_model();
-        model._set("A1", &format!("={func}(,)"));
-        model._set("A2", &format!("={func}(,1)"));
-        model._set("A3", &format!("={func}(1,)"));
-        model._set("A4", &format!("={func}(,B1)"));
-        model._set("A5", &format!("={func}(,B1:B4)"));
-        model.evaluate();
-        assert_eq!(model._get_text("A1"), *"FALSE");
-        assert_eq!(model._get_text("A2"), *"TRUE");
-        assert_eq!(model._get_text("A3"), *"TRUE");
-        assert_eq!(model._get_text("A4"), *"FALSE");
-        assert_eq!(model._get_text("A5"), *"FALSE");
-    }
-}

base/src/test/test_move_formula.rs

@@ -179,60 +179,52 @@ fn test_move_formula_rectangle() {
         width: 2,
         height: 20,
     };
-    assert!(
-        model
-            .move_cell_value_to_area(
-                value,
-                &CellReferenceIndex {
-                    sheet: 0,
-                    column: 3,
-                    row: 1,
-                },
-                target,
-                area
-            )
-            .is_err()
-    );
-    assert!(
-        model
-            .move_cell_value_to_area(
-                value,
-                &CellReferenceIndex {
-                    sheet: 0,
-                    column: 2,
-                    row: 1,
-                },
-                target,
-                area
-            )
-            .is_ok()
-    );
-    assert!(
-        model
-            .move_cell_value_to_area(
-                value,
-                &CellReferenceIndex {
-                    sheet: 0,
-                    column: 1,
-                    row: 20,
-                },
-                target,
-                area
-            )
-            .is_ok()
-    );
-    assert!(
-        model
-            .move_cell_value_to_area(
-                value,
-                &CellReferenceIndex {
-                    sheet: 0,
-                    column: 1,
-                    row: 21,
-                },
-                target,
-                area
-            )
-            .is_err()
-    );
+    assert!(model
+        .move_cell_value_to_area(
+            value,
+            &CellReferenceIndex {
+                sheet: 0,
+                column: 3,
+                row: 1,
+            },
+            target,
+            area
+        )
+        .is_err());
+    assert!(model
+        .move_cell_value_to_area(
+            value,
+            &CellReferenceIndex {
+                sheet: 0,
+                column: 2,
+                row: 1,
+            },
+            target,
+            area
+        )
+        .is_ok());
+    assert!(model
+        .move_cell_value_to_area(
+            value,
+            &CellReferenceIndex {
+                sheet: 0,
+                column: 1,
+                row: 20,
+            },
+            target,
+            area
+        )
+        .is_ok());
+    assert!(model
+        .move_cell_value_to_area(
+            value,
+            &CellReferenceIndex {
+                sheet: 0,
+                column: 1,
+                row: 21,
+            },
+            target,
+            area
+        )
+        .is_err());
 }

base/src/test/test_row_column_styles.rs

@@ -1,32 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{constants::DEFAULT_COLUMN_WIDTH, test::util::new_empty_model};
-
-#[test]
-fn test_model_set_cells_with_values_styles() {
-    let mut model = new_empty_model();
-
-    let style_base = model.get_style_for_cell(0, 1, 1).unwrap();
-    let mut style = style_base.clone();
-    style.font.b = true;
-
-    model.set_column_style(0, 10, &style).unwrap();
-
-    assert!(model.get_style_for_cell(0, 21, 10).unwrap().font.b);
-
-    model.delete_column_style(0, 10).unwrap();
-
-    // There are no styles in the column
-    assert!(model.workbook.worksheets[0].cols.is_empty());
-
-    // lets change the column width and check it does not affect the style
-    model
-        .set_column_width(0, 10, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-    model.set_column_style(0, 10, &style).unwrap();
-
-    model.delete_column_style(0, 10).unwrap();
-
-    // There are no styles in the column
-    assert!(model.workbook.worksheets[0].cols.len() == 1);
-}

base/src/test/test_true_false.rs

@@ -1,25 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn true_false_arguments() {
-    let mut model = new_empty_model();
-    model._set("A1", "=TRUE( )");
-    model._set("A2", "=FALSE( )");
-    model._set("A3", "=TRUE( 4 )");
-    model._set("A4", "=FALSE( 4 )");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"TRUE");
-    assert_eq!(model._get_text("A2"), *"FALSE");
-
-    assert_eq!(model._get_formula("A1"), *"=TRUE()");
-    assert_eq!(model._get_formula("A2"), *"=FALSE()");
-
-    assert_eq!(model._get_text("A3"), *"#ERROR!");
-    assert_eq!(model._get_text("A4"), *"#ERROR!");
-    assert_eq!(model._get_formula("A3"), *"=TRUE(4)");
-    assert_eq!(model._get_formula("A4"), *"=FALSE(4)");
-}

base/src/test/user_model/mod.rs

@@ -3,9 +3,7 @@ mod test_autofill_columns;
 mod test_autofill_rows;
 mod test_border;
 mod test_clear_cells;
-mod test_column_style;
 mod test_defined_names;
-mod test_delete_row_column_formatting;
 mod test_diff_queue;
 mod test_evaluation;
 mod test_general;
@@ -15,11 +13,8 @@ mod test_on_area_selection;
 mod test_on_expand_selected_range;
 mod test_on_paste_styles;
 mod test_paste_csv;
-mod test_recursive;
 mod test_rename_sheet;
 mod test_row_column;
-mod test_sheet_state;
-mod test_sheets_undo_redo;
 mod test_styles;
 mod test_to_from_bytes;
 mod test_undo_redo;

base/src/test/user_model/test_add_delete_sheets.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{UserModel, constants::DEFAULT_COLUMN_WIDTH};
+use crate::{constants::DEFAULT_COLUMN_WIDTH, UserModel};
 
 #[test]
 fn add_undo_redo() {
@@ -9,7 +9,7 @@ fn add_undo_redo() {
     model.set_user_input(1, 1, 1, "=1 + 1").unwrap();
     model.set_user_input(1, 1, 2, "=A1*3").unwrap();
     model
-        .set_columns_width(1, 5, 5, 5.0 * DEFAULT_COLUMN_WIDTH)
+        .set_column_width(1, 5, 5.0 * DEFAULT_COLUMN_WIDTH)
         .unwrap();
     model.new_sheet().unwrap();
     model.set_user_input(2, 1, 1, "=Sheet2!B1").unwrap();
@@ -25,6 +25,9 @@ fn add_undo_redo() {
     assert_eq!(model.get_formatted_cell_value(2, 1, 1), Ok("6".to_string()));
 
     model.delete_sheet(1).unwrap();
+
+    assert!(!model.can_undo());
+    assert!(!model.can_redo());
 }
 
 #[test]

base/src/test/user_model/test_autofill_columns.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::UserModel;
 use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::expressions::types::Area;
 use crate::test::util::new_empty_model;
+use crate::UserModel;
 
 #[test]
 fn basic_tests() {

base/src/test/user_model/test_autofill_rows.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::UserModel;
 use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::expressions::types::Area;
 use crate::test::util::new_empty_model;
+use crate::UserModel;
 
 #[test]
 fn basic_tests() {

base/src/test/user_model/test_border.rs

@@ -1,10 +1,10 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    BorderArea, UserModel,
     constants::{LAST_COLUMN, LAST_ROW},
     expressions::{types::Area, utils::number_to_column},
     types::{Border, BorderItem, BorderStyle},
+    BorderArea, UserModel,
 };
 
 // checks there are no borders in the sheet
@@ -520,19 +520,14 @@ fn borders_top() {
     .unwrap();
     model.set_area_with_border(range, &border_area).unwrap();
     check_borders(&model);
-    for row in 4..9 {
+    for row in 5..9 {
         for column in 6..9 {
             let style = model.get_cell_style(0, row, column).unwrap();
             let border_item = BorderItem {
                 style: BorderStyle::Thin,
                 color: Some("#FF5566".to_string()),
             };
-            let bottom = if row != 4 {
-                None
-            } else {
-                Some(border_item.clone())
-            };
-            let top = if row != 5 {
+            let bottom = if row == 8 {
                 None
             } else {
                 Some(border_item.clone())
@@ -542,7 +537,7 @@ fn borders_top() {
                 diagonal_down: false,
                 left: None,
                 right: None,
-                top,
+                top: Some(border_item.clone()),
                 bottom,
                 diagonal: None,
             };
@@ -652,12 +647,12 @@ fn borders_right() {
                 style: BorderStyle::Thin,
                 color: Some("#FF5566".to_string()),
             };
-            let left = if column != 9 {
+            let left = if column == 6 {
                 None
             } else {
                 Some(border_item.clone())
             };
-            let right = if column != 8 {
+            let right = if column == 9 {
                 None
             } else {
                 Some(border_item.clone())
@@ -710,7 +705,7 @@ fn borders_bottom() {
                 color: Some("#FF5566".to_string()),
             };
             // The top will also have a value for all but the first one
-            let bottom = if row != 8 {
+            let top = if row == 5 {
                 None
             } else {
                 Some(border_item.clone())
@@ -720,8 +715,8 @@ fn borders_bottom() {
                 diagonal_down: false,
                 left: None,
                 right: None,
-                top: None,
-                bottom,
+                top,
+                bottom: Some(border_item.clone()),
                 diagonal: None,
             };
             assert_eq!(style.border, expected_border);
@@ -756,13 +751,18 @@ fn borders_left() {
     model.set_area_with_border(range, &border_area).unwrap();
 
     for row in 5..9 {
-        for column in 6..9 {
+        for column in 5..9 {
             let style = model.get_cell_style(0, row, column).unwrap();
             let border_item = BorderItem {
                 style: BorderStyle::Thin,
                 color: Some("#FF5566".to_string()),
             };
-            let left = if column != 6 {
+            let left = if column == 5 {
+                None
+            } else {
+                Some(border_item.clone())
+            };
+            let right = if column == 8 {
                 None
             } else {
                 Some(border_item.clone())
@@ -771,29 +771,13 @@ fn borders_left() {
                 diagonal_up: false,
                 diagonal_down: false,
                 left,
-                right: None,
+                right,
                 top: None,
                 bottom: None,
                 diagonal: None,
             };
             assert_eq!(style.border, expected_border);
         }
-        // Column 5 has a border to the right, of course:
-        let style = model.get_cell_style(0, row, 5).unwrap();
-        let border_item = BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#FF5566".to_string()),
-        };
-        let expected_border = Border {
-            diagonal_up: false,
-            diagonal_down: false,
-            left: None,
-            right: Some(border_item.clone()),
-            top: None,
-            bottom: None,
-            diagonal: None,
-        };
-        assert_eq!(style.border, expected_border);
     }
 }
 
@@ -1034,7 +1018,10 @@ fn border_top() {
         style: BorderStyle::Thin,
         color: Some("#F2F2F2".to_string()),
     };
-    assert_eq!(model._get_cell_actual_border("C4").top, Some(border_item));
+    assert_eq!(
+        model._get_cell_actual_border("C4").bottom,
+        Some(border_item)
+    );
 
     model.undo().unwrap();
 

base/src/test/user_model/test_clear_cells.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{UserModel, expressions::types::Area};
+use crate::{expressions::types::Area, UserModel};
 
 #[test]
 fn basic() {

base/src/test/user_model/test_column_style.rs

@@ -1,504 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-use crate::constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW};
-use crate::expressions::types::Area;
-
-#[test]
-fn column_width() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.i);
-    assert!(!style.font.b);
-    assert!(!style.font.u);
-    assert!(!style.font.strike);
-    assert_eq!(style.font.color, Some("#000000".to_owned()));
-
-    // Set the whole column style and check it works
-    model.update_range_style(&range, "font.b", "true").unwrap();
-    let style = model.get_cell_style(0, 109, 7).unwrap();
-    assert!(style.font.b);
-
-    // undo and check it works
-    model.undo().unwrap();
-    let style = model.get_cell_style(0, 109, 7).unwrap();
-    assert!(!style.font.b);
-
-    // redo and check it works
-    model.redo().unwrap();
-    let style = model.get_cell_style(0, 109, 7).unwrap();
-    assert!(style.font.b);
-
-    // change the column width and check it does not affect the style
-    model
-        .set_columns_width(0, 7, 7, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-    let style = model.get_cell_style(0, 109, 7).unwrap();
-    assert!(style.font.b);
-}
-
-#[test]
-fn existing_style() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let cell_g123 = Area {
-        sheet: 0,
-        row: 123,
-        column: 7,
-        width: 1,
-        height: 1,
-    };
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    // Set G123 background to red
-    model
-        .update_range_style(&cell_g123, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // Now set the style of the whole column
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    // Get the style of G123
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_owned()));
-
-    model.undo().unwrap();
-
-    // Check the style of G123 is now what it was before
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-
-    model.redo().unwrap();
-
-    // Check G123 has the column style now
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_owned()));
-}
-
-#[test]
-fn row_column() {
-    // We set the row style, then a column style
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_3_range = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // update the row style
-    model
-        .update_range_style(&row_3_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // update the column style
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    // Check G3 has the column style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_owned()));
-
-    // undo twice. Color must be default
-    model.undo().unwrap();
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-    model.undo().unwrap();
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-}
-
-#[test]
-fn column_row() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let default_style = model.get_cell_style(0, 3, 7).unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_3_range = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // update the column style
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    // update the row style
-    model
-        .update_range_style(&row_3_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // Check G3 has the row style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-
-    model.undo().unwrap();
-
-    // Check G3 has the column style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_owned()));
-
-    model.undo().unwrap();
-
-    // Check G3 has the default_style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, default_style.fill.bg_color);
-}
-
-#[test]
-fn row_column_column() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let column_c_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 3,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let column_e_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 5,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_5_range = Area {
-        sheet: 0,
-        row: 5,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // update the row style
-    model
-        .update_range_style(&row_5_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // update the column style
-    model
-        .update_range_style(&column_c_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    model
-        .update_range_style(&column_e_range, "fill.bg_color", "#CCC111")
-        .unwrap();
-
-    model.undo().unwrap();
-    model.undo().unwrap();
-    model.undo().unwrap();
-
-    // Test E5 has the default style
-    let style = model.get_cell_style(0, 5, 5).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-}
-
-#[test]
-fn width_column_undo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    model
-        .set_columns_width(0, 7, 7, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#CCC111")
-        .unwrap();
-
-    model.undo().unwrap();
-
-    assert_eq!(
-        model.get_column_width(0, 7).unwrap(),
-        DEFAULT_COLUMN_WIDTH * 2.0
-    );
-}
-
-#[test]
-fn height_row_undo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model
-        .set_rows_height(0, 10, 10, DEFAULT_ROW_HEIGHT * 2.0)
-        .unwrap();
-
-    let row_10_range = Area {
-        sheet: 0,
-        row: 10,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    model
-        .update_range_style(&row_10_range, "fill.bg_color", "#CCC111")
-        .unwrap();
-
-    assert_eq!(
-        model.get_row_height(0, 10).unwrap(),
-        2.0 * DEFAULT_ROW_HEIGHT
-    );
-    model.undo().unwrap();
-    assert_eq!(
-        model.get_row_height(0, 10).unwrap(),
-        2.0 * DEFAULT_ROW_HEIGHT
-    );
-    model.undo().unwrap();
-    assert_eq!(model.get_row_height(0, 10).unwrap(), DEFAULT_ROW_HEIGHT);
-}
-
-#[test]
-fn cell_row_undo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let cell_g12 = Area {
-        sheet: 0,
-        row: 12,
-        column: 7,
-        width: 1,
-        height: 1,
-    };
-
-    let row_12_range = Area {
-        sheet: 0,
-        row: 12,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // Set G12 background to red
-    model
-        .update_range_style(&cell_g12, "fill.bg_color", "#333444")
-        .unwrap();
-
-    model
-        .update_range_style(&row_12_range, "fill.bg_color", "#CCC111")
-        .unwrap();
-
-    let style = model.get_cell_style(0, 12, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#CCC111".to_string()));
-    model.undo().unwrap();
-
-    let style = model.get_cell_style(0, 12, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_string()));
-}
-
-#[test]
-fn set_column_style_then_cell() {
-    // We check that if we set a cell style in a column that already has a style
-    // the styles compound
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let cell_g12 = Area {
-        sheet: 0,
-        row: 12,
-        column: 7,
-        width: 1,
-        height: 1,
-    };
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    // Set G12 background to red
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    model
-        .update_range_style(&cell_g12, "alignment.horizontal", "center")
-        .unwrap();
-
-    let style = model.get_cell_style(0, 12, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_string()));
-
-    model.undo().unwrap();
-    model.undo().unwrap();
-    let style = model.get_cell_style(0, 12, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-}
-
-#[test]
-fn set_row_style_then_cell() {
-    // We check that if we set a cell style in a column that already has a style
-    // the styles compound
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let cell_g12 = Area {
-        sheet: 0,
-        row: 12,
-        column: 7,
-        width: 1,
-        height: 1,
-    };
-
-    let row_12_range = Area {
-        sheet: 0,
-        row: 12,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // Set G12 background to red
-    model
-        .update_range_style(&row_12_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    model
-        .update_range_style(&cell_g12, "alignment.horizontal", "center")
-        .unwrap();
-
-    let style = model.get_cell_style(0, 12, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_string()));
-}
-
-#[test]
-fn column_style_then_row_alignment() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-    let row_3_range = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-    model
-        .update_range_style(&row_3_range, "alignment.horizontal", "center")
-        .unwrap();
-    // check the row alignment does not affect the column style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_string()));
-}
-
-#[test]
-fn column_style_then_width() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-    model
-        .set_columns_width(0, 7, 7, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-
-    // Check column width worked:
-    assert_eq!(
-        model.get_column_width(0, 7).unwrap(),
-        DEFAULT_COLUMN_WIDTH * 2.0
-    );
-}
-
-#[test]
-fn test_row_column_column() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let column_c_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 3,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let column_e_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 5,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_5_range = Area {
-        sheet: 0,
-        row: 5,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // update the row style
-    model
-        .update_range_style(&row_5_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // update the column style
-    model
-        .update_range_style(&column_c_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    model
-        .update_range_style(&column_e_range, "fill.bg_color", "#CCC111")
-        .unwrap();
-
-    // test E5 has the column style
-    let style = model.get_cell_style(0, 5, 5).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#CCC111".to_string()));
-}

base/src/test/user_model/test_defined_names.rs

@@ -6,420 +6,35 @@ use crate::UserModel;
 fn create_defined_name() {
     let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
     model.set_user_input(0, 1, 1, "42").unwrap();
-    model
-        .new_defined_name("myName", None, "Sheet1!$A$1")
-        .unwrap();
+    model.new_defined_name("myName", None, "$A$1").unwrap();
     model.set_user_input(0, 5, 7, "=myName").unwrap();
     assert_eq!(
         model.get_formatted_cell_value(0, 5, 7),
         Ok("42".to_string())
     );
 
+    // rename it
+    model
+        .update_defined_name("myName", None, "myName", None, "$A$1*2")
+        .unwrap();
     assert_eq!(
-        model.get_defined_name_list(),
-        vec![("myName".to_string(), None, "Sheet1!$A$1".to_string())]
+        model.get_formatted_cell_value(0, 5, 7),
+        Ok("42".to_string())
     );
 
     // delete it
     model.delete_defined_name("myName", None).unwrap();
     assert_eq!(
         model.get_formatted_cell_value(0, 5, 7),
-        Ok("#NAME?".to_string())
-    );
-
-    assert_eq!(model.get_defined_name_list().len(), 0);
-
-    model.undo().unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 7),
-        Ok("42".to_string())
+        Ok("#REF!".to_string())
     );
 }
 
 #[test]
-fn scopes() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "42").unwrap();
-
-    // Global
-    model
-        .new_defined_name("myName", None, "Sheet1!$A$1")
-        .unwrap();
-    model.set_user_input(0, 5, 7, "=myName").unwrap();
-
-    // Local to Sheet2
-    model.new_sheet().unwrap();
-    model.set_user_input(1, 2, 1, "145").unwrap();
-    model
-        .new_defined_name("myName", Some(1), "Sheet2!$A$2")
-        .unwrap();
-    model.set_user_input(1, 8, 8, "=myName").unwrap();
-
-    // Sheet 3
-    model.new_sheet().unwrap();
-    model.set_user_input(2, 2, 2, "=myName").unwrap();
-
-    // Global
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 7),
-        Ok("42".to_string())
-    );
-
-    assert_eq!(
-        model.get_formatted_cell_value(1, 8, 8),
-        Ok("145".to_string())
-    );
-
-    assert_eq!(
-        model.get_formatted_cell_value(2, 2, 2),
-        Ok("42".to_string())
-    );
-}
+fn rename_defined_name() {}
 
 #[test]
-fn delete_sheet() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .set_user_input(0, 2, 1, r#"=CONCATENATE(MyName, " world!")"#)
-        .unwrap();
-    model.new_sheet().unwrap();
-    model
-        .new_defined_name("myName", Some(1), "Sheet1!$A$1")
-        .unwrap();
-    model
-        .set_user_input(1, 2, 1, r#"=CONCATENATE(MyName, " my world!")"#)
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("#NAME?".to_string())
-    );
-
-    assert_eq!(
-        model.get_formatted_cell_value(1, 2, 1),
-        Ok("Hello my world!".to_string())
-    );
-
-    model.delete_sheet(0).unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("#NAME?".to_string())
-    );
-
-    assert_eq!(
-        model.get_cell_content(0, 2, 1),
-        Ok(r#"=CONCATENATE(MyName," my world!")"#.to_string())
-    );
-}
+fn delete_sheet() {}
 
 #[test]
-fn change_scope() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .set_user_input(0, 2, 1, r#"=CONCATENATE(MyName, " world!")"#)
-        .unwrap();
-    model.new_sheet().unwrap();
-    model
-        .new_defined_name("myName", Some(1), "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("#NAME?".to_string())
-    );
-
-    model
-        .update_defined_name("myName", Some(1), "myName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-}
-
-#[test]
-fn rename_defined_name() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .set_user_input(0, 2, 1, r#"=CONCATENATE(MyName, " world!")"#)
-        .unwrap();
-    model.new_sheet().unwrap();
-    model
-        .new_defined_name("myName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-
-    model
-        .update_defined_name("myName", None, "newName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-
-    assert_eq!(
-        model.get_cell_content(0, 2, 1),
-        Ok(r#"=CONCATENATE(newName," world!")"#.to_string())
-    );
-}
-
-#[test]
-fn rename_defined_name_operations() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "42").unwrap();
-    model.set_user_input(0, 1, 2, "123").unwrap();
-
-    model
-        .new_defined_name("answer", None, "Sheet1!$A$1")
-        .unwrap();
-
-    model
-        .set_user_input(0, 2, 1, "=IF(answer<2, answer*2, answer^2)")
-        .unwrap();
-
-    model
-        .set_user_input(0, 3, 1, "=badDunction(-answer)")
-        .unwrap();
-
-    model.new_sheet().unwrap();
-    model.set_user_input(1, 1, 1, "78").unwrap();
-    model
-        .new_defined_name("answer", Some(1), "Sheet1!$A$1")
-        .unwrap();
-
-    model.set_user_input(1, 3, 1, "=answer").unwrap();
-
-    model
-        .update_defined_name("answer", None, "respuesta", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_cell_content(0, 2, 1),
-        Ok("=IF(respuesta<2,respuesta*2,respuesta^2)".to_string())
-    );
-
-    assert_eq!(
-        model.get_cell_content(0, 3, 1),
-        Ok("=badDunction(-respuesta)".to_string())
-    );
-
-    // A defined name with the same name but different scope
-    assert_eq!(model.get_cell_content(1, 3, 1), Ok("=answer".to_string()));
-}
-
-#[test]
-fn rename_defined_name_string_operations() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model.set_user_input(0, 1, 2, "World").unwrap();
-
-    model
-        .new_defined_name("hello", None, "Sheet1!$A$1")
-        .unwrap();
-
-    model
-        .new_defined_name("world", None, "Sheet1!$B$1")
-        .unwrap();
-
-    model.set_user_input(0, 2, 1, "=hello&world").unwrap();
-
-    model
-        .update_defined_name("hello", None, "HolaS", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_cell_content(0, 2, 1),
-        Ok("=HolaS&world".to_string())
-    );
-}
-
-#[test]
-fn invalid_names() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .new_defined_name("MyName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    // spaces
-    assert_eq!(
-        model.new_defined_name("A real", None, "Sheet1!$A$1"),
-        Err("Invalid defined name".to_string())
-    );
-
-    // Starts with number
-    assert_eq!(
-        model.new_defined_name("2real", None, "Sheet1!$A$1"),
-        Err("Invalid defined name".to_string())
-    );
-
-    // Updating also fails
-    assert_eq!(
-        model.update_defined_name("MyName", None, "My Name", None, "Sheet1!$A$1"),
-        Err("Invalid defined name".to_string())
-    );
-}
-
-#[test]
-fn already_existing() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    model
-        .new_defined_name("MyName", None, "Sheet1!$A$1")
-        .unwrap();
-    model
-        .new_defined_name("Another", None, "Sheet1!$A$1")
-        .unwrap();
-
-    // Can't create a new name with the same name
-    assert_eq!(
-        model.new_defined_name("MyName", None, "Sheet1!$A$2"),
-        Err("Defined name already exists".to_string())
-    );
-
-    // Can't update one into an existing
-    assert_eq!(
-        model.update_defined_name("Another", None, "MyName", None, "Sheet1!$A$1"),
-        Err("Defined name already exists".to_string())
-    );
-}
-
-#[test]
-fn invalid_sheet() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .new_defined_name("MyName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.new_defined_name("Mything", Some(2), "Sheet1!$A$1"),
-        Err("Invalid sheet index".to_string())
-    );
-
-    assert_eq!(
-        model.update_defined_name("MyName", None, "MyName", Some(2), "Sheet1!$A$1"),
-        Err("Invalid sheet index".to_string())
-    );
-
-    assert_eq!(
-        model.update_defined_name("MyName", Some(9), "YourName", None, "Sheet1!$A$1"),
-        Err("Invalid sheet index".to_string())
-    );
-}
-
-#[test]
-fn invalid_formula() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model.new_defined_name("MyName", None, "A1").unwrap();
-
-    model.set_user_input(0, 1, 2, "=MyName").unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("#NAME?".to_string())
-    );
-}
-
-#[test]
-fn undo_redo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model.set_user_input(0, 2, 1, "Hola").unwrap();
-    model.set_user_input(0, 1, 2, r#"=MyName&"!""#).unwrap();
-
-    model
-        .new_defined_name("MyName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello!".to_string())
-    );
-    model.undo().unwrap();
-    assert_eq!(model.get_defined_name_list().len(), 0);
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("#NAME?".to_string())
-    );
-    model.redo().unwrap();
-
-    assert_eq!(model.get_defined_name_list().len(), 1);
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello!".to_string())
-    );
-
-    model
-        .update_defined_name("MyName", None, "MyName", None, "Sheet1!$A$2")
-        .unwrap();
-    assert_eq!(model.get_defined_name_list().len(), 1);
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("Hola!".to_string())
-    );
-    model.undo().unwrap();
-
-    assert_eq!(model.get_defined_name_list().len(), 1);
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello!".to_string())
-    );
-
-    model.redo().unwrap();
-
-    assert_eq!(model.get_defined_name_list().len(), 1);
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 2),
-        Ok("Hola!".to_string())
-    );
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(model2.get_defined_name_list().len(), 1);
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 1, 2),
-        Ok("Hola!".to_string())
-    );
-}
-
-#[test]
-fn change_scope_to_first_sheet() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet().unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-    model
-        .set_user_input(1, 2, 1, r#"=CONCATENATE(MyName, " world!")"#)
-        .unwrap();
-    model
-        .new_defined_name("myName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(1, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-
-    model
-        .update_defined_name("myName", None, "myName", Some(0), "Sheet1!$A$1")
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(1, 2, 1),
-        Ok("#NAME?".to_string())
-    );
-}
+fn change_scope() {}

base/src/test/user_model/test_delete_row_column_formatting.rs

@@ -1,243 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    UserModel,
-    constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW},
-    expressions::types::Area,
-};
-
-#[test]
-fn delete_column_formatting() {
-    // We are going to delete formatting in column G (7)
-    // There are cells with their own styles
-    // There are rows with their own styles
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let cell_g123 = Area {
-        sheet: 0,
-        row: 123,
-        column: 7,
-        width: 1,
-        height: 1,
-    };
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_3_range = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    // Set the style of the whole column
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    // Set G123 background to red
-    model
-        .update_range_style(&cell_g123, "fill.bg_color", "#FF5533")
-        .unwrap();
-
-    // Set the style of the whole row
-    model
-        .update_range_style(&row_3_range, "fill.bg_color", "#333444")
-        .unwrap();
-
-    // Delete the column formatting
-    model.range_clear_formatting(&column_g_range).unwrap();
-
-    // Check the style of G123 is now what it was before
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    // Check the style of the whole row is still there
-    let style = model.get_cell_style(0, 3, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-
-    // Check the style of the whole column is now gone
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    let style = model.get_cell_style(0, 40, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    model.undo().unwrap();
-
-    // Check the style of G123 is now what it was before
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#FF5533".to_owned()));
-
-    // Check G3 is the row style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-
-    // Check G40 is the column style
-    let style = model.get_cell_style(0, 40, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_owned()));
-
-    model.redo().unwrap();
-
-    // Check the style of G123 is now what it was before
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    // Check the style of the whole row is still there
-    let style = model.get_cell_style(0, 3, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#333444".to_owned()));
-
-    // Check the style of the whole column is now gone
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    let style = model.get_cell_style(0, 40, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-}
-
-#[test]
-fn column_width() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model
-        .set_columns_width(0, 7, 7, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    // Set the style of the whole column
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    // Delete the column formatting
-    model.range_clear_formatting(&column_g_range).unwrap();
-    // This does not change the column width
-    assert_eq!(
-        model.get_column_width(0, 7).unwrap(),
-        2.0 * DEFAULT_COLUMN_WIDTH
-    );
-
-    model.undo().unwrap();
-    assert_eq!(
-        model.get_column_width(0, 7).unwrap(),
-        2.0 * DEFAULT_COLUMN_WIDTH
-    );
-    model.redo().unwrap();
-    assert_eq!(
-        model.get_column_width(0, 7).unwrap(),
-        2.0 * DEFAULT_COLUMN_WIDTH
-    );
-}
-
-#[test]
-fn column_row_style_undo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model
-        .set_columns_width(0, 7, 7, DEFAULT_COLUMN_WIDTH * 2.0)
-        .unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_123_range = Area {
-        sheet: 0,
-        row: 123,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    let delete_range = Area {
-        sheet: 0,
-        row: 120,
-        column: 5,
-        width: 20,
-        height: 20,
-    };
-
-    // Set the style of the whole column
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    model
-        .update_range_style(&row_123_range, "fill.bg_color", "#111222")
-        .unwrap();
-
-    model.range_clear_formatting(&delete_range).unwrap();
-
-    // check G123 is empty
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-
-    // uno clear formatting
-    model.undo().unwrap();
-
-    // G123 has the row style
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#111222".to_owned()));
-
-    // undo twice
-    model.undo().unwrap();
-    model.undo().unwrap();
-
-    // check G123 is empty
-    let style = model.get_cell_style(0, 123, 7).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-}
-
-#[test]
-fn column_row_row_height_undo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    let row_3_range = Area {
-        sheet: 0,
-        row: 3,
-        column: 1,
-        width: LAST_COLUMN,
-        height: 1,
-    };
-
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#555666")
-        .unwrap();
-
-    model
-        .set_rows_height(0, 3, 3, DEFAULT_ROW_HEIGHT * 2.0)
-        .unwrap();
-
-    model
-        .update_range_style(&row_3_range, "fill.bg_color", "#111222")
-        .unwrap();
-
-    model.undo().unwrap();
-
-    // check G3 has the column style
-    let style = model.get_cell_style(0, 3, 7).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#555666".to_string()));
-}

base/src/test/user_model/test_diff_queue.rs

@@ -1,16 +1,16 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT},
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]
 fn send_queue() {
     let mut model1 = UserModel::from_model(new_empty_model());
     let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_columns_width(0, 3, 3, width).unwrap();
+    model1.set_column_width(0, 3, width).unwrap();
     model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
     let send_queue = model1.flush_send_queue();
 
@@ -34,7 +34,7 @@ fn apply_external_diffs_wrong_str() {
 fn queue_undo_redo() {
     let mut model1 = UserModel::from_model(new_empty_model());
     let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_columns_width(0, 3, 3, width).unwrap();
+    model1.set_column_width(0, 3, width).unwrap();
     model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
     assert!(model1.undo().is_ok());
     assert!(model1.redo().is_ok());
@@ -57,8 +57,8 @@ fn queue_undo_redo_multiple() {
     // do a bunch of things
     model1.set_frozen_columns_count(0, 5).unwrap();
     model1.set_frozen_rows_count(0, 6).unwrap();
-    model1.set_columns_width(0, 7, 7, 300.0).unwrap();
-    model1.set_rows_height(0, 23, 23, 123.0).unwrap();
+    model1.set_column_width(0, 7, 300.0).unwrap();
+    model1.set_row_height(0, 23, 123.0).unwrap();
     model1.set_user_input(0, 55, 55, "=42+8").unwrap();
 
     for row in 1..5 {
@@ -157,9 +157,7 @@ fn new_sheet() {
 #[test]
 fn wrong_diffs_handled() {
     let mut model = UserModel::from_model(new_empty_model());
-    assert!(
-        model
-            .apply_external_diffs("Hello world".as_bytes())
-            .is_err()
-    );
+    assert!(model
+        .apply_external_diffs("Hello world".as_bytes())
+        .is_err());
 }

base/src/test/user_model/test_general.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::UserModel;
 use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::test::util::new_empty_model;
 use crate::types::CellType;
+use crate::UserModel;
 
 #[test]
 fn set_user_input_errors() {
@@ -59,7 +59,7 @@ fn insert_remove_rows() {
     // Insert some data in row 5 (and change the style)
     assert!(model.set_user_input(0, 5, 1, "100$").is_ok());
     // Change the height of the column
-    assert!(model.set_rows_height(0, 5, 5, 3.0 * height).is_ok());
+    assert!(model.set_row_height(0, 5, 3.0 * height).is_ok());
 
     // remove the row
     assert!(model.delete_row(0, 5).is_ok());
@@ -91,11 +91,12 @@ fn insert_remove_columns() {
     let mut model = UserModel::from_model(model);
     // column E
     let column_width = model.get_column_width(0, 5).unwrap();
+    println!("{column_width}");
 
     // Insert some data in row 5 (and change the style) in E1
     assert!(model.set_user_input(0, 1, 5, "100$").is_ok());
     // Change the width of the column
-    assert!(model.set_columns_width(0, 5, 5, 3.0 * column_width).is_ok());
+    assert!(model.set_column_width(0, 5, 3.0 * column_width).is_ok());
     assert_eq!(model.get_column_width(0, 5).unwrap(), 3.0 * column_width);
 
     // remove the column

base/src/test/user_model/test_grid_lines.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::UserModel;
 use crate::test::util::new_empty_model;
+use crate::UserModel;
 
 #[test]
 fn basic_tests() {

base/src/test/user_model/test_keyboard_navigation.rs

@@ -1,12 +1,12 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{
         DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH,
         LAST_COLUMN,
     },
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]

base/src/test/user_model/test_on_area_selection.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH},
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]

base/src/test/user_model/test_on_expand_selected_range.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH, LAST_COLUMN},
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]

base/src/test/user_model/test_on_paste_styles.rs

@@ -1,8 +1,8 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::UserModel;
 use crate::test::util::new_empty_model;
 use crate::types::Fill;
+use crate::UserModel;
 
 #[test]
 fn simple_pasting() {

base/src/test/user_model/test_paste_csv.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{UserModel, expressions::types::Area};
+use crate::{expressions::types::Area, UserModel};
 
 #[test]
 fn csv_paste() {

base/src/test/user_model/test_recursive.rs

@@ -1,42 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    UserModel, constants::LAST_ROW, expressions::types::Area, test::util::new_empty_model,
-};
-
-#[test]
-fn two_columns() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    // Set style in column C (column 3)
-    let column_c_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 3,
-        width: 1,
-        height: LAST_ROW,
-    };
-    model
-        .update_range_style(&column_c_range, "fill.bg_color", "#333444")
-        .unwrap();
-    model.set_user_input(0, 5, 3, "2").unwrap();
-
-    // Set Style in column G (column 7)
-    let column_g_range = Area {
-        sheet: 0,
-        row: 1,
-        column: 7,
-        width: 1,
-        height: LAST_ROW,
-    };
-
-    model
-        .update_range_style(&column_g_range, "fill.bg_color", "#333444")
-        .unwrap();
-    model.set_user_input(0, 5, 6, "42").unwrap();
-    // Set formula in G5: =F5*C5
-    model.set_user_input(0, 5, 7, "=F5*C5").unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 5, 7).unwrap(), "84");
-}

base/src/test/user_model/test_row_column.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN},
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]
@@ -59,7 +59,7 @@ fn simple_delete_column() {
     model.set_user_input(0, 1, 5, "3").unwrap();
     model.set_user_input(0, 2, 5, "=E1*2").unwrap();
     model
-        .set_columns_width(0, 5, 5, DEFAULT_COLUMN_WIDTH * 3.0)
+        .set_column_width(0, 5, DEFAULT_COLUMN_WIDTH * 3.0)
         .unwrap();
 
     model.delete_column(0, 5).unwrap();
@@ -116,7 +116,7 @@ fn simple_delete_row() {
     model.set_user_input(0, 15, 6, "=D15*2").unwrap();
 
     model
-        .set_rows_height(0, 15, 15, DEFAULT_ROW_HEIGHT * 3.0)
+        .set_row_height(0, 15, DEFAULT_ROW_HEIGHT * 3.0)
         .unwrap();
 
     model.delete_row(0, 15).unwrap();
@@ -172,42 +172,3 @@ fn row_heigh_increases_automatically() {
         .unwrap();
     assert_eq!(model.get_row_height(0, 1), Ok(2.0 * DEFAULT_ROW_HEIGHT));
 }
-
-#[test]
-fn insert_row_evaluates() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "42").unwrap();
-    model.set_user_input(0, 1, 2, "=A1*2").unwrap();
-
-    assert!(model.insert_row(0, 1).is_ok());
-    assert_eq!(model.get_formatted_cell_value(0, 2, 2).unwrap(), "84");
-    model.undo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 2).unwrap(), "84");
-    model.redo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 2, 2).unwrap(), "84");
-
-    model.delete_row(0, 1).unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 2).unwrap(), "84");
-    assert_eq!(model.get_cell_content(0, 1, 2).unwrap(), "=A1*2");
-}
-
-#[test]
-fn insert_column_evaluates() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 1, "42").unwrap();
-    model.set_user_input(0, 10, 1, "=A1*2").unwrap();
-
-    assert!(model.insert_column(0, 1).is_ok());
-    assert_eq!(model.get_formatted_cell_value(0, 10, 2).unwrap(), "84");
-
-    model.undo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 10, 1).unwrap(), "84");
-    model.redo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 10, 2).unwrap(), "84");
-
-    model.delete_column(0, 1).unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 10, 1).unwrap(), "84");
-    assert_eq!(model.get_cell_content(0, 10, 1).unwrap(), "=A1*2");
-}

base/src/test/user_model/test_sheet_state.rs

@@ -1,57 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-use crate::test::util::new_empty_model;
-
-#[test]
-fn basic_tests() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-
-    // add three more sheets
-    model.new_sheet().unwrap();
-    model.new_sheet().unwrap();
-    model.new_sheet().unwrap();
-
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.len(), 4);
-    for sheet in &info {
-        assert_eq!(sheet.state, "visible".to_string());
-    }
-
-    model.set_selected_sheet(2).unwrap();
-    assert_eq!(info.get(2).unwrap().name, "Sheet3".to_string());
-
-    model.hide_sheet(2).unwrap();
-
-    let info = model.get_worksheets_properties();
-    assert_eq!(model.get_selected_sheet(), 3);
-    assert_eq!(info.get(2).unwrap().state, "hidden".to_string());
-
-    model.undo().unwrap();
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.get(2).unwrap().state, "visible".to_string());
-    model.redo().unwrap();
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.get(2).unwrap().state, "hidden".to_string());
-
-    model.set_selected_sheet(3).unwrap();
-    model.hide_sheet(3).unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-
-    model.unhide_sheet(2).unwrap();
-    model.unhide_sheet(3).unwrap();
-
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.len(), 4);
-    for sheet in &info {
-        assert_eq!(sheet.state, "visible".to_string());
-    }
-
-    model.undo().unwrap();
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.get(3).unwrap().state, "hidden".to_string());
-    model.redo().unwrap();
-    let info = model.get_worksheets_properties();
-    assert_eq!(info.get(3).unwrap().state, "visible".to_string());
-}

base/src/test/user_model/test_sheets_undo_redo.rs

@@ -1,52 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-use crate::test::util::new_empty_model;
-
-#[test]
-fn basic_undo_redo() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(model.get_selected_sheet(), 0);
-
-    model.new_sheet().unwrap();
-    assert_eq!(model.get_selected_sheet(), 1);
-    model.undo().unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-    {
-        let props = model.get_worksheets_properties();
-        assert_eq!(props.len(), 1);
-        let view = model.get_selected_view();
-        assert_eq!(view.sheet, 0);
-    }
-
-    model.redo().unwrap();
-    assert_eq!(model.get_selected_sheet(), 1);
-    {
-        let props = model.get_worksheets_properties();
-        assert_eq!(props.len(), 2);
-        let view = model.get_selected_view();
-
-        assert_eq!(view.sheet, 1);
-    }
-}
-
-#[test]
-fn delete_undo() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(model.get_selected_sheet(), 0);
-
-    model.new_sheet().unwrap();
-    assert_eq!(model.get_selected_sheet(), 1);
-    model.set_user_input(1, 1, 1, "42").unwrap();
-    model.set_user_input(1, 1, 2, "=A1*2").unwrap();
-    model.delete_sheet(1).unwrap();
-
-    assert_eq!(model.get_selected_sheet(), 0);
-
-    model.undo().unwrap();
-    assert_eq!(model.get_selected_sheet(), 1);
-    model.redo().unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-}

base/src/test/user_model/test_styles.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     expressions::types::Area,
     types::{Alignment, HorizontalAlignment, VerticalAlignment},
+    UserModel,
 };
 
 #[test]
@@ -436,47 +436,3 @@ fn false_removes_value() {
     let style = model.get_cell_style(0, 1, 1).unwrap();
     assert!(!style.font.b);
 }
-
-#[test]
-fn cell_clear_formatting() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    // bold
-    model.update_range_style(&range, "font.b", "true").unwrap();
-    model
-        .update_range_style(&range, "alignment.horizontal", "centerContinuous")
-        .unwrap();
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.b);
-    assert_eq!(
-        style.alignment.unwrap().horizontal,
-        HorizontalAlignment::CenterContinuous
-    );
-
-    model.range_clear_all(&range).unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.b);
-    assert_eq!(style.alignment, None);
-
-    model.undo().unwrap();
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.b);
-    assert_eq!(
-        style.alignment.unwrap().horizontal,
-        HorizontalAlignment::CenterContinuous
-    );
-    model.redo().unwrap();
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.b);
-    assert_eq!(style.alignment, None);
-}

base/src/test/user_model/test_to_from_bytes.rs

@@ -1,12 +1,12 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{UserModel, test::util::new_empty_model};
+use crate::{test::util::new_empty_model, UserModel};
 
 #[test]
 fn basic() {
     let mut model1 = UserModel::from_model(new_empty_model());
     let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_columns_width(0, 3, 3, width).unwrap();
+    model1.set_column_width(0, 3, width).unwrap();
     model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
 
     let model_bytes = model1.to_bytes();

base/src/test/user_model/test_undo_redo.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{UserModel, test::util::new_empty_model};
+use crate::{test::util::new_empty_model, UserModel};
 
 #[test]
 fn simple_undo_redo() {

base/src/test/user_model/test_view.rs

@@ -3,10 +3,10 @@
 use std::collections::HashMap;
 
 use crate::{
-    UserModel,
     constants::{LAST_COLUMN, LAST_ROW},
     test::util::new_empty_model,
     user_model::SelectedView,
+    UserModel,
 };
 
 #[test]

base/src/test/user_model/test_window_size.rs

@@ -1,9 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::{
-    UserModel,
     constants::{DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH},
     test::util::new_empty_model,
+    UserModel,
 };
 
 #[test]

base/src/test/user_model/util.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::{BorderArea, UserModel, expressions::types::Area, types::Border};
+use crate::{expressions::types::Area, types::Border, BorderArea, UserModel};
 
 impl UserModel {
     pub fn _set_cell_border(&mut self, cell: &str, color: &str) {

base/src/types.rs

@@ -323,19 +323,6 @@ pub struct Style {
     pub quote_prefix: bool,
 }
 
-impl Default for Style {
-    fn default() -> Self {
-        Style {
-            alignment: None,
-            num_fmt: "general".to_string(),
-            fill: Fill::default(),
-            font: Font::default(),
-            border: Border::default(),
-            quote_prefix: false,
-        }
-    }
-}
-
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
 pub struct NumFmt {
     pub num_fmt_id: i32,

base/src/units.rs

@@ -50,9 +50,8 @@ impl Units {
 fn get_units_from_format_string(num_fmt: &str) -> Option<Units> {
     let mut parser = Parser::new(num_fmt);
     parser.parse();
-    let parts = parser.parts.first()?;
     // We only care about the first part (positive number)
-    match parts {
+    match &parser.parts[0] {
         ParsePart::Number(part) => {
             if part.percent > 0 {
                 Some(Units::Percentage {
@@ -294,9 +293,7 @@ impl Model {
             Node::EmptyArgKind => None,
             Node::InvalidFunctionKind { .. } => None,
             Node::ArrayKind(_) => None,
-            Node::DefinedNameKind(_) => None,
-            Node::TableNameKind(_) => None,
-            Node::WrongVariableKind(_) => None,
+            Node::VariableKind(_) => None,
             Node::CompareKind { .. } => None,
             Node::OpPowerKind { .. } => None,
         }

base/src/user_model/border.rs

@@ -1,507 +0,0 @@
-use crate::{
-    constants::{LAST_COLUMN, LAST_ROW},
-    expressions::types::Area,
-};
-
-use super::{
-    BorderArea, UserModel, border_utils::is_max_border, common::BorderType, history::Diff,
-};
-
-impl UserModel {
-    fn update_single_cell_border(
-        &mut self,
-        border_area: &BorderArea,
-        cell: (u32, i32, i32),
-        range: (i32, i32, i32, i32),
-        diff_list: &mut Vec<Diff>,
-    ) -> Result<(), String> {
-        let (sheet, row, column) = cell;
-        let (first_row, first_column, last_row, last_column) = range;
-
-        let old_value = self.model.get_cell_style_or_none(sheet, row, column)?;
-        let mut new_value = match &old_value {
-            Some(value) => value.clone(),
-            None => Default::default(),
-        };
-        match border_area.r#type {
-            BorderType::All => {
-                new_value.border.top = Some(border_area.item.clone());
-                new_value.border.right = Some(border_area.item.clone());
-                new_value.border.bottom = Some(border_area.item.clone());
-                new_value.border.left = Some(border_area.item.clone());
-            }
-            BorderType::Inner => {
-                if row != first_row {
-                    new_value.border.top = Some(border_area.item.clone());
-                }
-                if row != last_row {
-                    new_value.border.bottom = Some(border_area.item.clone());
-                }
-                if column != first_column {
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-                if column != last_column {
-                    new_value.border.right = Some(border_area.item.clone());
-                }
-            }
-            BorderType::Outer => {
-                if row == first_row {
-                    new_value.border.top = Some(border_area.item.clone());
-                }
-                if row == last_row {
-                    new_value.border.bottom = Some(border_area.item.clone());
-                }
-                if column == first_column {
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-                if column == last_column {
-                    new_value.border.right = Some(border_area.item.clone());
-                }
-            }
-            BorderType::Top => {
-                if row == first_row {
-                    new_value.border.top = Some(border_area.item.clone());
-                }
-            }
-            BorderType::Right => {
-                if column == last_column {
-                    new_value.border.right = Some(border_area.item.clone());
-                }
-            }
-            BorderType::Bottom => {
-                if row == last_row {
-                    new_value.border.bottom = Some(border_area.item.clone());
-                }
-            }
-            BorderType::Left => {
-                if column == first_column {
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-            }
-            BorderType::CenterH => {
-                if row != first_row {
-                    new_value.border.top = Some(border_area.item.clone());
-                }
-                if row != last_row {
-                    new_value.border.bottom = Some(border_area.item.clone());
-                }
-            }
-            BorderType::CenterV => {
-                if column != first_column {
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-                if column != last_column {
-                    new_value.border.right = Some(border_area.item.clone());
-                }
-            }
-            BorderType::None => {
-                new_value.border.top = None;
-                new_value.border.right = None;
-                new_value.border.bottom = None;
-                new_value.border.left = None;
-            }
-        }
-        self.model.set_cell_style(sheet, row, column, &new_value)?;
-        diff_list.push(Diff::SetCellStyle {
-            sheet,
-            row,
-            column,
-            old_value: Box::new(old_value),
-            new_value: Box::new(new_value),
-        });
-        Ok(())
-    }
-
-    fn set_rows_with_border(
-        &mut self,
-        sheet: u32,
-        first_row: i32,
-        last_row: i32,
-        border_area: &BorderArea,
-    ) -> Result<(), String> {
-        let mut diff_list = Vec::new();
-        for row in first_row..=last_row {
-            let old_value = self.model.get_row_style(sheet, row)?;
-            let mut new_value = match &old_value {
-                Some(value) => value.clone(),
-                None => Default::default(),
-            };
-
-            match border_area.r#type {
-                BorderType::All => {
-                    new_value.border.top = Some(border_area.item.clone());
-                    new_value.border.right = Some(border_area.item.clone());
-                    new_value.border.bottom = Some(border_area.item.clone());
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-                BorderType::Inner => {
-                    if row != first_row {
-                        new_value.border.top = Some(border_area.item.clone());
-                    }
-                    if row != last_row {
-                        new_value.border.bottom = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Outer => {
-                    if row == first_row {
-                        new_value.border.top = Some(border_area.item.clone());
-                    }
-                    if row == last_row {
-                        new_value.border.bottom = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Top => {
-                    if row == first_row {
-                        new_value.border.top = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Right => {
-                    // noop
-                }
-                BorderType::Bottom => {
-                    if row == last_row {
-                        new_value.border.bottom = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Left => {
-                    // noop
-                }
-                BorderType::CenterH => {
-                    if row != first_row {
-                        new_value.border.top = Some(border_area.item.clone());
-                    }
-                    if row != last_row {
-                        new_value.border.bottom = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::CenterV => {
-                    new_value.border.left = Some(border_area.item.clone());
-                    new_value.border.right = Some(border_area.item.clone());
-                }
-                BorderType::None => {
-                    new_value.border.top = None;
-                    new_value.border.right = None;
-                    new_value.border.bottom = None;
-                    new_value.border.left = None;
-                }
-            }
-
-            // We need to go throw each non-empty cell in the row
-            let columns: Vec<i32> = self
-                .model
-                .workbook
-                .worksheet(sheet)?
-                .sheet_data
-                .get(&row)
-                .map(|row_data| row_data.keys().copied().collect())
-                .unwrap_or_default();
-            for column in columns {
-                self.update_single_cell_border(
-                    border_area,
-                    (sheet, row, column),
-                    (first_row, 1, last_row, LAST_COLUMN),
-                    &mut diff_list,
-                )?;
-            }
-
-            self.model.set_row_style(sheet, row, &new_value)?;
-            diff_list.push(Diff::SetRowStyle {
-                sheet,
-                row,
-                old_value: Box::new(old_value),
-                new_value: Box::new(new_value),
-            });
-        }
-        // TODO: We need to check the rows above and below. also any non empty cell in the rows above and below.
-        self.push_diff_list(diff_list);
-        Ok(())
-    }
-
-    fn set_columns_with_border(
-        &mut self,
-        sheet: u32,
-        first_column: i32,
-        last_column: i32,
-        border_area: &BorderArea,
-    ) -> Result<(), String> {
-        let mut diff_list = Vec::new();
-        // We need all the rows in the column to update the style
-        // NB: This is too much, this is all the rows that have values
-        let data_rows: Vec<i32> = self
-            .model
-            .workbook
-            .worksheet(sheet)?
-            .sheet_data
-            .keys()
-            .copied()
-            .collect();
-        let styled_rows = &self.model.workbook.worksheet(sheet)?.rows.clone();
-        for column in first_column..=last_column {
-            let old_value = self.model.get_column_style(sheet, column)?;
-            let mut new_value = match &old_value {
-                Some(value) => value.clone(),
-                None => Default::default(),
-            };
-
-            match border_area.r#type {
-                BorderType::All => {
-                    new_value.border.top = Some(border_area.item.clone());
-                    new_value.border.right = Some(border_area.item.clone());
-                    new_value.border.bottom = Some(border_area.item.clone());
-                    new_value.border.left = Some(border_area.item.clone());
-                }
-                BorderType::Inner => {
-                    if column != first_column {
-                        new_value.border.left = Some(border_area.item.clone());
-                    }
-                    if column != last_column {
-                        new_value.border.right = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Outer => {
-                    if column == first_column {
-                        new_value.border.left = Some(border_area.item.clone());
-                    }
-                    if column == last_column {
-                        new_value.border.right = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Top => {
-                    // noop
-                }
-                BorderType::Right => {
-                    if column == last_column {
-                        new_value.border.right = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::Bottom => {
-                    // noop
-                }
-                BorderType::Left => {
-                    if column == first_column {
-                        new_value.border.left = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::CenterH => {
-                    new_value.border.top = Some(border_area.item.clone());
-                    new_value.border.bottom = Some(border_area.item.clone());
-                }
-                BorderType::CenterV => {
-                    if column != first_column {
-                        new_value.border.left = Some(border_area.item.clone());
-                    }
-                    if column != last_column {
-                        new_value.border.right = Some(border_area.item.clone());
-                    }
-                }
-                BorderType::None => {
-                    new_value.border.top = None;
-                    new_value.border.right = None;
-                    new_value.border.bottom = None;
-                    new_value.border.left = None;
-                }
-            }
-            // We need to go through each non empty cell in the column
-            for &row in &data_rows {
-                if let Some(data_row) = self.model.workbook.worksheet(sheet)?.sheet_data.get(&row) {
-                    if data_row.get(&column).is_some() {
-                        self.update_single_cell_border(
-                            border_area,
-                            (sheet, row, column),
-                            (1, first_column, LAST_ROW, last_column),
-                            &mut diff_list,
-                        )?;
-                    }
-                }
-            }
-
-            // We also need to overwrite those that have a row style
-            for row_s in styled_rows.iter() {
-                let row = row_s.r;
-                self.update_single_cell_border(
-                    border_area,
-                    (sheet, row, column),
-                    (1, first_column, LAST_ROW, last_column),
-                    &mut diff_list,
-                )?;
-            }
-
-            self.model.set_column_style(sheet, column, &new_value)?;
-            diff_list.push(Diff::SetColumnStyle {
-                sheet,
-                column,
-                old_value: Box::new(old_value),
-                new_value: Box::new(new_value),
-            });
-        }
-        // We need to check the borders of the column to the left and the column to the right
-        // We also need to check every non-empty cell in the columns to the left and right
-        self.push_diff_list(diff_list);
-        Ok(())
-    }
-
-    /// Sets the border in an area of cells.
-    /// When setting the border we need to check if the adjacent cells have a "heavier" border
-    /// If that is the case we need to change it
-    pub fn set_area_with_border(
-        &mut self,
-        range: &Area,
-        border_area: &BorderArea,
-    ) -> Result<(), String> {
-        let sheet = range.sheet;
-        let first_row = range.row;
-        let first_column = range.column;
-        let last_row = first_row + range.height - 1;
-        let last_column = first_column + range.width - 1;
-        if first_row == 1 && last_row == LAST_ROW {
-            // full columns
-            self.set_columns_with_border(sheet, first_column, last_column, border_area)?;
-            return Ok(());
-        }
-        if first_column == 1 && last_column == LAST_COLUMN {
-            // full rows
-            self.set_rows_with_border(sheet, first_row, last_row, border_area)?;
-            return Ok(());
-        }
-        let mut diff_list = Vec::new();
-        for row in first_row..=last_row {
-            for column in first_column..=last_column {
-                self.update_single_cell_border(
-                    border_area,
-                    (sheet, row, column),
-                    (first_row, first_column, last_row, last_column),
-                    &mut diff_list,
-                )?;
-            }
-        }
-
-        // bottom of the cells above the first
-        if first_row > 1
-            && [
-                BorderType::All,
-                BorderType::None,
-                BorderType::Outer,
-                BorderType::Top,
-            ]
-            .contains(&border_area.r#type)
-        {
-            let row = first_row - 1;
-            for column in first_column..=last_column {
-                let old_value = self.model.get_style_for_cell(sheet, row, column)?;
-                if is_max_border(Some(&border_area.item), old_value.border.bottom.as_ref()) {
-                    let mut style = old_value.clone();
-                    if border_area.r#type == BorderType::None {
-                        style.border.bottom = None;
-                    } else {
-                        style.border.bottom = Some(border_area.item.clone());
-                    }
-                    self.model.set_cell_style(sheet, row, column, &style)?;
-                    diff_list.push(Diff::SetCellStyle {
-                        sheet,
-                        row,
-                        column,
-                        old_value: Box::new(Some(old_value)),
-                        new_value: Box::new(style),
-                    });
-                }
-            }
-        }
-        // Cells to the right
-        if last_column < LAST_COLUMN
-            && [
-                BorderType::All,
-                BorderType::None,
-                BorderType::Outer,
-                BorderType::Right,
-            ]
-            .contains(&border_area.r#type)
-        {
-            let column = last_column + 1;
-            for row in first_row..=last_row {
-                let old_value = self.model.get_style_for_cell(sheet, row, column)?;
-                // If the border in the adjacent cell is "heavier" we change it
-                if is_max_border(Some(&border_area.item), old_value.border.left.as_ref()) {
-                    let mut style = old_value.clone();
-                    if border_area.r#type == BorderType::None {
-                        style.border.left = None;
-                    } else {
-                        style.border.left = Some(border_area.item.clone());
-                    }
-                    self.model.set_cell_style(sheet, row, column, &style)?;
-                    diff_list.push(Diff::SetCellStyle {
-                        sheet,
-                        row,
-                        column,
-                        old_value: Box::new(Some(old_value)),
-                        new_value: Box::new(style),
-                    });
-                }
-            }
-        }
-        // Cells bellow
-        if last_row < LAST_ROW
-            && [
-                BorderType::All,
-                BorderType::None,
-                BorderType::Outer,
-                BorderType::Bottom,
-            ]
-            .contains(&border_area.r#type)
-        {
-            let row = last_row + 1;
-            for column in first_column..=last_column {
-                let old_value = self.model.get_style_for_cell(sheet, row, column)?;
-                if is_max_border(Some(&border_area.item), old_value.border.top.as_ref()) {
-                    let mut style = old_value.clone();
-                    if border_area.r#type == BorderType::None {
-                        style.border.top = None;
-                    } else {
-                        style.border.top = Some(border_area.item.clone());
-                    }
-                    self.model.set_cell_style(sheet, row, column, &style)?;
-                    diff_list.push(Diff::SetCellStyle {
-                        sheet,
-                        row,
-                        column,
-                        old_value: Box::new(Some(old_value)),
-                        new_value: Box::new(style),
-                    });
-                }
-            }
-        }
-        // Cells to the left
-        if first_column > 1
-            && [
-                BorderType::All,
-                BorderType::None,
-                BorderType::Outer,
-                BorderType::Left,
-            ]
-            .contains(&border_area.r#type)
-        {
-            let column = first_column - 1;
-            for row in first_row..=last_row {
-                let old_value = self.model.get_style_for_cell(sheet, row, column)?;
-                if is_max_border(Some(&border_area.item), old_value.border.right.as_ref()) {
-                    let mut style = old_value.clone();
-                    if border_area.r#type == BorderType::None {
-                        style.border.right = None;
-                    } else {
-                        style.border.right = Some(border_area.item.clone());
-                    }
-                    self.model.set_cell_style(sheet, row, column, &style)?;
-                    diff_list.push(Diff::SetCellStyle {
-                        sheet,
-                        row,
-                        column,
-                        old_value: Box::new(Some(old_value)),
-                        new_value: Box::new(style),
-                    });
-                }
-            }
-        }
-
-        self.push_diff_list(diff_list);
-        Ok(())
-    }
-}

base/src/user_model/history.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use bitcode::{Decode, Encode};
 
-use crate::types::{Cell, Col, Row, SheetState, Style, Worksheet};
+use crate::types::{Cell, Col, Row, Style};
 
 #[derive(Clone, Encode, Decode)]
 pub(crate) struct RowData {
@@ -39,17 +39,11 @@ pub(crate) enum Diff {
         old_value: Box<Option<Cell>>,
         old_style: Box<Style>,
     },
-    CellClearFormatting {
-        sheet: u32,
-        row: i32,
-        column: i32,
-        old_style: Box<Option<Style>>,
-    },
     SetCellStyle {
         sheet: u32,
         row: i32,
         column: i32,
-        old_value: Box<Option<Style>>,
+        old_value: Box<Style>,
         new_value: Box<Style>,
     },
     // Column and Row diffs
@@ -65,28 +59,6 @@ pub(crate) enum Diff {
         new_value: f64,
         old_value: f64,
     },
-    SetColumnStyle {
-        sheet: u32,
-        column: i32,
-        old_value: Box<Option<Style>>,
-        new_value: Box<Style>,
-    },
-    SetRowStyle {
-        sheet: u32,
-        row: i32,
-        old_value: Box<Option<Style>>,
-        new_value: Box<Style>,
-    },
-    DeleteColumnStyle {
-        sheet: u32,
-        column: i32,
-        old_value: Box<Option<Style>>,
-    },
-    DeleteRowStyle {
-        sheet: u32,
-        row: i32,
-        old_value: Box<Option<Style>>,
-    },
     InsertRow {
         sheet: u32,
         row: i32,
@@ -105,10 +77,6 @@ pub(crate) enum Diff {
         column: i32,
         old_data: Box<ColumnData>,
     },
-    DeleteSheet {
-        sheet: u32,
-        old_data: Box<Worksheet>,
-    },
     SetFrozenRowsCount {
         sheet: u32,
         new_value: i32,
@@ -119,6 +87,9 @@ pub(crate) enum Diff {
         new_value: i32,
         old_value: i32,
     },
+    DeleteSheet {
+        sheet: u32,
+    },
     NewSheet {
         index: u32,
         name: String,
@@ -133,11 +104,6 @@ pub(crate) enum Diff {
         old_value: String,
         new_value: String,
     },
-    SetSheetState {
-        index: u32,
-        old_value: SheetState,
-        new_value: SheetState,
-    },
     SetShowGridLines {
         sheet: u32,
         old_value: bool,
@@ -197,6 +163,11 @@ impl History {
             None => None,
         }
     }
+
+    pub fn clear(&mut self) {
+        self.redo_stack = vec![];
+        self.undo_stack = vec![];
+    }
 }
 
 #[derive(Clone, Encode, Decode)]

base/src/user_model/mod.rs

@@ -1,6 +1,5 @@
 #![deny(missing_docs)]
 
-mod border;
 mod border_utils;
 mod common;
 mod history;

base/src/utils.rs

@@ -156,7 +156,7 @@ mod tests {
 
     use super::*;
     use crate::language::get_language;
-    use crate::locale::{Locale, get_locale};
+    use crate::locale::{get_locale, Locale};
 
     fn get_test_locale() -> &'static Locale {
         #![allow(clippy::unwrap_used)]

base/src/workbook.rs

@@ -27,27 +27,4 @@ impl Workbook {
             .get_mut(worksheet_index as usize)
             .ok_or_else(|| "Invalid sheet index".to_string())
     }
-
-    /// Returns the a list of defined names in the workbook with their scope
-    pub fn get_defined_names_with_scope(&self) -> Vec<(String, Option<u32>, String)> {
-        let sheet_id_index: Vec<u32> = self.worksheets.iter().map(|s| s.sheet_id).collect();
-
-        let defined_names = self
-            .defined_names
-            .iter()
-            .map(|dn| {
-                let index = dn
-                    .sheet_id
-                    .and_then(|sheet_id| {
-                        // returns an Option<usize>
-                        sheet_id_index.iter().position(|&x| x == sheet_id)
-                    })
-                    // convert Option<usize> to Option<u32>
-                    .map(|pos| pos as u32);
-
-                (dn.name.clone(), index, dn.formula.clone())
-            })
-            .collect::<Vec<_>>();
-        defined_names
-    }
 }

base/src/worksheet.rs

@@ -108,120 +108,37 @@ impl Worksheet {
         self.cols = vec![Col {
             min: 1,
             max: constants::LAST_COLUMN,
-            width: constants::DEFAULT_COLUMN_WIDTH,
-            custom_width: false,
+            width: constants::DEFAULT_COLUMN_WIDTH / constants::COLUMN_WIDTH_FACTOR,
+            custom_width: true,
             style: Some(style_index),
         }];
         Ok(())
     }
 
     pub fn set_column_style(&mut self, column: i32, style_index: i32) -> Result<(), String> {
-        let width = self
-            .get_column_width(column)
-            .unwrap_or(constants::DEFAULT_COLUMN_WIDTH);
+        let width = constants::DEFAULT_COLUMN_WIDTH / constants::COLUMN_WIDTH_FACTOR;
         self.set_column_width_and_style(column, width, Some(style_index))
     }
 
     pub fn set_row_style(&mut self, row: i32, style_index: i32) -> Result<(), String> {
-        // FIXME: This is a HACK
-        let custom_format = style_index != 0;
         for r in self.rows.iter_mut() {
             if r.r == row {
                 r.s = style_index;
-                r.custom_format = custom_format;
+                r.custom_format = true;
                 return Ok(());
             }
         }
         self.rows.push(Row {
             height: constants::DEFAULT_ROW_HEIGHT / constants::ROW_HEIGHT_FACTOR,
             r: row,
-            custom_format,
-            custom_height: false,
+            custom_format: true,
+            custom_height: true,
             s: style_index,
             hidden: false,
         });
         Ok(())
     }
 
-    pub fn delete_row_style(&mut self, row: i32) -> Result<(), String> {
-        let mut index = None;
-        for (i, r) in self.rows.iter().enumerate() {
-            if r.r == row {
-                index = Some(i);
-                break;
-            }
-        }
-        if let Some(i) = index {
-            if let Some(r) = self.rows.get_mut(i) {
-                r.s = 0;
-                r.custom_format = false;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn delete_column_style(&mut self, column: i32) -> Result<(), String> {
-        if !is_valid_column_number(column) {
-            return Err(format!("Column number '{column}' is not valid."));
-        }
-        let cols = &mut self.cols;
-
-        let mut index = 0;
-        let mut split = false;
-        for c in cols.iter_mut() {
-            let min = c.min;
-            let max = c.max;
-            if min <= column && column <= max {
-                //
-                split = true;
-                break;
-            }
-            if column < min {
-                // We passed, there is nothing to delete
-                break;
-            }
-            index += 1;
-        }
-        if split {
-            let min = cols[index].min;
-            let max = cols[index].max;
-            let custom_width = cols[index].custom_width;
-            let width = cols[index].width;
-            let pre = Col {
-                min,
-                max: column - 1,
-                width,
-                custom_width,
-                style: cols[index].style,
-            };
-            let col = Col {
-                min: column,
-                max: column,
-                width,
-                custom_width,
-                style: None,
-            };
-            let post = Col {
-                min: column + 1,
-                max,
-                width,
-                custom_width,
-                style: cols[index].style,
-            };
-            cols.remove(index);
-            if column != max {
-                cols.insert(index, post);
-            }
-            if custom_width {
-                cols.insert(index, col);
-            }
-            if column != min {
-                cols.insert(index, pre);
-            }
-        }
-        Ok(())
-    }
-
     pub fn set_cell_style(
         &mut self,
         row: i32,
@@ -368,12 +285,11 @@ impl Worksheet {
 
     /// Changes the width of a column.
     ///   * If the column does not a have a width we simply add it
-    ///   * If it has, it might be part of a range and we need to split the range.
+    ///   * If it has, it might be part of a range and we ned to split the range.
     ///
     /// Fails if column index is outside allowed range or width is negative.
     pub fn set_column_width(&mut self, column: i32, width: f64) -> Result<(), String> {
-        let style = self.get_column_style(column)?;
-        self.set_column_width_and_style(column, width, style)
+        self.set_column_width_and_style(column, width, None)
     }
 
     pub(crate) fn set_column_width_and_style(
@@ -393,7 +309,7 @@ impl Worksheet {
             min: column,
             max: column,
             width: width / constants::COLUMN_WIDTH_FACTOR,
-            custom_width: width != constants::DEFAULT_COLUMN_WIDTH,
+            custom_width: true,
             style,
         };
         let mut index = 0;
@@ -403,9 +319,7 @@ impl Worksheet {
             let max = c.max;
             if min <= column && column <= max {
                 if min == column && max == column {
-                    c.style = style;
                     c.width = width / constants::COLUMN_WIDTH_FACTOR;
-                    c.custom_width = width != constants::DEFAULT_COLUMN_WIDTH;
                     return Ok(());
                 }
                 split = true;
@@ -469,23 +383,6 @@ impl Worksheet {
         Ok(constants::DEFAULT_COLUMN_WIDTH)
     }
 
-    /// Returns the column style index if present
-    pub fn get_column_style(&self, column: i32) -> Result<Option<i32>, String> {
-        if !is_valid_column_number(column) {
-            return Err(format!("Column number '{column}' is not valid."));
-        }
-
-        let cols = &self.cols;
-        for col in cols {
-            let min = col.min;
-            let max = col.max;
-            if column >= min && column <= max {
-                return Ok(col.style);
-            }
-        }
-        Ok(None)
-    }
-
     // Returns non empty cells in a column
     pub fn column_cell_references(&self, column: i32) -> Result<Vec<CellReferenceIndex>, String> {
         let mut column_cell_references: Vec<CellReferenceIndex> = Vec::new();

bindings/nodejs/.cargo/config.toml

@@ -1,5 +0,0 @@
-[target.aarch64-unknown-linux-musl]
-linker = "aarch64-linux-musl-gcc"
-rustflags = ["-C", "target-feature=-crt-static"]
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "target-feature=+crt-static"]

bindings/nodejs/.gitignore

@@ -1,197 +0,0 @@
-# Created by https://www.toptal.com/developers/gitignore/api/node
-# Edit at https://www.toptal.com/developers/gitignore?templates=node
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# End of https://www.toptal.com/developers/gitignore/api/node
-
-# Created by https://www.toptal.com/developers/gitignore/api/macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=macos
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two 
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### macOS Patch ###
-# iCloud generated files
-*.icloud
-
-# End of https://www.toptal.com/developers/gitignore/api/macos
-
-# Created by https://www.toptal.com/developers/gitignore/api/windows
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.toptal.com/developers/gitignore/api/windows
-
-#Added by cargo
-
-/target
-Cargo.lock
-
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-*.node

bindings/nodejs/.npmignore

@@ -1,13 +0,0 @@
-target
-Cargo.lock
-.cargo
-.github
-npm
-.eslintrc
-.prettierignore
-rustfmt.toml
-yarn.lock
-*.node
-.yarn
-__test__
-renovate.json

bindings/nodejs/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

bindings/nodejs/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-edition = "2024"
-name = "ironcalc_nodejs"
-version = "0.3.1"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.2", default-features = false, features = ["napi4", "serde-json"] }
-napi-derive = "2.12.2"
-ironcalc = { path = "../../xlsx", version = "0.3.0" }
-serde = { version = "1.0", features = ["derive"] }
-
-[build-dependencies]
-napi-build = "2.0.1"
-

bindings/nodejs/README.md

@@ -1,18 +0,0 @@
-# IronCalc nodejs bindingds
-
-
-Example usage:
-
-```javascript
-import { Model } from '@ironcalc/wasm';
- 
-const model = new Model("Workbook1", "en", "UTC");
-
-model.setUserInput(0, 1, 1, "=1+1");
-const result1 = model.getFormattedCellValue(0, 1, 1);
-
-console.log('Cell value', result1);
-
-let result2 = model.getCellStyle(0, 1, 1);
-console.log('Cell style', result2);
-```

bindings/nodejs/__test__/index.spec.mjs

@@ -1,20 +0,0 @@
-import test from 'ava'
-
-import { UserModel, Model } from '../index.js';
- 
-test('User Model smoke test', (t) => {
-  const model = new UserModel("Workbook1", "en", "UTC");
-
-  model.setUserInput(0, 1, 1, "=1+1");
-  t.is(model.getFormattedCellValue(0, 1, 1), '2');
-});
-
-
-test('Raw API smoke test', (t) => {
-  const model = new Model("Workbook1", "en", "UTC");
-
-  model.setUserInput(0, 1, 1, "=1+1");
-  model.evaluate();
-  t.is(model.getFormattedCellValue(0, 1, 1), '2');
-});
-

bindings/nodejs/build.rs

@@ -1,5 +0,0 @@
-extern crate napi_build;
-
-fn main() {
-  napi_build::setup();
-}