Revert "add new configurations"

add new configurations

.circleci/config.yml

@@ -1,53 +1,5 @@
 version: 2.1
-
 jobs:
-  lint:
-    docker:
-      - image: penpotapp/devenv:latest
-
-    working_directory: ~/repo
-    resource_class: medium+
-
-    steps:
-      - checkout
-
-      - run:
-          name: "fmt check"
-          working_directory: "."
-          command: |
-            yarn install
-            yarn run fmt:clj:check
-
-      - run:
-          name: "lint clj common"
-          working_directory: "."
-          command: |
-            yarn run lint:clj:common
-
-      - run:
-          name: "lint clj frontend"
-          working_directory: "."
-          command: |
-            yarn run lint:clj:frontend
-
-      - run:
-          name: "lint clj backend"
-          working_directory: "."
-          command: |
-            yarn run lint:clj:backend
-
-      - run:
-          name: "lint clj exporter"
-          working_directory: "."
-          command: |
-            yarn run lint:clj:exporter
-
-      - run:
-          name: "lint clj library"
-          working_directory: "."
-          command: |
-            yarn run lint:clj:library
-
   test-common:
     docker:
       - image: penpotapp/devenv:latest
@@ -65,7 +17,15 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "common/deps.edn"}}-{{ checksum "common/yarn.lock" }}
+            - v1-dependencies-{{ checksum "common/deps.edn"}}
+
+      - run:
+          name: "fmt check & linter"
+          working_directory: "./common"
+          command: |
+            yarn install
+            yarn run fmt:clj:check
+            yarn run lint:clj
 
       - run:
           name: "JVM tests"
@@ -77,16 +37,12 @@ jobs:
           name: "NODE tests"
           working_directory: "./common"
           command: |
-            yarn install
             yarn run test
 
       - save_cache:
           paths:
             - ~/.m2
-            - ~/.yarn
-            - ~/.gitlibs
-            - ~/.cache/ms-playwright
-          key: v1-dependencies-{{ checksum "common/deps.edn"}}-{{ checksum "common/yarn.lock" }}
+          key: v1-dependencies-{{ checksum "common/deps.edn"}}
 
   test-frontend:
     docker:
@@ -105,68 +61,36 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
+            - v1-dependencies-{{ checksum "frontend/deps.edn"}}
 
       - run:
-          name: "install dependencies"
-          working_directory: "./frontend"
-          # We install playwright here because the dependent tasks
-          # uses the same cache as this task so we prepopulate it
+          name: "prepopulate linter cache"
+          working_directory: "./common"
           command: |
             yarn install
-            yarn run playwright install chromium
+            yarn run lint:clj
 
       - run:
-          name: "lint scss on frontend"
+          name: "fmt check & linter"
           working_directory: "./frontend"
           command: |
+            yarn install
+            yarn run fmt:clj:check
+            yarn run fmt:js:check
             yarn run lint:scss
+            yarn run lint:clj
 
       - run:
           name: "unit tests"
           working_directory: "./frontend"
           command: |
+            yarn install
             yarn run test
 
       - save_cache:
           paths:
             - ~/.m2
-            - ~/.yarn
-            - ~/.gitlibs
-            - ~/.cache/ms-playwright
-          key: v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
-
-  test-library:
-    docker:
-      - image: penpotapp/devenv:latest
-
-    working_directory: ~/repo
-    resource_class: medium+
-
-    environment:
-      JAVA_OPTS: -Xmx6g
-      NODE_OPTIONS: --max-old-space-size=4096
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
-
-      - run:
-          name: Install dependencies and build
-          working_directory: "./library"
-          command: |
-            yarn install
-
-      - run:
-          name: Build and Test
-          working_directory: "./library"
-          command: |
-            ./scripts/build
-            yarn run test
+          key: v1-dependencies-{{ checksum "frontend/deps.edn"}}
 
   test-components:
     docker:
@@ -185,14 +109,14 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
+            - v1-dependencies-{{ checksum "frontend/deps.edn"}}
 
       - run:
           name: Install dependencies
           working_directory: "./frontend"
           command: |
-            yarn install
-            yarn run playwright install chromium
+            yarn
+            npx playwright install --with-deps
 
       - run:
           name: Build Storybook
@@ -224,7 +148,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
+            - v1-dependencies-{{ checksum "frontend/deps.edn"}}
 
       - run:
           name: "integration tests"
@@ -234,7 +158,7 @@ jobs:
             yarn run build:app:assets
             yarn run build:app
             yarn run build:app:libs
-            yarn run playwright install chromium
+            yarn run playwright install --with-deps chromium
             yarn run test:e2e -x --workers=4
 
   test-backend:
@@ -261,6 +185,21 @@ jobs:
           keys:
             - v1-dependencies-{{ checksum "backend/deps.edn" }}
 
+      - run:
+          name: "prepopulate linter cache"
+          working_directory: "./common"
+          command: |
+            yarn install
+            yarn run lint:clj
+
+      - run:
+          name: "fmt check & linter"
+          working_directory: "./backend"
+          command: |
+            yarn install
+            yarn run fmt:clj:check
+            yarn run lint:clj
+
       - run:
           name: "tests"
           working_directory: "./backend"
@@ -276,9 +215,37 @@ jobs:
       - save_cache:
           paths:
             - ~/.m2
-            - ~/.gitlibs
           key: v1-dependencies-{{ checksum "backend/deps.edn" }}
 
+  test-exporter:
+    docker:
+      - image: penpotapp/devenv:latest
+
+    working_directory: ~/repo
+    resource_class: medium+
+
+    environment:
+      JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC
+      NODE_OPTIONS: --max-old-space-size=4096
+
+    steps:
+      - checkout
+
+      - run:
+          name: "prepopulate linter cache"
+          working_directory: "./common"
+          command: |
+            yarn install
+            yarn run lint:clj
+
+      - run:
+          name: "fmt check & linter"
+          working_directory: "./exporter"
+          command: |
+            yarn install
+            yarn run fmt:clj:check
+            yarn run lint:clj
+
   test-render-wasm:
     docker:
       - image: penpotapp/devenv:latest
@@ -311,32 +278,10 @@ jobs:
 workflows:
   penpot:
     jobs:
-      - lint
-      - test-frontend:
-          requires:
-            - lint: success
-
-      - test-library:
-          requires:
-            - test-frontend: success
-            - lint: success
-
-      - test-components:
-          requires:
-            - test-frontend: success
-            - lint: success
-
-      - test-integration:
-          requires:
-            - test-frontend: success
-            - lint: success
-
-      - test-backend:
-          requires:
-            - lint: success
-
-      - test-common:
-          requires:
-            - lint: success
-
+      - test-frontend
+      - test-components
+      - test-integration
+      - test-backend
+      - test-common
+      - test-exporter
       - test-render-wasm

.github/workflows/build-bundles.yml

@@ -1,129 +0,0 @@
-name: Build and Upload Penpot Bundles non-prod
-
-on:
-  # Create bundler for every tag
-  push:
-    tags:
-      - '**' # Pattern matched against refs/tags
-  # Create bundler every hour between 5:00 and 20:00 on working days
-  schedule:
-    - cron: '0 5-20 * * 1-5'
-  # Create bundler from manual action
-  workflow_dispatch:
-    inputs:
-      zip_mode:
-        # zip_mode defines how the build artifacts are packaged:
-        # - 'individual': creates one ZIP file per component (frontend, backend, exporter)
-        # - 'all': creates a single ZIP containing all components
-        # - null: for the rest of cases (non-manual events)
-        description: 'Bundle packaging mode'
-        required: false
-        default: 'individual'
-        type: choice
-        options:
-          - individual
-          - all
-
-jobs:
-  build-bundles:
-    name: Build and Upload Penpot Bundles
-    runs-on: ubuntu-24.04
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Extract somer useful variables
-        id: vars
-        run: |
-          echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "gh_branch=${{ github.base_ref || github.ref_name }}" >> $GITHUB_OUTPUT
-
-      # Set up Docker Buildx for multi-arch build
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Run manage.sh build-bundle from host
-        run: ./manage.sh build-bundle
-
-      - name: Prepare directories for zipping
-        run: |
-          mkdir zips
-          mv bundles penpot
-
-      - name: Create zip bundles for zip_mode == 'all'
-        if: ${{ github.event.inputs.zip_mode == 'all' }}
-        run: |
-          echo "📦 Packaging Penpot 'all' bundles..."
-          zip -r zips/penpot-all-bundles.zip penpot
-
-      - name: Create zip bundles for zip_mode != 'all'
-        if: ${{ github.event.inputs.zip_mode != 'all' }}
-        run: |
-          echo "📦 Packaging Penpot 'individual' bundles..."
-          zip -r zips/penpot-frontend.zip penpot/frontend
-          zip -r zips/penpot-backend.zip penpot/backend
-          zip -r zips/penpot-exporter.zip penpot/exporter
-
-      - name: Upload unified 'all' bundle
-        if: ${{ github.event.inputs.zip_mode == 'all' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: penpot-all-bundles
-          path: zips/penpot-all-bundles.zip
-
-      - name: Upload individual bundles
-        if: ${{ github.event.inputs.zip_mode != 'all' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: penpot-individual-bundles
-          path: |
-            zips/penpot-frontend.zip
-            zips/penpot-backend.zip
-            zips/penpot-exporter.zip
-
-      - name: Upload unified 'all' bundle to S3
-        if: ${{ github.event.inputs.zip_mode == 'all' }}
-        run: |
-          aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.gh_branch}}.zip
-          aws s3 cp zips/penpot-all-bundles.zip s3://${{ secrets.S3_BUCKET }}/penpot-all-bundles-${{ steps.vars.outputs.commit_hash }}.zip
-
-      - name: Upload 'individual' bundles to S3
-        if: ${{ github.event.inputs.zip_mode != 'all' }}
-        run: |
-            for name in penpot-frontend penpot-backend penpot-exporter; do
-              aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.gh_branch }}-latest.zip
-              aws s3 cp zips/${name}.zip s3://${{ secrets.S3_BUCKET }}/${name}-${{ steps.vars.outputs.commit_hash }}.zip
-            done
-
-      - name: Notify Mattermost about automatic bundles
-        if: github.event_name == 'pull_request'
-        uses: mattermost/action-mattermost-notify@master
-        with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
-          TEXT: |
-            📦 *Penpot bundle automatically generated*
-            📄 PR: ${{ github.event.pull_request.title }}
-            🔁 From: \`${{ github.head_ref }}\` to \`{{ github.base_ref }}\`
-            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-      - name: Notify Mattermost about manual bundles
-        if: github.event_name == 'workflow_dispatch'
-        uses: mattermost/action-mattermost-notify@master
-        with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
-          TEXT: |
-            📦 *Penpot bundle manually generated*
-            📄 Triggered from branch: `${{ github.ref_name}}`
-            🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-      - name: Print artifact summary URL
-        run: |
-          echo "📦 Artifacts available at:"
-          echo "🔗 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

.github/workflows/commit-checker.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Check Commit Type
         uses: gsactions/commit-message-checker@v2
         with:
-          pattern: '^(Merge|:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle):)\s[A-Z].*[^.]$'
+          pattern: '^:(lipstick|globe_with_meridians|wrench|books|arrow_up|arrow_down|zap|ambulance|construction|boom|fire|whale|bug|sparkles|paperclip|tada|recycle):\s[A-Z].*[^.]$'
           flags: 'gm'
           error: 'Commit should match CONTRIBUTING.md guideline'
           checkAllCommitMessages: 'true' # optional: this checks all commits associated with a pull request

.gitignore

@@ -30,7 +30,6 @@
 /*.zip
 /.clj-kondo/.cache
 /_dump
-/notes
 /backend/*.md
 /backend/*.sql
 /backend/*.txt
@@ -69,8 +68,6 @@
 /vendor/**/target
 /vendor/svgclean/bundle*.js
 /web
-/library/target/
-
 clj-profiler/
 node_modules
 /test-results/

CHANGES.md

@@ -1,116 +1,51 @@
 # CHANGELOG
 
-## 2.9.0 (Unreleased)
+## 2.8.0 (Next / Unreleased)
 
 ### :rocket: Epics and highlights
 
 ### :boom: Breaking changes & Deprecations
 
-### :heart: Community contributions (Thank you!)
+**Breaking changes on penpot library:**
 
-### :sparkles: New features & Enhancements
-- Add visual indicator for new comments in the workspace [Taiga #11328](https://tree.taiga.io/project/penpot/issue/11328)
-- On components overrides, separate the content of the text from the rest of properties [Taiga #7434](https://tree.taiga.io/project/penpot/us/7434)
-- Improve dashboard's sidebar [Taiga #10700](https://tree.taiga.io/project/penpot/us/10700)
-- Change "Save color" button to primary button [Taiga #9410](https://tree.taiga.io/project/penpot/issue/9410)
-- Support for exif rotated images [GitHub #6767](https://github.com/penpot/penpot/issues/6767)
-- Display Blend Mode and Layer Opacity properties in the Inspect tab [Taiga #11283](https://tree.taiga.io/project/penpot/issue/11283)
-- Add the option to import tokens in a .zip file. [Taiga #11378](https://tree.taiga.io/project/penpot/us/11378)
-- New typography token type - font size token [Taiga #10938](https://tree.taiga.io/project/penpot/us/10938)
+- Change the signature of the `addPage` method: it now accepts an object (as a single argument) where you can pass `id`,
+  `name`, and `background` props (instead of the previous positional arguments)
+- Rename the `file.createRect` method to `file.addRect`
+- Rename the `file.createCircle` method to `file.addCircle`
+- Rename the `file.createPath` method to `file.addPath`
+- Rename the `file.createText` method to `file.addText`
+- Rename `file.startComponent` to `file.addComponent` (to preserve the naming style)
+- Rename `file.createComponentInstance` to `file.addComponentInstance` (to preserve the naming style)
+- Rename `file.lookupShape` to `file.getShape`
+- Rename `file.asMap` to `file.toMap`
+- Remove `file.updateLibraryColor` (use `file.addLibraryColor` if you just need to replace a color)
+- Remove `file.deleteLibraryColor` (this library is intended to build files)
+- Remove `file.updateLibraryTypography` (use `file.addLibraryTypography` if you just need to replace a typography)
+- Remove `file.deleteLibraryTypography` (this library is intended to build files)
+- Remove `file.add/update/deleteLibraryMedia` (they are no longer supported by Penpot and have been replaced by components)
+- Remove `file.deleteObject` (this library is intended to build files)
+- Remove `file.updateObject` (this library is intended to build files)
+- Remove `file.finishComponent` (it is no longer necessary; see below for more details on component creation changes)
+- Change the `file.getCurrentPageId` function to a read-only `file.currentPageId` property
+- Add `file.currentFrameId` read-only property
+- Add `file.lastId` read-only property
 
-### :bug: Bugs fixed
-- Copying font size does not copy the unit [Taiga #11143](https://tree.taiga.io/project/penpot/issue/11143)
-- Fix text-decoration line-through that displays a wrong property value [Taiga #11145](https://tree.taiga.io/project/penpot/issue/11145)
-- Fix display error message on register form [Taiga #11444](https://tree.taiga.io/project/penpot/issue/11444)
-- Fix toggle focus mode did not restore viewport and selection upon exit [GitHub #6280](https://github.com/penpot/penpot/issues/6820)
-- Fix problem when creating a layout from an existing layout [Taiga #11554](https://tree.taiga.io/project/penpot/issue/11554)
-- Fix title button from Title Case to Capitalize [Taiga #11476](https://tree.taiga.io/project/penpot/issue/11476)
-
-## 2.8.0
-
-### :rocket: Epics and highlights
-
-### :boom: Breaking changes & Deprecations
-
-**Penpot Library**
-
-The initial prototype is completly reworked for provide a more consistent API
-and to have proper validation and params decoding. All the details can be found
-on [its own changelog](library/CHANGES.md)
-
-**Penpot migrate from Redis to Valkey**
-
-As [Valkey](https://valkey.io/) is an opne-souce fork of [Redis](https://redis.io/)
-version 7.2.4, this version of Penpot will be compatible with Redis but may diverge
-in future versions. Therefore, **migration from Redis to ValKey is recommended for all
-on-premises instances** that want to keep up to date.
+There are also relevant semantic changes in how components should be created: this refactor removes
+all notions of the old components (v1). Since v2, the shapes that are part of a component live on a
+page. So, from now on, to create a component, you should first create a frame, then add shapes
+and/or groups to that frame, and then create a component by declaring that frame as the component
+root.
 
 ### :heart: Community contributions (Thank you!)
-- Add Serbian language [GitHub #5002](https://github.com/penpot/penpot/issues/5002) by [crnobog69](https://github.com/crnobog69)
 
-### :sparkles: New features & Enhancements
+### :sparkles: New features
 
 - Optimize profile setup flow for better user experience [Taiga #10028](https://tree.taiga.io/project/penpot/us/10028)
-- Rewrite path shape data PathData encoding [Taiga #8542](https://tree.taiga.io/project/penpot/us/8542?milestone=441308)
-- Update base image for Docker Backend and Exporter to Ubuntu 24.04
-- Update base image for Docker Frontend to Nginx 1.28.0
-- Allow multi file token import [Github #27](https://github.com/tokens-studio/penpot/issues/27)
-- Create `input*` wrapper component, and `label*`, `input-field*` and `hint-message*` components [Taiga #10713](https://tree.taiga.io/project/penpot/us/10713)
-- Deselect layers (and path nodes) with Ctrl+Shift+Drag [Github #2509](https://github.com/penpot/penpot/issues/2509)
-- Copy to SVG from contextual menu [Github #838](https://github.com/penpot/penpot/issues/838)
-- Add styles for Inkeep Chat at workspace [Taiga #10708](https://tree.taiga.io/project/penpot/us/10708)
-- Add configuration for air gapped installations with Docker
-- Support system color scheme [Github #5030](https://github.com/penpot/penpot/issues/5030)
-- Persist ruler visibility across files and reloads [GitHub #4586](https://github.com/penpot/penpot/issues/4586)
-- Update google fonts (at 2025/05/19) [Taiga 10792](https://tree.taiga.io/project/penpot/us/10792)
-- Add tooltip component to DS [Taiga 9220](https://tree.taiga.io/project/penpot/us/9220)
-- Allow multi file token export [Taiga #10144](https://tree.taiga.io/project/penpot/us/10144)
-- Fix problem when double click on hidden shapes [Taiga #11314](https://tree.taiga.io/project/penpot/issue/11314)
 
 ### :bug: Bugs fixed
 
-- Fix getCurrentUser for plugins api [Taiga #11057](https://tree.taiga.io/project/penpot/issue/11057)
-- Fix spacing / sizes of different elements in the measurements section of the design tab [Taiga #11076](https://tree.taiga.io/project/penpot/issue/11076)
-- Fix selection of short paths [Github #4472](https://github.com/penpot/penpot/issues/4472)
-- Fix element positioning on the right side to adjust to grid [#11073](https://tree.taiga.io/project/penpot/issue/11073)
-- Fix palette is over sidebar [#11160](https://tree.taiga.io/project/penpot/issue/11160)
-- Fix font size input not displaying "mixed" when multiple texts are selected [Taiga #11177](https://tree.taiga.io/project/penpot/issue/11177)
-- Misalignments at Create account [Taiga #11315](https://tree.taiga.io/project/penpot/issue/11315)
-- Fix issue with importing files where flex/grid is used [Taiga #11334](https://tree.taiga.io/project/penpot/issue/11334)
-- Fix wrong color in the export progress bar [Taiga #11299](https://tree.taiga.io/project/penpot/issue/11299)
-- Fix right sidebar width overflow on long layer names [Taiga #11212](https://tree.taiga.io/project/penpot/issue/11212)
-- Fix comment icon fill [Taiga #11388](https://tree.taiga.io/project/penpot/issue/11388)
-- Fix gap on radio-buttons component [Taiga #11360](https://tree.taiga.io/project/penpot/issue/11360)
-- Fix button width [Taiga #11394](https://tree.taiga.io/project/penpot/issue/11394)
-- Fix mixed letter spacing and line height [Taiga #11178](https://tree.taiga.io/project/penpot/issue/11178)
-- Fix snap nodes shortcut [Taiga #11054](https://tree.taiga.io/project/penpot/issue/11054)
-- Fix changing a text property in a text layer does not unapply the previously applied token in the same property [Taiga #11337](https://tree.taiga.io/project/penpot/issue/11337)
-- Fix shortcut error pressing G+W from the View Mode [Taiga #11061](https://tree.taiga.io/project/penpot/issue/11061)
-- Fix entering long project name [Taiga #11417](https://tree.taiga.io/project/penpot/issue/11417)
-- Fix slow color picker [Taiga #11019](https://tree.taiga.io/project/penpot/issue/11019)
-- Fix tooltip position after click [Taiga #11405](https://tree.taiga.io/project/penpot/issue/11405)
-- Fix incorrect media translation on paste text with fill images [Github #6845](https://github.com/penpot/penpot/pull/6845)
 
-## 2.7.2
-
-### :bug: Bugs fixed
-
-- Update plugins runtime [Github #6604](https://github.com/penpot/penpot/pull/6604)
-- Backport from develop a minor fix that enables import of files
-  generated by penpot library [Github #6614](https://github.com/penpot/penpot/pull/6614)
-- Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615)
-- Fix url on invitation link [Taiga #11284](https://tree.taiga.io/project/penpot/issue/11284)
-
-
-## 2.7.1
-
-### :bug: Bugs fixed
-
-- Fix incorrect handling of strokes with images on importing files
-- Fix tokens disappearing after manual additions [Taiga #11063](https://tree.taiga.io/project/penpot/issue/11063)
-
-
-## 2.7.0
+## 2.7.0 (Unreleased)
 
 ### :rocket: Epics and highlights
 
@@ -128,10 +63,10 @@ on-premises instances** that want to keep up to date.
 - Duplicate token sets [Taiga #10694](https://tree.taiga.io/project/penpot/issue/10694)
 - Add set selection in create Token themes flow [Taiga #10746](https://tree.taiga.io/project/penpot/issue/10746)
 - Display indicator on not active sets [Taiga #10668](https://tree.taiga.io/project/penpot/issue/10668)
+- Create `input*` wrapper component, and `label*`, `input-field*` and `hint-message*` components [Taiga #10713](https://tree.taiga.io/project/penpot/us/10713)
 
 ### :bug: Bugs fixed
 
-- Fix "at" icon to match all icons on app [Taiga #11136](https://tree.taiga.io/project/penpot/issue/11136)
 - Fix problem in viewer with the back button [Taiga #10907](https://tree.taiga.io/project/penpot/issue/10907)
 - Fix resize bar background on tokens panel [Taiga #10811](https://tree.taiga.io/project/penpot/issue/10811)
 - Fix shortcut for history version panel [Taiga #11006](https://tree.taiga.io/project/penpot/issue/11006)
@@ -158,13 +93,6 @@ on-premises instances** that want to keep up to date.
 - Fix cannot rename Design Token Sets when group of same name exists [Taiga Issue #10773](https://tree.taiga.io/project/penpot/issue/10773)
 - Fix problem when duplicating grid layout [Github #6391](https://github.com/penpot/penpot/issues/6391)
 - Fix issue that makes workspace shortcuts stop working [Taiga #11062](https://tree.taiga.io/project/penpot/issue/11062)
-- Fix problem while syncing library colors and typographies [Taiga #11068](https://tree.taiga.io/project/penpot/issue/11068)
-- Fix problem with path edition of shapes [Taiga #9496](https://tree.taiga.io/project/penpot/issue/9496)
-- Fix exception on paste invalid html [Taiga #11047](https://tree.taiga.io/project/penpot/issue/11047)
-- Fix share button being displayed with no permissions [Taiga #11086](https://tree.taiga.io/project/penpot/issue/11086)
-- Fix inline styles in code tab [Taiga Issue #7583](https://tree.taiga.io/project/penpot/issue/7583)
-- Fix exception on returning openapi.json
-- Fix json encoding of TokensLib [Taiga #10994](https://tree.taiga.io/project/penpot/issue/10994)
 
 ## 2.6.2
 

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Penpot's Code of Conduct
-
-Check it at: https://help.penpot.app/contributing-guide/coc/

CONTRIBUTING.md

@@ -1,59 +1,62 @@
 # Contributing Guide #
 
 Thank you for your interest in contributing to Penpot. This is a
-generic guide that details how to contribute to the project in a way that
-is efficient for everyone. If you are looking for specific documentation on
-different parts of the platform, please refer to the `docs/` directory,
-or the rendered version at the [Help Center](https://help.penpot.app/).
+generic guide that details how to contribute to Penpot in a way that
+is efficient for everyone. If you want a specific documentation for
+different parts of the platform, please refer to `docs/` directory.
+
 
 ## Reporting Bugs ##
 
 We are using [GitHub Issues](https://github.com/penpot/penpot/issues)
-for our public bugs. We keep a close eye on them and try to make it
+for our public bugs. We keep a close eye on this and try to make it
 clear when we have an internal fix in progress. Before filing a new
 task, try to make sure your problem doesn't already exist.
 
-If you found a bug, please report it, as far as possible, with:
+If you found a bug, please report it, as far as possible with:
 
 - a detailed explanation of steps to reproduce the error
-- the browser and browser version used
-- a dev tools console exception stack trace (if available)
+- a browser and the browser version used
+- a dev tools console exception stack trace (if it is available)
 
-If you found a bug which you think is better to discuss in private (for
-example, security bugs), consider first sending an email to
+If you found a bug that you consider better discuss in private (for
+example: security bugs), consider first send an email to
 `support@penpot.app`.
 
-**We don't have a formal bug bounty program for security reports; this
-is an open source application, and your contribution will be recognized
+**We don't have formal bug bounty program for security reports; this
+is an open source application and your contribution will be recognized
 in the changelog.**
 
 
-## Pull Requests ##
+## Pull requests ##
 
-If you want to propose a change or bug fix via a pull request (PR),
-you should first carefully read the section **Developer's Certificate of
-Origin**. You must also format your code and commits according to the
-instructions below.
+If you want propose a change or bug fix with the Pull-Request system
+firstly you should carefully read the **DCO** section and format your
+commits accordingly.
 
-If you intend to fix a bug, it's fine to submit a pull request right
-away, but we still recommend filing an issue detailing what you're
+If you intend to fix a bug it's fine to submit a pull request right
+away but we still recommend to file an issue detailing what you're
 fixing. This is helpful in case we don't accept that specific fix but
 want to keep track of the issue.
 
-If you want to implement or start working on a new feature, please
-open a **question*- / **discussion*- issue for it. No PR
-will be accepted without a prior discussion about the changes,
-whether it is a new feature, an already planned one, or a quick win.
+If you want to implement or start working in a new feature, please
+open a **question** / **discussion** issue for it. No pull-request
+will be accepted without previous chat about the changes,
+independently if it is a new feature, already planned feature or small
+quick win.
 
-If it is your first PR, you can learn how to proceed from
-[this free video
-series](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github)
+If is going to be your first pull request, You can learn how from this
+free video series:
+
+https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github
+
+We will use the `easy fix` mark for tag for indicate issues that are
+easy for beginners.
 
-We use the `easy fix` tag to indicate issues that are appropriate for beginners.
 
 ## Commit Guidelines ##
 
-We have very precise rules on how our git commit messages must be formatted.
+We have very precise rules over how our git commit messages can be formatted.
 
 The commit message format is:
 
@@ -68,37 +71,34 @@ The commit message format is:
 Where type is:
 
 - :bug: `:bug:` a commit that fixes a bug
-- :sparkles: `:sparkles:` a commit that adds an improvement
-- :tada: `:tada:` a commit with a new feature
+- :sparkles: `:sparkles:` a commit that an improvement
+- :tada: `:tada:` a commit with new feature
 - :recycle: `:recycle:` a commit that introduces a refactor
 - :lipstick: `:lipstick:` a commit with cosmetic changes
-- :ambulance: `:ambulance:` a commit that fixes a critical bug
+- :ambulance: `:ambulance:` a commit that fixes critical bug
 - :books: `:books:` a commit that improves or adds documentation
-- :construction: `:construction:` a WIP commit
+- :construction: `:construction:`: a wip commit
 - :boom: `:boom:` a commit with breaking changes
 - :wrench: `:wrench:` a commit for config updates
 - :zap: `:zap:` a commit with performance improvements
-- :whale: `:whale:` a commit for Docker-related stuff
-- :paperclip: `:paperclip:` a commit with other non-relevant changes
-- :arrow_up: `:arrow_up:` a commit with dependency updates
-- :arrow_down: `:arrow_down:` a commit with dependency downgrades
+- :whale: `:whale:` a commit for docker related stuff
+- :paperclip: `:paperclip:` a commit with other not relevant changes
+- :arrow_up: `:arrow_up:` a commit with dependencies updates
+- :arrow_down: `:arrow_down:` a commit with dependencies downgrades
 - :fire: `:fire:` a commit that removes files or code
-- :globe_with_meridians: `:globe_with_meridians:` a commit that adds or updates
-  translations
 
 More info:
-
  - https://gist.github.com/parmentf/035de27d6ed1dce0b36a
  - https://gist.github.com/rxaviers/7360908
 
 Each commit should have:
 
-- A concise subject using the imperative mood.
-- The subject should capitalize the first letter, omit the period
-  at the end, and be no longer than 65 characters.
+- A concise subject using imperative mood.
+- The subject should have capitalized the first letter, without period
+  at the end and no larger than 65 characters.
 - A blank line between the subject line and the body.
-- An entry in the CHANGES.md file if applicable, referencing the
-  GitHub or Taiga issue/user story using these same rules.
+- An entry on the CHANGES.md file if applicable, referencing the
+  github or taiga issue/user-story using the these same rules.
 
 Examples of good commit messages:
 
@@ -111,30 +111,8 @@ Examples of good commit messages:
 - `:ambulance: Fix critical bug on user registration process`
 - `:tada: Add new approach for user registration`
 
-## Formatting and Linting ##
 
-You will want to make sure your code is formatted and linted before submitting
-a PR. We use [cljfmt](https://github.com/weavejester/cljfmt) and
-[clj-kondo](https://github.com/clj-kondo/clj-kondo) for this. After installing
-them on your system, you can run them with:
-
-```bash
-# Check formatting
-yarn fmt:clj:check
-
-# Check and fix formatting
-yarn fmt:clj
-
-# Run the linter
-yarn lint:clj
-```
-
-There are more choices in `package.json`.
-
-Ideally, you should run these commands as git pre-commit hooks. A convenient way
-of defining them is to use [Husky](https://typicode.github.io/husky/#/).
-
-## Code of Conduct ##
+## Code of conduct ##
 
 As contributors and maintainers of this project, we pledge to respect
 all people who contribute through reporting issues, posting feature
@@ -154,11 +132,11 @@ unprofessional conduct.
 
 Project maintainers have the right and responsibility to remove, edit,
 or reject comments, commits, code, wiki edits, issues, and other
-contributions that are not aligned with this Code of Conduct. Project
+contributions that are not aligned to this Code of Conduct. Project
 maintainers who do not follow the Code of Conduct may be removed from
 the project team.
 
-This Code of Conduct applies both within project spaces and in public
+This code of conduct applies both within project spaces and in public
 spaces when an individual is representing the project or its
 community.
 
@@ -167,11 +145,12 @@ may be reported by opening an issue or contacting one or more of the
 project maintainers.
 
 This Code of Conduct is adapted from the Contributor Covenant, version
-1.1.0, available from [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
+1.1.0, available from http://contributor-covenant.org/version/1/1/0/
 
-## Developer's Certificate of Origin (DCO)
 
-By submitting code you agree to and can certify the following:
+## Developer's Certificate of Origin (DCO) ##
+
+By submitting code you are agree and can certify the below:
 
     Developer's Certificate of Origin 1.1
 
@@ -199,15 +178,13 @@ By submitting code you agree to and can certify the following:
         maintained indefinitely and may be redistributed consistent with
         this project or the open source license(s) involved.
 
-Then, all your code patches (**documentation is excluded**) should
+Then, all your code patches (**documentation are excluded**) should
 contain a sign-off at the end of the patch/commit description body. It
-can be automatically added by adding the `-s` parameter to `git commit`.
+can be automatically added on adding `-s` parameter to `git commit`.
 
-This is an example of what the line should look like:
+This is an example of the aspect of the line:
 
-```
-Signed-off-by: Andrey Antukh <niwi@niwi.nz>
-```
+	Signed-off-by: Andrey Antukh <niwi@niwi.nz>
 
 Please, use your real name (sorry, no pseudonyms or anonymous
 contributions are allowed).

README.md

@@ -34,8 +34,7 @@
 
 <br />
 
-[Penpot video](https://github.com/user-attachments/assets/7c67fd7c-04d3-4c9b-88ec-b6f5e23f8332
-)
+[Penpot video](https://github.com/penpot/penpot/assets/5446186/b8ad0764-585e-4ddc-b098-9b4090d337cc)
 
 <br />
 
@@ -94,9 +93,10 @@ With Penpot’s standardized [design tokens](https://penpot.dev/collaboration/de
 
 ## Getting started ##
 
-Penpot is the only design & prototype platform that is deployment agnostic. You can use it in our [SAAS](https://design.penpot.app) or deploy it anywhere.
+### Install with Elestio ###
+Penpot is the only design & prototype platform that is deployment agnostic. You can use it or deploy it anywhere.
 
-Learn how to install it with Docker, Kubernetes, Elestio or other options on [our website](https://penpot.app/self-host).
+Learn how to install it with Elestio and Docker, or other options on [our website](https://penpot.app/self-host).
 <br />
 
 <p align="center">
@@ -128,12 +128,6 @@ You will find the following categories:
 </p>
 <br />
 
-### Code of Conduct ###
-
-Anyone who contributes to Penpot, whether through code, in the community, or at an event, must adhere to the
-[code of conduct](https://help.penpot.app/contributing-guide/coc/) and foster a positive and safe environment.
-
-
 ## Contributing ##
 
 Any contribution will make a difference to improve Penpot. How can you get involved?

backend/deps.edn

@@ -3,10 +3,10 @@
 
  :deps
  {penpot/common {:local/root "../common"}
-  org.clojure/clojure {:mvn/version "1.12.1"}
+  org.clojure/clojure {:mvn/version "1.12.0"}
   org.clojure/tools.namespace {:mvn/version "1.5.0"}
 
-  com.github.luben/zstd-jni {:mvn/version "1.5.7-3"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.6-9"}
 
   io.prometheus/simpleclient {:mvn/version "0.16.0"}
   io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
@@ -17,15 +17,8 @@
 
   io.prometheus/simpleclient_httpserver {:mvn/version "0.16.0"}
 
-  io.lettuce/lettuce-core {:mvn/version "6.7.0.RELEASE"}
-  ;; Minimal dependencies required by lettuce, we need to include them
-  ;; explicitly because clojure dependency management does not support
-  ;; yet the BOM format.
-  io.micrometer/micrometer-core {:mvn/version "1.14.2"}
-  io.micrometer/micrometer-observation {:mvn/version "1.14.2"}
-
+  io.lettuce/lettuce-core {:mvn/version "6.5.2.RELEASE"}
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
-  com.google.guava/guava {:mvn/version "33.4.8-jre"}
 
   funcool/yetti
   {:git/tag "v11.4"
@@ -34,14 +27,15 @@
    :exclusions [org.slf4j/slf4j-api]}
 
   com.github.seancorfield/next.jdbc
-  {:mvn/version "1.3.1002"}
-  metosin/reitit-core {:mvn/version "0.9.1"}
+  {:mvn/version "1.3.994"}
+  metosin/reitit-core {:mvn/version "0.7.2"}
   nrepl/nrepl {:mvn/version "1.3.1"}
+  cider/cider-nrepl {:mvn/version "0.52.0"}
 
-  org.postgresql/postgresql {:mvn/version "42.7.6"}
-  org.xerial/sqlite-jdbc {:mvn/version "3.49.1.0"}
+  org.postgresql/postgresql {:mvn/version "42.7.5"}
+  org.xerial/sqlite-jdbc {:mvn/version "3.48.0.0"}
 
-  com.zaxxer/HikariCP {:mvn/version "6.3.0"}
+  com.zaxxer/HikariCP {:mvn/version "6.2.1"}
 
   io.whitfin/siphash {:mvn/version "2.0.0"}
 
@@ -50,7 +44,7 @@
 
   com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.0"}
 
-  org.jsoup/jsoup {:mvn/version "1.20.1"}
+  org.jsoup/jsoup {:mvn/version "1.18.3"}
   org.im4java/im4java
   {:git/tag "1.4.0-penpot-2"
    :git/sha "e2b3e16"
@@ -61,11 +55,11 @@
   org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
 
   dawran6/emoji {:mvn/version "0.1.5"}
-  markdown-clj/markdown-clj {:mvn/version "1.12.3"}
+  markdown-clj/markdown-clj {:mvn/version "1.12.2"}
 
   ;; Pretty Print specs
   pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.31.55"}}
+  software.amazon.awssdk/s3 {:mvn/version "2.28.26"}}
 
  :paths ["src" "resources" "target/classes"]
  :aliases
@@ -80,7 +74,7 @@
 
   :build
   {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.9" :git/sha "e405aac"}}
+   {io.github.clojure/tools.build {:git/tag "v0.10.6" :git/sha "52cf7d6"}}
    :ns-default build}
 
   :test

backend/package.json

@@ -4,7 +4,7 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c",
+  "packageManager": "yarn@4.8.1+sha512.bc946f2a022d7a1a38adfc15b36a66a3807a67629789496c3714dd1703d2e6c6b1c69ff9ec3b43141ac7a1dd853b7685638eb0074300386a59c18df351ef8ff6",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"

backend/resources/app/email/request-file-access/en.txt

@@ -13,7 +13,7 @@ This will automatically include {{requested-by|abbreviate:25}} in the team, so t
 
 Click the link below to provide team access:
 
-{{ public-uri }}/#/dashboard/members?team-id={{team-id}}&invite-email={{requested-by-email|urlescape}}
+{{ public-uri }}/#/dashboard/members?team-id{{team-id}}&invite-email={{requested-by-email|urlescape}}
 
 
 

backend/resources/app/onboarding.edn

@@ -1,7 +1,4 @@
-[{:id "tokens-starter-kit"
-  :name "Design tokens starter kit"
-  :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Tokens%20starter%20kit.penpot"},
- {:id "wireframing-kit"
+[{:id "wireframing-kit"
   :name "Wireframe library"
   :file-uri "https://github.com/penpot/penpot-files/raw/refs/heads/main/Wireframing%20kit%20v1.1.penpot"}
  {:id "prototype-examples"

backend/scripts/manage.py

@@ -71,27 +71,19 @@ def run_cmd(params):
         print("EXC:", str(cause))
         sys.exit(-2)
 
-def create_profile(fullname, email, password, skip_tutorial=False, skip_walkthrough=False):
-    props = {}
-    if skip_tutorial:
-        props["viewed-tutorial?"] = True
-    if skip_walkthrough:
-        props["viewed-walkthrough?"] = True
-
+def create_profile(fullname, email, password):
     params = {
         "cmd": "create-profile",
         "params": {
             "fullname": fullname,
             "email": email,
-            "password": password,
-            **props
+            "password": password
         }
     }
 
     res = run_cmd(params)
     print(f"Created: {res['email']} / {res['id']}")
 
-
 def update_profile(email, fullname, password, is_active):
     params = {
         "cmd": "update-profile",
@@ -178,8 +170,6 @@ parser.add_argument("-n", "--fullname", help="fullname", action="store")
 parser.add_argument("-e", "--email", help="email", action="store")
 parser.add_argument("-p", "--password", help="password", action="store")
 parser.add_argument("-c", "--connect", help="connect to PREPL", action="store", default="tcp://localhost:6063")
-parser.add_argument("--skip-tutorial", help="mark tutorial as viewed", action="store_true")
-parser.add_argument("--skip-walkthrough", help="mark walkthrough as viewed", action="store_true")
 
 args = parser.parse_args()
 

backend/scripts/repl

@@ -31,8 +31,8 @@ export PENPOT_FLAGS="\
        enable-tiered-file-data-storage \
        enable-file-validation \
        enable-file-schema-validation \
-       enable-subscriptions \
-       enable-subscriptions-old";
+       enable-subscriptons \
+       enable-subscriptons-old";
 
 # Default deletion delay for devenv
 export PENPOT_DELETION_DELAY="24h"
@@ -77,9 +77,8 @@ export JAVA_OPTS="\
        -Djdk.attach.allowAttachSelf \
        -Dlog4j2.configurationFile=log4j2-devenv-repl.xml \
        -Djdk.tracePinnedThreads=full \
-       -Dim4java.useV7=true \
        -XX:+EnableDynamicAgentLoading \
-       -XX:-OmitStackTraceInFastThrow  \
+       -XX:-OmitStackTraceInFastThrow                    \
        -XX:+UnlockDiagnosticVMOptions \
        -XX:+DebugNonSafepoints \
        --sun-misc-unsafe-memory-access=allow \
@@ -107,6 +106,9 @@ export OPTIONS="-A:jmx-remote -A:dev"
 # Setup GC
 # export OPTIONS="$OPTIONS -J-XX:+UseZGC"
 
+# Enable ImageMagick v7.x support
+# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
+
 export OPTIONS_EVAL="nil"
 # export OPTIONS_EVAL="(set! *warn-on-reflection* true)"
 

backend/scripts/run.template.sh

@@ -18,9 +18,9 @@ if [ -f ./environ ]; then
     source ./environ
 fi
 
-export JAVA_OPTS="-Dim4java.useV7=true -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow --sun-misc-unsafe-memory-access=allow --enable-native-access=ALL-UNNAMED --enable-preview $JVM_OPTS $JAVA_OPTS"
+export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow --enable-native-access=ALL-UNNAMED --enable-preview $JVM_OPTS"
 
 ENTRYPOINT=${1:-app.main};
 
 set -ex
-exec $JAVA_CMD $JAVA_OPTS -jar penpot.jar -m $ENTRYPOINT
+exec $JAVA_CMD $JVM_OPTS -jar penpot.jar -m $ENTRYPOINT

backend/scripts/start-dev

@@ -24,8 +24,8 @@ export PENPOT_FLAGS="\
        enable-tiered-file-data-storage \
        enable-file-validation \
        enable-file-schema-validation \
-       enable-subscriptions \
-       enable-subscriptions-old ";
+       enable-subscriptons \
+       enable-subscriptons-old ";
 
 # Default deletion delay for devenv
 export PENPOT_DELETION_DELAY="24h"
@@ -36,6 +36,9 @@ export PENPOT_MEDIA_MAX_FILE_SIZE=104857600
 # Setup default multipart upload size to 300MiB
 export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
 
+# Enable ImageMagick v7.x support
+# export OPTIONS="-J-Dim4java.useV7=true $OPTIONS";
+
 # Initialize MINIO config
 mc alias set penpot-s3/ http://minio:9000 minioadmin minioadmin -q
 mc admin user add penpot-s3 penpot-devenv penpot-devenv -q
@@ -58,8 +61,10 @@ export JAVA_OPTS="\
        -Djdk.attach.allowAttachSelf \
        -Dlog4j2.configurationFile=log4j2-devenv.xml \
        -Djdk.tracePinnedThreads=full \
-       -Dim4java.useV7=true \
-       -XX:-OmitStackTraceInFastThrow  \
+       -XX:+EnableDynamicAgentLoading \
+       -XX:-OmitStackTraceInFastThrow                    \
+       -XX:+UnlockDiagnosticVMOptions \
+       -XX:+DebugNonSafepoints \
        --sun-misc-unsafe-memory-access=allow \
        --enable-preview \
        --enable-native-access=ALL-UNNAMED";

backend/src/app/binfile/cleaner.clj

@@ -16,40 +16,16 @@
 ;; PRE DECODE
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn- pre-clean-bool-content
-  [shape]
-  (if-let [content (get shape :bool-content)]
-    (-> shape
-        (assoc :content content)
-        (dissoc :bool-content))
-    shape))
-
-(defn- pre-clean-shadow-color
-  [shape]
-  (d/update-when shape :shadow
-                 (fn [shadows]
-                   (mapv (fn [shadow]
-                           (update shadow :color
-                                   (fn [color]
-                                     (let [ref-id   (get color :id)
-                                           ref-file (get color :file-id)]
-                                       (-> (d/without-qualified color)
-                                           (select-keys [:opacity :color :gradient :image :ref-id :ref-file])
-                                           (cond-> ref-id
-                                             (assoc :ref-id ref-id))
-                                           (cond-> ref-file
-                                             (assoc :ref-file ref-file)))))))
-                         shadows))))
-
 (defn clean-shape-pre-decode
   "Applies a pre-decode phase migration to the shape"
   [shape]
-  (cond-> shape
-    (= "bool" (:type shape))
-    (pre-clean-bool-content)
-
-    (contains? shape :shadow)
-    (pre-clean-shadow-color)))
+  (if (= "bool" (:type shape))
+    (if-let [content (get shape :bool-content)]
+      (-> shape
+          (assoc :content content)
+          (dissoc :bool-content))
+      shape)
+    shape))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; POST DECODE

backend/src/app/binfile/common.clj

@@ -53,7 +53,6 @@
   (* 1024 1024 100))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(declare get-resolved-file-libraries)
 
 (def file-attrs
   #{:id
@@ -144,13 +143,11 @@
    (reduce #(index-object %1 %2 attr) index coll)))
 
 (defn decode-row
-  [{:keys [data changes features] :as row}]
-  (when row
-    (cond-> row
-      features (assoc :features (db/decode-pgarray features #{}))
-      changes  (assoc :changes (blob/decode changes))
-      data     (assoc :data (blob/decode data)))))
-
+  "A generic decode row helper"
+  [{:keys [data features] :as row}]
+  (cond-> row
+    features (assoc :features (db/decode-pgarray features #{}))
+    data     (assoc :data (blob/decode data))))
 
 (defn decode-file
   "A general purpose file decoding function that resolves all external
@@ -159,8 +156,7 @@
   (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)]
     (let [file (->> file
                     (feat.fmigr/resolve-applied-migrations cfg)
-                    (feat.fdata/resolve-file-data cfg))
-          libs (delay (get-resolved-file-libraries cfg file))]
+                    (feat.fdata/resolve-file-data cfg))]
 
       (-> file
           (update :features db/decode-pgarray #{})
@@ -168,7 +164,7 @@
           (update :data feat.fdata/process-pointers deref)
           (update :data feat.fdata/process-objects (partial into {}))
           (update :data assoc :id id)
-          (fmg/migrate-file libs)))))
+          (fmg/migrate-file)))))
 
 (defn get-file
   "Get file, resolve all features and apply migrations.
@@ -422,27 +418,26 @@
     (db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"])))
 
 (defn process-file
-  [cfg {:keys [id] :as file}]
-  (let [libs (delay (get-resolved-file-libraries cfg file))]
-    (-> file
-        (update :data (fn [fdata]
-                        (-> fdata
-                            (assoc :id id)
-                            (dissoc :recent-colors))))
-        (update :data (fn [fdata]
-                        (-> fdata
-                            (update :pages-index relink-shapes)
-                            (update :components relink-shapes)
-                            (update :media relink-media)
-                            (update :colors relink-colors)
-                            (d/without-nils))))
-        (fmg/migrate-file libs)
+  [{:keys [id] :as file}]
+  (-> file
+      (update :data (fn [fdata]
+                      (-> fdata
+                          (assoc :id id)
+                          (dissoc :recent-colors))))
+      (fmg/migrate-file)
+      (update :data (fn [fdata]
+                      (-> fdata
+                          (update :pages-index relink-shapes)
+                          (update :components relink-shapes)
+                          (update :media relink-media)
+                          (update :colors relink-colors)
+                          (d/without-nils))))
 
-        ;; NOTE: this is necessary because when we just creating a new
-        ;; file from imported artifact or cloned file there are no
-        ;; migrations registered on the database, so we need to persist
-        ;; all of them, not only the applied
-        (vary-meta dissoc ::fmg/migrated))))
+      ;; NOTE: this is necessary because when we just creating a new
+      ;; file from imported artifact or cloned file there are no
+      ;; migrations registered on the database, so we need to persist
+      ;; all of them, not only the applied
+      (vary-meta dissoc ::fmg/migrated)))
 
 (defn encode-file
   [{:keys [::db/conn] :as cfg} {:keys [id features] :as file}]
@@ -533,49 +528,3 @@
           (l/error :hint "file schema validation error" :cause result))))
 
     (insert-file! cfg file opts)))
-
-
-(def ^:private sql:get-file-libraries
-  "WITH RECURSIVE libs AS (
-     SELECT fl.*, flr.synced_at
-       FROM file AS fl
-       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
-      WHERE flr.file_id = ?::uuid
-    UNION
-     SELECT fl.*, flr.synced_at
-       FROM file AS fl
-       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
-       JOIN libs AS l ON (flr.file_id = l.id)
-   )
-   SELECT l.id,
-          l.features,
-          l.project_id,
-          p.team_id,
-          l.created_at,
-          l.modified_at,
-          l.deleted_at,
-          l.name,
-          l.revn,
-          l.vern,
-          l.synced_at,
-          l.is_shared
-     FROM libs AS l
-    INNER JOIN project AS p ON (p.id = l.project_id)
-    WHERE l.deleted_at IS NULL OR l.deleted_at > now();")
-
-(defn get-file-libraries
-  [conn file-id]
-  (into []
-        (comp
-         ;; FIXME: :is-indirect set to false to all rows looks
-         ;; completly useless
-         (map #(assoc % :is-indirect false))
-         (map decode-row))
-        (db/exec! conn [sql:get-file-libraries file-id])))
-
-(defn get-resolved-file-libraries
-  "A helper for preload file libraries"
-  [{:keys [::db/conn] :as cfg} file]
-  (->> (get-file-libraries conn (:id file))
-       (into [file] (map #(get-file cfg (:id %))))
-       (d/index-by :id)))

backend/src/app/binfile/migrations.clj

@@ -10,6 +10,7 @@
    [app.binfile.common :as bfc]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
+   [app.features.components-v2 :as feat.compv2]
    [clojure.set :as set]
    [cuerdas.core :as str]))
 
@@ -27,11 +28,13 @@
 
 (defn apply-pending-migrations!
   "Apply alredy registered pending migrations to files"
-  [_cfg]
-  (doseq [[feature _file-id] (-> bfc/*state* deref :pending-to-migrate)]
+  [cfg]
+  (doseq [[feature file-id] (-> bfc/*state* deref :pending-to-migrate)]
     (case feature
       "components/v2"
-      nil
+      (feat.compv2/migrate-file! cfg file-id
+                                 :validate? (::validate cfg true)
+                                 :skip-on-graphic-error? true)
 
       "fdata/shape-data-type"
       nil

backend/src/app/binfile/v1.clj

@@ -551,8 +551,8 @@
                      (cond-> (and (= idx 0) (some? name))
                        (assoc :name name))
                      (assoc :project-id project-id)
-                     (dissoc :thumbnails))
-            file  (bfc/process-file system file)]
+                     (dissoc :thumbnails)
+                     (bfc/process-file))]
 
         ;; All features that are enabled and requires explicit migration are
         ;; added to the state for a posterior migration step.

backend/src/app/binfile/v2.clj

@@ -281,8 +281,8 @@
 
   (let [file (-> (read-obj cfg :file file-id)
                  (update :id bfc/lookup-index)
-                 (update :project-id bfc/lookup-index))
-        file (bfc/process-file cfg file)]
+                 (update :project-id bfc/lookup-index)
+                 (bfc/process-file))]
 
     (events/tap :progress
                 {:op :import

backend/src/app/binfile/v3.clj

@@ -12,12 +12,12 @@
    [app.binfile.common :as bfc]
    [app.binfile.migrations :as bfm]
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
    [app.common.files.migrations :as-alias fmg]
    [app.common.json :as json]
    [app.common.logging :as l]
-   [app.common.media :as cmedia]
    [app.common.schema :as sm]
    [app.common.thumbnails :as cth]
    [app.common.types.color :as ctcl]
@@ -53,7 +53,7 @@
   [:map {:title "Manifest"}
    [:version ::sm/int]
    [:type :string]
-   [:referer {:optional true} :string]
+
    [:generated-by {:optional true} :string]
 
    [:files
@@ -73,7 +73,7 @@
    [:size ::sm/int]
    [:content-type :string]
    [:bucket [::sm/one-of {:format :string} sto/valid-buckets]]
-   [:hash {:optional true} :string]])
+   [:hash :string]])
 
 (def ^:private schema:file-thumbnail
   [:map {:title "FileThumbnail"}
@@ -88,19 +88,13 @@
    ctf/schema:file
    [:map [:options {:optional true} ctf/schema:options]]])
 
-;; --- HELPERS
-
-(defn- default-now
-  [o]
-  (or o (dt/now)))
-
 ;; --- ENCODERS
 
 (def encode-file
   (sm/encoder schema:file sm/json-transformer))
 
 (def encode-page
-  (sm/encoder ctp/schema:page sm/json-transformer))
+  (sm/encoder ::ctp/page sm/json-transformer))
 
 (def encode-shape
   (sm/encoder ::cts/shape sm/json-transformer))
@@ -112,7 +106,7 @@
   (sm/encoder ::ctc/component sm/json-transformer))
 
 (def encode-color
-  (sm/encoder ctcl/schema:library-color sm/json-transformer))
+  (sm/encoder ::ctcl/color sm/json-transformer))
 
 (def encode-typography
   (sm/encoder ::cty/typography sm/json-transformer))
@@ -135,13 +129,13 @@
   (sm/decoder schema:manifest sm/json-transformer))
 
 (def decode-media
-  (sm/decoder ctf/schema:media sm/json-transformer))
+  (sm/decoder ::ctf/media sm/json-transformer))
 
 (def decode-component
   (sm/decoder ::ctc/component sm/json-transformer))
 
 (def decode-color
-  (sm/decoder ctcl/schema:library-color sm/json-transformer))
+  (sm/decoder ::ctcl/color sm/json-transformer))
 
 (def decode-file
   (sm/decoder schema:file sm/json-transformer))
@@ -156,7 +150,7 @@
   (sm/decoder ::cty/typography sm/json-transformer))
 
 (def decode-tokens-lib
-  (sm/decoder cto/schema:tokens-lib sm/json-transformer))
+  (sm/decoder ::cto/tokens-lib sm/json-transformer))
 
 (def decode-plugin-data
   (sm/decoder ::ctpg/plugin-data sm/json-transformer))
@@ -185,7 +179,7 @@
   (sm/check-fn ::ctf/media))
 
 (def validate-color
-  (sm/check-fn ctcl/schema:library-color))
+  (sm/check-fn ::ctcl/color))
 
 (def validate-component
   (sm/check-fn ::ctc/component))
@@ -235,13 +229,27 @@
                         :always
                         (bfc/clean-file-features))))))
 
+(defn- resolve-extension
+  [mtype]
+  (case mtype
+    "image/png"     ".png"
+    "image/jpeg"    ".jpg"
+    "image/gif"     ".gif"
+    "image/svg+xml" ".svg"
+    "image/webp"    ".webp"
+    "font/woff"     ".woff"
+    "font/woff2"    ".woff2"
+    "font/ttf"      ".ttf"
+    "font/otf"      ".otf"
+    "application/octet-stream" ".bin"))
+
 (defn- export-storage-objects
   [{:keys [::output] :as cfg}]
   (let [storage (sto/resolve cfg)]
     (doseq [id (-> bfc/*state* deref :storage-objects not-empty)]
       (let [sobject (sto/get-object storage id)
             smeta   (meta sobject)
-            ext     (cmedia/mtype->extension (:content-type smeta))
+            ext     (resolve-extension (:content-type smeta))
             path    (str "objects/" id ".json")
             params  (-> (meta sobject)
                         (assoc :id (:id sobject))
@@ -372,7 +380,6 @@
           params {:type "penpot/export-files"
                   :version 1
                   :generated-by (str "penpot/" (:full cf/version))
-                  :refer "penpot"
                   :files (vec (vals files))
                   :relations rels}]
       (write-entry! output "manifest.json" params))))
@@ -567,13 +574,7 @@
                  (let [object (->> (read-entry input entry)
                                    (decode-media)
                                    (validate-media))
-                       object (-> object
-                                  (assoc :file-id file-id)
-                                  (update :created-at default-now)
-                                  ;; FIXME: this is set default to true for
-                                  ;; setting a value, this prop is no longer
-                                  ;; relevant;
-                                  (assoc :is-local true))]
+                       object (assoc object :file-id file-id)]
                    (if (= id (:id object))
                      (conj result object)
                      result)))
@@ -617,7 +618,8 @@
                    (let [object (->> (read-entry input entry)
                                      (clean-component-pre-decode)
                                      (decode-component)
-                                     (clean-component-post-decode))]
+                                     (clean-component-post-decode)
+                                     (validate-component))]
                      (if (= id (:id object))
                        (assoc result id object)
                        result)))
@@ -651,7 +653,8 @@
                  (let [object (->> (read-entry input entry)
                                    (bfl/clean-shape-pre-decode)
                                    (decode-shape)
-                                   (bfl/clean-shape-post-decode))]
+                                   (bfl/clean-shape-post-decode)
+                                   (validate-shape))]
                    (if (= id (:id object))
                      (assoc result id object)
                      result)))
@@ -697,6 +700,7 @@
         components   (read-file-components cfg)
         plugin-data  (read-file-plugin-data cfg)
         pages        (read-file-pages cfg)]
+
     {:pages (-> pages keys vec)
      :pages-index (into {} pages)
      :colors colors
@@ -751,10 +755,8 @@
                    (assoc :data data)
                    (assoc :name file-name)
                    (assoc :project-id project-id)
-                   (dissoc :options))
-
-          file  (bfc/process-file cfg file)
-          file  (ctf/check-file file)]
+                   (dissoc :options)
+                   (bfc/process-file))]
 
       (bfm/register-pending-migrations! cfg file)
       (bfc/save-file! cfg file ::db/return-keys false)
@@ -798,7 +800,7 @@
                     :expected-id (str id)
                     :found-id (str (:id object))))
 
-        (let [ext     (cmedia/mtype->extension (:content-type object))
+        (let [ext     (resolve-extension (:content-type object))
               path    (str "objects/" id ext)
               content (->> path
                            (get-zip-entry input)
@@ -812,14 +814,13 @@
                       :expected-size (:size object)
                       :found-size (sto/get-size content)))
 
-          (when-let [hash (get object :hash)]
-            (when (not= hash (sto/get-hash content))
-              (ex/raise :type :validation
-                        :code :inconsistent-penpot-file
-                        :hint "found corrupted storage object: hash does not match"
-                        :path path
-                        :expected-hash (:hash object)
-                        :found-hash (sto/get-hash content))))
+          (when (not= (:hash object) (sto/get-hash content))
+            (ex/raise :type :validation
+                      :code :inconsistent-penpot-file
+                      :hint "found corrupted storage object: hash does not match"
+                      :path path
+                      :expected-hash (:hash object)
+                      :found-hash (sto/get-hash content)))
 
           (let [params  (-> object
                             (dissoc :id :size)
@@ -878,8 +879,13 @@
 (defn- import-files
   [{:keys [::bfc/timestamp ::bfc/input ::bfc/name] :or {timestamp (dt/now)} :as cfg}]
 
-  (assert (instance? ZipFile input) "expected zip file")
-  (assert (dt/instant? timestamp) "expected valid instant")
+  (dm/assert!
+   "expected zip file"
+   (instance? ZipFile input))
+
+  (dm/assert!
+   "expected valid instant"
+   (dt/instant? timestamp))
 
   (let [manifest (-> (read-manifest input)
                      (validate-manifest))
@@ -891,7 +897,6 @@
                 :hint "unexpected type on manifest"
                 :manifest manifest))
 
-
     ;; Check if all files referenced on manifest are present
     (doseq [{file-id :id features :features} (:files manifest)]
       (let [path (str "files/" file-id ".json")]
@@ -952,13 +957,14 @@
 
   [{:keys [::bfc/ids] :as cfg} output]
 
-  (assert
-   (and (set? ids) (every? uuid? ids))
-   "expected a set of uuid's for `::bfc/ids` parameter")
+  (dm/assert!
+   "expected a set of uuid's for `::bfc/ids` parameter"
+   (and (set? ids)
+        (every? uuid? ids)))
 
-  (assert
-   (satisfies? jio/IOFactory output)
-   "expected instance of jio/IOFactory for `input`")
+  (dm/assert!
+   "expected instance of jio/IOFactory for `input`"
+   (satisfies? jio/IOFactory output))
 
   (let [id (uuid/next)
         tp (dt/tpoint)
@@ -997,14 +1003,14 @@
 (defn import-files!
   [{:keys [::bfc/input] :as cfg}]
 
-  (assert
+  (dm/assert!
+   "expected valid profile-id and project-id on `cfg`"
    (and (uuid? (::bfc/profile-id cfg))
-        (uuid? (::bfc/project-id cfg)))
-   "expected valid profile-id and project-id on `cfg`")
+        (uuid? (::bfc/project-id cfg))))
 
-  (assert
-   (io/coercible? input)
-   "expected instance of jio/IOFactory for `input`")
+  (dm/assert!
+   "expected instance of jio/IOFactory for `input`"
+   (io/coercible? input))
 
   (let [id (uuid/next)
         tp (dt/tpoint)
@@ -1024,9 +1030,3 @@
                 :id (str id)
                 :elapsed (dt/format-duration (tp))
                 :error? (some? @cs))))))
-
-(defn get-manifest
-  [path]
-  (with-open [input (ZipFile. (fs/file path))]
-    (-> (read-manifest input)
-        (validate-manifest))))

backend/src/app/features/logical_deletion.clj

@@ -1,31 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.features.logical-deletion
-  "A code related to handle logical deletion mechanism"
-  (:require
-   [app.config :as cf]
-   [app.util.time :as dt]))
-
-(defn get-deletion-delay
-  "Calculate the next deleted-at for a resource (file, team, etc) in function
-  of team settings"
-  [team]
-  (if-let [subscription (get team :subscription)]
-    (cond
-      (and (= (:type subscription) "unlimited")
-           (= (:status subscription) "active"))
-      (dt/duration {:days 30})
-
-      (and (= (:type subscription) "enterprise")
-           (= (:status subscription) "active"))
-      (dt/duration {:days 90})
-
-      :else
-      (cf/get-deletion-delay))
-
-    (cf/get-deletion-delay)))
-

backend/src/app/http/sse.clj

@@ -9,6 +9,7 @@
   (:refer-clojure :exclude [tap])
   (:require
    [app.common.data :as d]
+   [app.common.exceptions :as ex]
    [app.common.logging :as l]
    [app.common.transit :as t]
    [app.http.errors :as errors]
@@ -53,20 +54,18 @@
      ::yres/status 200
      ::yres/body (yres/stream-body
                   (fn [_ output]
-                    (let [channel  (sp/chan :buf buf :xf (keep encode))
-                          listener (events/start-listener
-                                    channel
-                                    (partial write! output)
-                                    (partial pu/close! output))]
-                      (try
-                        (binding [events/*channel* channel]
+                    (binding [events/*channel* (sp/chan :buf buf :xf (keep encode))]
+                      (let [listener (events/start-listener
+                                      (partial write! output)
+                                      (partial pu/close! output))]
+                        (try
                           (let [result (handler)]
-                            (events/tap :end result)))
-
-                        (catch Throwable cause
-                          (let [result (errors/handle' cause request)]
-                            (events/tap channel :error result)))
-
-                        (finally
-                          (sp/close! channel)
-                          (px/await! listener))))))}))
+                            (events/tap :end result))
+                          (catch Throwable cause
+                            (events/tap :error (errors/handle' cause request))
+                            (when-not (ex/instance? java.io.EOFException cause)
+                              (binding [l/*context* (errors/request->context request)]
+                                (l/err :hint "unexpected error on processing sse response" :cause cause))))
+                          (finally
+                            (sp/close! events/*channel*)
+                            (px/await! listener)))))))}))

backend/src/app/loggers/database.clj

@@ -41,7 +41,7 @@
   (if (or (instance? java.util.concurrent.CompletionException cause)
           (instance? java.util.concurrent.ExecutionException cause))
     (-> record
-        (assoc ::trace (ex/format-throwable cause :data? true :explain? false :header? false :summary? false))
+        (assoc ::trace (ex/format-throwable cause :data? false :explain? false :header? false :summary? false))
         (assoc ::l/cause (ex-cause cause))
         (record->report))
 
@@ -64,18 +64,18 @@
                          message))
                      @message)
         :trace   (or (::trace record)
-                     (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
+                     (some-> cause (ex/format-throwable :data? false :explain? false :header? false :summary? false)))}
 
        (when-let [params (or (:request/params context) (:params context))]
-         {:params (pp/pprint-str params :length 20 :level 20)})
+         {:params (pp/pprint-str params :length 30 :level 13)})
 
        (when-let [value (:value context)]
-         {:value (pp/pprint-str value :length 30 :level 13)})
+         {:value (pp/pprint-str value :length 30 :level 12)})
 
        (when-let [data (some-> data (dissoc ::s/problems ::s/value ::s/spec ::sm/explain :hint))]
-         {:data (pp/pprint-str data :length 30 :level 13)})
+         {:data (pp/pprint-str data :length 30 :level 12)})
 
-       (when-let [explain (ex/explain data :length 30 :level 13)]
+       (when-let [explain (ex/explain data :length 30 :level 12)]
          {:explain explain})))))
 
 (defn error-record?

backend/src/app/main.clj

@@ -40,6 +40,7 @@
    [app.svgo :as-alias svgo]
    [app.util.time :as dt]
    [app.worker :as-alias wrk]
+   [cider.nrepl :refer [cider-nrepl-handler]]
    [clojure.test :as test]
    [clojure.tools.namespace.repl :as repl]
    [cuerdas.core :as str]
@@ -604,7 +605,7 @@
     (let [p (promise)]
       (when (contains? cf/flags :nrepl-server)
         (l/inf :hint "start nrepl server" :port 6064)
-        (nrepl/start-server :bind "0.0.0.0" :port 6064))
+        (nrepl/start-server :bind "0.0.0.0" :port 6064 :handler cider-nrepl-handler))
 
       (start)
       (deref p))

backend/src/app/media.clj

@@ -8,12 +8,12 @@
   "Media & Font postprocessing."
   (:require
    [app.common.data :as d]
-   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
-   [app.common.logging :as l]
    [app.common.media :as cm]
    [app.common.schema :as sm]
    [app.common.schema.openapi :as-alias oapi]
+   [app.common.spec :as us]
+   [app.common.svg :as csvg]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.storage :as-alias sto]
@@ -22,42 +22,42 @@
    [buddy.core.bytes :as bb]
    [buddy.core.codecs :as bc]
    [clojure.java.shell :as sh]
-   [clojure.string]
-   [clojure.xml :as xml]
+   [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
    [datoteka.fs :as fs]
    [datoteka.io :as io])
   (:import
-   clojure.lang.XMLHandler
-   java.io.InputStream
-   javax.xml.XMLConstants
-   javax.xml.parsers.SAXParserFactory
-   org.apache.commons.io.IOUtils
    org.im4java.core.ConvertCmd
    org.im4java.core.IMOperation
    org.im4java.core.Info))
 
-(def schema:upload
-  (sm/register!
-   ^{::sm/type ::upload}
-   [:map {:title "Upload"}
-    [:filename :string]
-    [:size ::sm/int]
-    [:path ::fs/path]
-    [:mtype {:optional true} :string]
-    [:headers {:optional true}
-     [:map-of :string :string]]]))
+(s/def ::path fs/path?)
+(s/def ::filename string?)
+(s/def ::size integer?)
+(s/def ::headers (s/map-of string? string?))
+(s/def ::mtype string?)
 
-(def ^:private schema:input
-  [:map {:title "Input"}
-   [:path ::fs/path]
-   [:mtype {:optional true} ::sm/text]])
+(s/def ::upload
+  (s/keys :req-un [::filename ::size ::path]
+          :opt-un [::mtype ::headers]))
 
-(def ^:private check-input
-  (sm/check-fn schema:input))
+;; A subset of fields from the ::upload spec
+(s/def ::input
+  (s/keys :req-un [::path]
+          :opt-un [::mtype]))
+
+(sm/register!
+ ^{::sm/type ::upload}
+ [:map {:title "Upload"}
+  [:filename :string]
+  [:size ::sm/int]
+  [:path ::fs/path]
+  [:mtype {:optional true} :string]
+  [:headers {:optional true}
+   [:map-of :string :string]]])
 
 (defn validate-media-type!
-  ([upload] (validate-media-type! upload cm/image-types))
+  ([upload] (validate-media-type! upload cm/valid-image-types))
   ([upload allowed]
    (when-not (contains? allowed (:mtype upload))
      (ex/raise :type :validation
@@ -97,44 +97,17 @@
     (catch Throwable e
       (process-error e))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SVG PARSING
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- secure-parser-factory
-  [^InputStream input ^XMLHandler handler]
-  (.. (doto (SAXParserFactory/newInstance)
-        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
-        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
-      (newSAXParser)
-      (parse input handler)))
-
-(defn- strip-doctype
-  [data]
-  (cond-> data
-    (str/includes? data "<!DOCTYPE")
-    (str/replace #"<\!DOCTYPE[^>]*>" "")))
-
-(defn- parse-svg
-  [text]
-  (let [text (strip-doctype text)]
-    (dm/with-open [istream (IOUtils/toInputStream text "UTF-8")]
-      (xml/parse istream secure-parser-factory))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; IMAGE THUMBNAILS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private schema:thumbnail-params
-  [:map {:title "ThumbnailParams"}
-   [:input schema:input]
-   [:format [:enum :jpeg :webp :png]]
-   [:quality [:int {:min 1 :max 100}]]
-   [:width :int]
-   [:height :int]])
+(s/def ::width integer?)
+(s/def ::height integer?)
+(s/def ::format #{:jpeg :webp :png})
+(s/def ::quality #(< 0 % 101))
 
-(def ^:private check-thumbnail-params
-  (sm/check-fn schema:thumbnail-params))
+(s/def ::thumbnail-params
+  (s/keys :req-un [::input ::format ::width ::height]))
 
 ;; Related info on how thumbnails generation
 ;;  http://www.imagemagick.org/Usage/thumbnails/
@@ -156,38 +129,30 @@
            :data   tmp)))
 
 (defmethod process :generic-thumbnail
-  [params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)
-
-        operation
-        (doto (IMOperation.)
-          (.addImage)
-          (.autoOrient)
-          (.strip)
-          (.thumbnail ^Integer (int width) ^Integer (int height) ">")
-          (.quality (double quality))
-          (.addImage))]
-
-    (generic-process (assoc params :operation operation))))
+  [{:keys [quality width height] :as params}]
+  (us/assert ::thumbnail-params params)
+  (let [op (doto (IMOperation.)
+             (.addImage)
+             (.autoOrient)
+             (.strip)
+             (.thumbnail ^Integer (int width) ^Integer (int height) ">")
+             (.quality (double quality))
+             (.addImage))]
+    (generic-process (assoc params :operation op))))
 
 (defmethod process :profile-thumbnail
-  [params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)
-
-        operation
-        (doto (IMOperation.)
-          (.addImage)
-          (.autoOrient)
-          (.strip)
-          (.thumbnail ^Integer (int width) ^Integer (int height) "^")
-          (.gravity "center")
-          (.extent (int width) (int height))
-          (.quality (double quality))
-          (.addImage))]
-
-    (generic-process (assoc params :operation operation))))
+  [{:keys [quality width height] :as params}]
+  (us/assert ::thumbnail-params params)
+  (let [op (doto (IMOperation.)
+             (.addImage)
+             (.autoOrient)
+             (.strip)
+             (.thumbnail ^Integer (int width) ^Integer (int height) "^")
+             (.gravity "center")
+             (.extent (int width) (int height))
+             (.quality (double quality))
+             (.addImage))]
+    (generic-process (assoc params :operation op))))
 
 (defn get-basic-info-from-svg
   [{:keys [tag attrs] :as data}]
@@ -217,28 +182,12 @@
                  {:width (int width)
                   :height (int height)})))]))
 
-(defn- get-dimensions-with-orientation [^String path]
-  ;; Image magick doesn't give info about exif rotation so we use the identify command
-  ;; If we are processing an animated gif we use the first frame with -scene 0
-  (let [dim-result (sh/sh "identify" "-format" "%w %h\n" path)
-        orient-result (sh/sh "identify" "-format" "%[EXIF:Orientation]\n" path)]
-    (if (and (= 0 (:exit dim-result))
-             (= 0 (:exit orient-result)))
-      (let [[w h] (-> (:out dim-result)
-                      str/trim
-                      (clojure.string/split #"\s+")
-                      (->> (mapv #(Integer/parseInt %))))
-            orientation (-> orient-result :out str/trim)]
-        (case orientation
-          ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
-          {:width w :height h}))         ; Normal or unknown orientation
-      nil)))
-
 (defmethod process :info
   [{:keys [input] :as params}]
-  (let [{:keys [path mtype] :as input} (check-input input)]
+  (us/assert ::input input)
+  (let [{:keys [path mtype]} input]
     (if (= mtype "image/svg+xml")
-      (let [info (some-> path slurp parse-svg get-basic-info-from-svg)]
+      (let [info (some-> path slurp csvg/parse get-basic-info-from-svg)]
         (when-not info
           (ex/raise :type :validation
                     :code :invalid-svg-file
@@ -253,17 +202,13 @@
                     :code :media-type-mismatch
                     :hint (str "Seems like you are uploading a file whose content does not match the extension."
                                "Expected: " mtype ". Got: " mtype')))
-        (let [{:keys [width height]}
-              (or (get-dimensions-with-orientation (str path))
-                  (do
-                    (l/warn "Failed to read image dimensions with orientation; falling back to im4java"
-                            {:path path})
-                    {:width  (.getPageWidth instance)
-                     :height (.getPageHeight instance)}))]
-          (assoc input
-                 :width  width
-                 :height height
-                 :ts (dt/now)))))))
+        ;; For an animated GIF, getImageWidth/Height returns the delta size of one frame (if no frame given
+        ;; it returns size of the last one), whereas getPageWidth/Height always return the full size of
+        ;; any frame.
+        (assoc input
+               :width  (.getPageWidth instance)
+               :height (.getPageHeight instance)
+               :ts (dt/now))))))
 
 (defmethod process-error org.im4java.core.InfoException
   [error]

backend/src/app/rpc/commands/audit.clj

@@ -92,9 +92,9 @@
      [:string {:max 250}]
      [::sm/one-of {:format "string"} valid-event-types]]]
    [:props
-    [:map-of :keyword ::sm/any]]
+    [:map-of :keyword :any]]
    [:context {:optional true}
-    [:map-of :keyword ::sm/any]]])
+    [:map-of :keyword :any]]])
 
 (def schema:push-audit-events
   [:map {:title "push-audit-events"}

backend/src/app/rpc/commands/auth.clj

@@ -231,14 +231,13 @@
               :hint "email has complaint reports")))
 
 (defn prepare-register
-  [{:keys [::db/pool] :as cfg} {:keys [fullname email accept-newsletter-updates] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [email accept-newsletter-updates] :as params}]
 
   (validate-register-attempt! cfg params)
 
   (let [email   (profile/clean-email email)
         profile (profile/get-profile-by-email pool email)
         params  {:email email
-                 :fullname fullname
                  :password (:password params)
                  :invitation-token (:invitation-token params)
                  :backend "penpot"
@@ -255,10 +254,8 @@
 
 (def schema:prepare-register-profile
   [:map {:title "prepare-register-profile"}
-   [:fullname ::sm/text]
    [:email ::sm/email]
    [:password schema:password]
-   [:create-welcome-file {:optional true} :boolean]
    [:invitation-token {:optional true} schema:token]])
 
 (sv/defmethod ::prepare-register-profile
@@ -362,9 +359,13 @@
                 :extra-data ptoken})))
 
 (defn register-profile
-  [{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token] :as params}]
-  (let [claims     (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
-        params     (into claims params)
+  [{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token fullname theme] :as params}]
+  (let [theme      (when (= theme "light") theme)
+        claims     (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
+        params     (-> claims
+                       (into params)
+                       (assoc :fullname fullname)
+                       (assoc :theme theme))
 
         profile    (if-let [profile-id (:profile-id claims)]
                      (profile/get-profile conn profile-id)
@@ -478,7 +479,10 @@
 
 (def schema:register-profile
   [:map {:title "register-profile"}
-   [:token schema:token]])
+   [:token schema:token]
+   [:fullname [::sm/word-string {:max 100}]]
+   [:theme {:optional true} [:string {:max 10}]]
+   [:create-welcome-file {:optional true} :boolean]])
 
 (sv/defmethod ::register-profile
   {::rpc/auth false

backend/src/app/rpc/commands/binfile.clj

@@ -115,8 +115,7 @@
 
     (db/update! pool :project
                 {:modified-at (dt/now)}
-                {:id project-id}
-                {::db/return-keys false})
+                {:id project-id})
 
     result))
 
@@ -134,18 +133,11 @@
    ::webhooks/event? true
    ::sse/stream? true
    ::sm/params schema:import-binfile}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version file] :as params}]
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id project-id version] :as params}]
   (projects/check-edition-permissions! pool profile-id project-id)
-  (let [version  (or version 1)
-        params   (-> params
-                     (assoc :profile-id profile-id)
-                     (assoc :version version))
-        manifest (case (int version)
-                   1 nil
-                   3 (bf.v3/get-manifest (:path file)))]
-
+  (let [params (-> params
+                   (assoc :profile-id profile-id)
+                   (assoc :version (or version 1)))]
     (with-meta
       (sse/response (partial import-binfile cfg params))
-      {::audit/props {:file nil
-                      :generated-by (:generated-by manifest)
-                      :referer (:referer manifest)}})))
+      {::audit/props {:file nil}})))

backend/src/app/rpc/commands/files.clj

@@ -6,7 +6,6 @@
 
 (ns app.rpc.commands.files
   (:require
-   [app.binfile.common :as bfc]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
@@ -24,7 +23,6 @@
    [app.db.sql :as-alias sql]
    [app.features.fdata :as feat.fdata]
    [app.features.file-migrations :as feat.fmigr]
-   [app.features.logical-deletion :as ldel]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
    [app.rpc :as-alias rpc]
@@ -191,7 +189,7 @@
    [:is-shared ::sm/boolean]
    [:project-id ::sm/uuid]
    [:created-at ::dt/instant]
-   [:data {:optional true} ::sm/any]])
+   [:data {:optional true} :any]])
 
 (def schema:permissions-mixin
   [:map {:title "PermissionsMixin"}
@@ -213,8 +211,7 @@
   [{:keys [::db/conn] :as cfg} {:keys [id] :as file} {:keys [read-only?]}]
   (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)
             pmap/*tracked* (pmap/create-tracked)]
-    (let [libs (delay (bfc/get-resolved-file-libraries cfg file))
-          ;; For avoid unnecesary overhead of creating multiple pointers and
+    (let [;; For avoid unnecesary overhead of creating multiple pointers and
           ;; handly internally with objects map in their worst case (when
           ;; probably all shapes and all pointers will be readed in any
           ;; case), we just realize/resolve them before applying the
@@ -222,7 +219,7 @@
           file (-> file
                    (update :data feat.fdata/process-pointers deref)
                    (update :data feat.fdata/process-objects (partial into {}))
-                   (fmg/migrate-file libs))]
+                   (fmg/migrate-file))]
 
       (if (or read-only? (db/read-only? conn))
         file
@@ -559,10 +556,7 @@
           f.project_id,
           f.created_at,
           f.modified_at,
-          f.data_backend,
-          f.data_ref_id,
           f.name,
-          f.version,
           f.is_shared,
           ft.media_id,
           p.team_id
@@ -598,11 +592,7 @@
   (teams/check-read-permissions! conn profile-id team-id)
   (->> (db/exec! conn [sql:team-shared-files team-id])
        (into #{} (comp
-                  ;; NOTE: this decode operation is a workaround for a
-                  ;; fast fix, this should be approached with a more
-                  ;; efficient implementation, for now it loads all
-                  ;; the files in memory.
-                  (map (partial bfc/decode-file cfg))
+                  (map decode-row)
                   (map (fn [row]
                          (if-let [media-id (:media-id row)]
                            (-> row
@@ -625,6 +615,44 @@
 
 ;; --- COMMAND QUERY: get-file-libraries
 
+(def ^:private sql:get-file-libraries
+  "WITH RECURSIVE libs AS (
+     SELECT fl.*, flr.synced_at
+       FROM file AS fl
+       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
+      WHERE flr.file_id = ?::uuid
+    UNION
+     SELECT fl.*, flr.synced_at
+       FROM file AS fl
+       JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
+       JOIN libs AS l ON (flr.file_id = l.id)
+   )
+   SELECT l.id,
+          l.features,
+          l.project_id,
+          p.team_id,
+          l.created_at,
+          l.modified_at,
+          l.deleted_at,
+          l.name,
+          l.revn,
+          l.vern,
+          l.synced_at,
+          l.is_shared
+     FROM libs AS l
+    INNER JOIN project AS p ON (p.id = l.project_id)
+    WHERE l.deleted_at IS NULL OR l.deleted_at > now();")
+
+(defn get-file-libraries
+  [conn file-id]
+  (into []
+        (comp
+         ;; FIXME: :is-indirect set to false to all rows looks
+         ;; completly useless
+         (map #(assoc % :is-indirect false))
+         (map decode-row))
+        (db/exec! conn [sql:get-file-libraries file-id])))
+
 (def ^:private schema:get-file-libraries
   [:map {:title "get-file-libraries"}
    [:file-id ::sm/uuid]])
@@ -636,7 +664,7 @@
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id]}]
   (dm/with-open [conn (db/open pool)]
     (check-read-permissions! conn profile-id file-id)
-    (bfc/get-file-libraries conn file-id)))
+    (get-file-libraries conn file-id)))
 
 
 ;; --- COMMAND QUERY: Files that use this File library
@@ -942,13 +970,12 @@
 ;; --- MUTATION COMMAND: delete-file
 
 (defn- mark-file-deleted
-  [conn team file-id]
-  (let [delay (ldel/get-deletion-delay team)
-        file  (db/update! conn :file
-                          {:deleted-at (dt/in-future delay)}
-                          {:id file-id}
-                          {::db/return-keys [:id :name :is-shared :deleted-at
-                                             :project-id :created-at :modified-at]})]
+  [conn file-id]
+  (let [file (db/update! conn :file
+                         {:deleted-at (dt/now)}
+                         {:id file-id}
+                         {::db/return-keys [:id :name :is-shared :deleted-at
+                                            :project-id :created-at :modified-at]})]
     (wrk/submit! {::db/conn conn
                   ::wrk/task :delete-object
                   ::wrk/params {:object :file
@@ -964,11 +991,7 @@
 (defn- delete-file
   [{:keys [::db/conn] :as cfg} {:keys [profile-id id] :as params}]
   (check-edition-permissions! conn profile-id id)
-  (let [team (teams/get-team conn
-                             :profile-id profile-id
-                             :file-id id)
-        file (mark-file-deleted conn team id)]
-
+  (let [file (mark-file-deleted conn id)]
     (rph/with-meta (rph/wrap)
       {::audit/props {:project-id (:project-id file)
                       :name (:name file)

backend/src/app/rpc/commands/files_temp.clj

@@ -14,6 +14,7 @@
    [app.config :as cf]
    [app.db :as db]
    [app.db.sql :as sql]
+   [app.features.components-v2 :as feat.compv2]
    [app.features.fdata :as fdata]
    [app.loggers.audit :as audit]
    [app.rpc :as-alias rpc]
@@ -109,7 +110,7 @@
 ;; --- MUTATION COMMAND: persist-temp-file
 
 (defn persist-temp-file
-  [{:keys [::db/conn] :as cfg} {:keys [id] :as params}]
+  [{:keys [::db/conn] :as cfg} {:keys [id ::rpc/profile-id] :as params}]
   (let [file (files/get-file cfg id
                              :migrate? false
                              :lock-for-update? true)]
@@ -118,6 +119,7 @@
       (ex/raise :type :validation
                 :code :cant-persist-already-persisted-file))
 
+
     (let [changes (->> (db/cursor conn
                                   (sql/select :file-change {:file-id id}
                                               {:order-by [[:revn :asc]]})
@@ -145,6 +147,19 @@
                    :revn 1
                    :data (blob/encode (:data file))}
                   {:id id})
+
+      (let [team          (teams/get-team conn :profile-id profile-id :project-id (:project-id file))
+            file-features (:features file)
+            team-features (cfeat/get-team-enabled-features cf/flags team)]
+        (when (and (contains? team-features "components/v2")
+                   (not (contains? file-features "components/v2")))
+          ;; Migrate components v2
+          (feat.compv2/migrate-file! cfg
+                                     (:id file)
+                                     :max-procs 2
+                                     :validate? true
+                                     :throw-on-validate? true)))
+
       nil)))
 
 (def ^:private schema:persist-temp-file

backend/src/app/rpc/commands/files_update.clj

@@ -20,7 +20,6 @@
    [app.db :as db]
    [app.features.fdata :as feat.fdata]
    [app.features.file-migrations :as feat.fmigr]
-   [app.features.logical-deletion :as ldel]
    [app.http.errors :as errors]
    [app.loggers.audit :as audit]
    [app.loggers.webhooks :as webhooks]
@@ -210,7 +209,7 @@
 
   Only intended for internal use on this module."
   [{:keys [::db/conn ::wrk/executor ::timestamp] :as cfg}
-   {:keys [profile-id file team features changes session-id skip-validate] :as params}]
+   {:keys [profile-id file features changes session-id skip-validate] :as params}]
 
   (let [;; Retrieve the file data
         file  (feat.fmigr/resolve-applied-migrations cfg file)
@@ -244,7 +243,7 @@
                    :created-at timestamp
                    :updated-at timestamp
                    :deleted-at (if (::snapshot-data file)
-                                 (dt/plus timestamp (ldel/get-deletion-delay team))
+                                 (dt/plus timestamp (cf/get-deletion-delay))
                                  (dt/plus timestamp (dt/duration {:hours 1})))
                    :file-id (:id file)
                    :revn (:revn file)
@@ -341,7 +340,6 @@
                                     (-> data
                                         (blob/decode)
                                         (assoc :id (:id file)))))
-          libs (delay (bfc/get-resolved-file-libraries cfg file))
 
           ;; For avoid unnecesary overhead of creating multiple pointers
           ;; and handly internally with objects map in their worst
@@ -352,7 +350,7 @@
                  (-> file
                      (update :data feat.fdata/process-pointers deref)
                      (update :data feat.fdata/process-objects (partial into {}))
-                     (fmg/migrate-file libs))
+                     (fmg/migrate-file))
                  file)
 
           file (apply update-fn cfg file args)
@@ -381,6 +379,13 @@
 
       (bfc/encode-file cfg file))))
 
+(defn- get-file-libraries
+  "A helper for preload file libraries, mainly used for perform file
+  semantical and structural validation"
+  [{:keys [::db/conn] :as cfg} file]
+  (->> (files/get-file-libraries conn (:id file))
+       (into [file] (map #(bfc/get-file cfg (:id %))))
+       (d/index-by :id)))
 
 (defn- soft-validate-file-schema!
   [file]
@@ -406,7 +411,7 @@
         (when (and (or (contains? cf/flags :file-validation)
                        (contains? cf/flags :soft-file-validation))
                    (not skip-validate))
-          (bfc/get-resolved-file-libraries cfg file))
+          (get-file-libraries cfg file))
 
 
         ;; The main purpose of this atom is provide a contextual state

backend/src/app/rpc/commands/fonts.clj

@@ -12,7 +12,6 @@
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.db.sql :as-alias sql]
-   [app.features.logical-deletion :as ldel]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as-alias webhooks]
    [app.media :as media]
@@ -81,9 +80,9 @@
 (def ^:private schema:create-font-variant
   [:map {:title "create-font-variant"}
    [:team-id ::sm/uuid]
-   [:data [:map-of ::sm/text ::sm/any]]
+   [:data [:map-of :string :any]]
    [:font-id ::sm/uuid]
-   [:font-family ::sm/text]
+   [:font-family :string]
    [:font-weight [::sm/one-of {:format "number"} valid-weight]]
    [:font-style [::sm/one-of {:format "string"} valid-style]]])
 
@@ -203,40 +202,32 @@
 (sv/defmethod ::delete-font
   {::doc/added "1.18"
    ::webhooks/event? true
-   ::sm/params schema:delete-font
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id team-id]}]
-  (let [team  (teams/get-team conn
-                              :profile-id profile-id
-                              :team-id team-id)
+   ::sm/params schema:delete-font}
+  [cfg {:keys [::rpc/profile-id id team-id]}]
+  (db/tx-run! cfg
+              (fn [{:keys [::db/conn] :as cfg}]
+                (teams/check-edition-permissions! conn profile-id team-id)
+                (let [fonts   (db/query conn :team-font-variant
+                                        {:team-id team-id
+                                         :font-id id
+                                         :deleted-at nil}
+                                        {::sql/for-update true})
+                      tnow    (dt/now)]
 
-        fonts (db/query conn :team-font-variant
-                        {:team-id team-id
-                         :font-id id
-                         :deleted-at nil}
-                        {::sql/for-update true})
+                  (when-not (seq fonts)
+                    (ex/raise :type :not-found
+                              :code :object-not-found))
 
-        delay (ldel/get-deletion-delay team)
-        tnow  (dt/in-future delay)]
+                  (doseq [font fonts]
+                    (db/update! conn :team-font-variant
+                                {:deleted-at tnow}
+                                {:id (:id font)}))
 
-    (teams/check-edition-permissions! (:permissions team))
-
-    (when-not (seq fonts)
-      (ex/raise :type :not-found
-                :code :object-not-found))
-
-
-    (doseq [font fonts]
-      (db/update! conn :team-font-variant
-                  {:deleted-at tnow}
-                  {:id (:id font)}
-                  {::db/return-keys false}))
-
-    (rph/with-meta (rph/wrap)
-      {::audit/props {:id id
-                      :team-id team-id
-                      :name (:font-family (peek fonts))
-                      :profile-id profile-id}})))
+                  (rph/with-meta (rph/wrap)
+                    {::audit/props {:id id
+                                    :team-id team-id
+                                    :name (:font-family (peek fonts))
+                                    :profile-id profile-id}})))))
 
 ;; --- DELETE FONT VARIANT
 
@@ -248,23 +239,19 @@
 (sv/defmethod ::delete-font-variant
   {::doc/added "1.18"
    ::webhooks/event? true
-   ::sm/params schema:delete-font-variant
-   ::db/transaction true}
-  [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id team-id]}]
-  (let [team    (teams/get-team conn
-                                :profile-id profile-id
-                                :team-id team-id)
-        variant (db/get conn :team-font-variant
-                        {:id id :team-id team-id}
-                        {::sql/for-update true})
-        delay   (ldel/get-deletion-delay team)]
+   ::sm/params schema:delete-font-variant}
+  [cfg {:keys [::rpc/profile-id id team-id]}]
+  (db/tx-run! cfg
+              (fn [{:keys [::db/conn] :as cfg}]
+                (teams/check-edition-permissions! conn profile-id team-id)
+                (let [variant (db/get conn :team-font-variant
+                                      {:id id :team-id team-id}
+                                      {::sql/for-update true})]
 
-    (teams/check-edition-permissions! (:permissions team))
-    (db/update! conn :team-font-variant
-                {:deleted-at (dt/in-future delay)}
-                {:id (:id variant)}
-                {::db/return-keys false})
+                  (db/update! conn :team-font-variant
+                              {:deleted-at (dt/now)}
+                              {:id (:id variant)})
 
-    (rph/with-meta (rph/wrap)
-      {::audit/props {:font-family (:font-family variant)
-                      :font-id (:font-id variant)}})))
+                  (rph/with-meta (rph/wrap)
+                    {::audit/props {:font-family (:font-family variant)
+                                    :font-id (:font-id variant)}})))))

backend/src/app/rpc/commands/management.clj

@@ -56,7 +56,7 @@
     (vswap! bfc/*state* update :index bfc/update-index fmeds :id)
 
     ;; Process and persist file
-    (let [file (bfc/process-file cfg file)]
+    (let [file (bfc/process-file file)]
       (bfc/insert-file! cfg file ::db/return-keys false)
 
       ;; The file profile creation is optional, so when no profile is

backend/src/app/rpc/commands/profile.clj

@@ -480,7 +480,8 @@
         JOIN team AS t ON (t.id = tpr.team_id)
        WHERE tpr.is_owner IS TRUE
          AND tpr.profile_id = ?
-         AND t.deleted_at IS NULL
+         AND (t.deleted_at IS NULL OR
+              t.deleted_at > now())
    )
    SELECT tpr.team_id AS id,
           count(tpr.profile_id) - 1 AS participants

backend/src/app/rpc/commands/projects.clj

@@ -11,7 +11,6 @@
    [app.common.schema :as sm]
    [app.db :as db]
    [app.db.sql :as-alias sql]
-   [app.features.logical-deletion :as ldel]
    [app.loggers.audit :as-alias audit]
    [app.loggers.webhooks :as webhooks]
    [app.rpc :as-alias rpc]
@@ -254,10 +253,9 @@
 ;; --- MUTATION: Delete Project
 
 (defn- delete-project
-  [conn team project-id]
-  (let [delay   (ldel/get-deletion-delay team)
-        project (db/update! conn :project
-                            {:deleted-at (dt/in-future delay)}
+  [conn project-id]
+  (let [project (db/update! conn :project
+                            {:deleted-at (dt/now)}
                             {:id project-id}
                             {::db/return-keys true})]
 
@@ -274,6 +272,7 @@
 
     project))
 
+
 (def ^:private schema:delete-project
   [:map {:title "delete-project"}
    [:id ::sm/uuid]])
@@ -285,10 +284,7 @@
    ::db/transaction true}
   [{:keys [::db/conn]} {:keys [::rpc/profile-id id] :as params}]
   (check-edition-permissions! conn profile-id id)
-  (let [team    (teams/get-team conn
-                                :profile-id profile-id
-                                :project-id id)
-        project (delete-project conn team id)]
+  (let [project (delete-project conn id)]
     (rph/with-meta (rph/wrap)
       {::audit/props {:team-id (:team-id project)
                       :name (:name project)

backend/src/app/rpc/commands/teams.clj

@@ -17,7 +17,6 @@
    [app.db :as db]
    [app.db.sql :as sql]
    [app.email :as eml]
-   [app.features.logical-deletion :as ldel]
    [app.loggers.audit :as audit]
    [app.main :as-alias main]
    [app.media :as media]
@@ -115,6 +114,18 @@
 
 ;; --- Query: Teams
 
+(declare get-teams)
+
+(def ^:private schema:get-teams
+  [:map {:title "get-teams"}])
+
+(sv/defmethod ::get-teams
+  {::doc/added "1.17"
+   ::sm/params schema:get-teams}
+  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id] :as params}]
+  (dm/with-open [conn (db/open pool)]
+    (get-teams conn profile-id)))
+
 (def sql:get-teams-with-permissions
   "SELECT t.*,
           tp.is_owner,
@@ -139,8 +150,7 @@
             '~:status', CASE COALESCE(p.props->'~:subscription'->>'~:type', 'professional')
                           WHEN 'professional' THEN 'active'
                           ELSE COALESCE(p.props->'~:subscription'->>'~:status', 'incomplete')
-                       END,
-            '~:seats', p.props->'~:subscription'->'~:quantity'
+                       END
           ) AS subscription
      FROM team_profile_rel AS tp
      JOIN team AS t ON (t.id = tp.team_id)
@@ -150,7 +160,7 @@
        ON (tpr.profile_id = p.id)
     WHERE t.deleted_at IS null
       AND tp.profile_id = ?
-    ORDER BY tp.created_at ASC")
+    ORDER BY tp.created_at ASC;")
 
 (defn process-permissions
   [team]
@@ -181,38 +191,6 @@
     (->> (db/exec! conn [sql (:default-team-id profile) profile-id])
          (into [] xform:process-teams))))
 
-(def ^:private schema:get-teams
-  [:map {:title "get-teams"}])
-
-(sv/defmethod ::get-teams
-  {::doc/added "1.17"
-   ::sm/params schema:get-teams}
-  [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id] :as params}]
-  (dm/with-open [conn (db/open pool)]
-    (get-teams conn profile-id)))
-
-(def ^:private sql:get-owned-teams
-  "SELECT t.id, t.name,
-          (SELECT count(*) FROM team_profile_rel WHERE team_id=t.id) AS total_members,
-          (SELECT count(*) FROM team_profile_rel WHERE team_id=t.id AND can_edit=true) AS total_editors
-     FROM team AS t
-     JOIN team_profile_rel AS tpr ON (tpr.team_id = t.id)
-    WHERE t.is_default IS false
-      AND tpr.is_owner IS true
-      AND tpr.profile_id = ?
-      AND t.deleted_at IS NULL")
-
-(defn- get-owned-teams
-  [cfg profile-id]
-  (->> (db/exec! cfg [sql:get-owned-teams profile-id])
-       (into [] (map decode-row))))
-
-(sv/defmethod ::get-owned-teams
-  {::doc/added "2.8.0"
-   ::sm/params schema:get-teams}
-  [cfg {:keys [::rpc/profile-id]}]
-  (get-owned-teams cfg profile-id))
-
 ;; --- Query: Team (by ID)
 
 (declare get-team)
@@ -236,43 +214,39 @@
 (defn get-team
   [conn & {:keys [profile-id team-id project-id file-id] :as params}]
 
-  (assert (uuid? profile-id) "profile-id is mandatory")
-  (assert (or (db/connection? conn)
-              (db/pool? conn))
-          "connection or pool is mandatory")
+  (dm/assert!
+   "connection or pool is mandatory"
+   (or (db/connection? conn)
+       (db/pool? conn)))
 
-  (let [{:keys [default-team-id] :as profile}
-        (profile/get-profile conn profile-id)
+  (dm/assert!
+   "profile-id is mandatory"
+   (uuid? profile-id))
 
-        sql
-        (if (contains? cf/flags :subscriptions)
-          sql:get-teams-with-permissions-and-subscription
-          sql:get-teams-with-permissions)
+  (let [{:keys [default-team-id] :as profile} (profile/get-profile conn profile-id)
+        result (cond
+                 (some? team-id)
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions
+                                ") SELECT * FROM teams WHERE id=?")]
+                   (db/exec-one! conn [sql default-team-id profile-id team-id]))
 
-        result
-        (cond
-          (some? team-id)
-          (let [sql (str "WITH teams AS (" sql ") "
-                         "SELECT * FROM teams WHERE id=?")]
-            (db/exec-one! conn [sql default-team-id profile-id team-id]))
+                 (some? project-id)
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions ") "
+                                "SELECT t.* FROM teams AS t "
+                                "  JOIN project AS p ON (p.team_id = t.id) "
+                                " WHERE p.id=?")]
+                   (db/exec-one! conn [sql default-team-id profile-id project-id]))
 
-          (some? project-id)
-          (let [sql (str "WITH teams AS (" sql ") "
-                         "SELECT t.* FROM teams AS t "
-                         "  JOIN project AS p ON (p.team_id = t.id) "
-                         " WHERE p.id=?")]
-            (db/exec-one! conn [sql default-team-id profile-id project-id]))
+                 (some? file-id)
+                 (let [sql (str "WITH teams AS (" sql:get-teams-with-permissions ") "
+                                "SELECT t.* FROM teams AS t "
+                                "  JOIN project AS p ON (p.team_id = t.id) "
+                                "  JOIN file AS f ON (f.project_id = p.id) "
+                                " WHERE f.id=?")]
+                   (db/exec-one! conn [sql default-team-id profile-id file-id]))
 
-          (some? file-id)
-          (let [sql (str "WITH teams AS (" sql ") "
-                         "SELECT t.* FROM teams AS t "
-                         "  JOIN project AS p ON (p.team_id = t.id) "
-                         "  JOIN file AS f ON (f.project_id = p.id) "
-                         " WHERE f.id=?")]
-            (db/exec-one! conn [sql default-team-id profile-id file-id]))
-
-          :else
-          (throw (IllegalArgumentException. "invalid arguments")))]
+                 :else
+                 (throw (IllegalArgumentException. "invalid arguments")))]
 
     (when-not result
       (ex/raise :type :not-found
@@ -660,13 +634,13 @@
 
 (defn- delete-team
   "Mark a team for deletion"
-  [conn {:keys [id] :as team}]
+  [conn team-id]
 
-  (let [delay (ldel/get-deletion-delay team)
-        team  (db/update! conn :team
-                          {:deleted-at (dt/in-future delay)}
-                          {:id id}
-                          {::db/return-keys true})]
+  (let [deleted-at (dt/now)
+        team       (db/update! conn :team
+                               {:deleted-at deleted-at}
+                               {:id team-id}
+                               {::db/return-keys true})]
 
     (when (:is-default team)
       (ex/raise :type :validation
@@ -676,8 +650,8 @@
     (wrk/submit! {::db/conn conn
                   ::wrk/task :delete-object
                   ::wrk/params {:object :team
-                                :deleted-at (:deleted-at team)
-                                :id id}})
+                                :deleted-at deleted-at
+                                :id team-id}})
     team))
 
 (def ^:private schema:delete-team
@@ -689,14 +663,12 @@
    ::sm/params schema:delete-team
    ::db/transaction true}
   [{:keys [::db/conn] :as cfg} {:keys [::rpc/profile-id id] :as params}]
-  (let [team  (get-team conn :profile-id profile-id :team-id id)
-        perms (get team :permissions)]
-
+  (let [perms (get-permissions conn profile-id id)]
     (when-not (:is-owner perms)
       (ex/raise :type :validation
                 :code :only-owner-can-delete-team))
 
-    (delete-team conn team)
+    (delete-team conn id)
     nil))
 
 ;; --- Mutation: Team Update Role

backend/src/app/rpc/commands/viewer.clj

@@ -6,7 +6,6 @@
 
 (ns app.rpc.commands.viewer
   (:require
-   [app.binfile.common :as bfc]
    [app.common.exceptions :as ex]
    [app.common.features :as cfeat]
    [app.common.schema :as sm]
@@ -79,7 +78,7 @@
                   :always
                   (update :data select-keys [:id :options :pages :pages-index :components]))
 
-        libs    (->> (bfc/get-file-libraries conn file-id)
+        libs    (->> (files/get-file-libraries conn file-id)
                      (mapv (fn [{:keys [id] :as lib}]
                              (merge lib (files/get-file cfg id)))))
 

backend/src/app/rpc/doc.clj

@@ -9,7 +9,6 @@
   (:require
    [app.common.data :as d]
    [app.common.exceptions :as ex]
-   [app.common.json :as json]
    [app.common.pprint :as pp]
    [app.common.schema :as sm]
    [app.common.schema.desc-js-like :as smdj]
@@ -20,6 +19,7 @@
    [app.http.sse :as-alias sse]
    [app.loggers.webhooks :as-alias webhooks]
    [app.rpc :as-alias rpc]
+   [app.util.json :as json]
    [app.util.services :as sv]
    [app.util.template :as tmpl]
    [clojure.java.io :as io]
@@ -86,7 +86,7 @@
     (fn [request]
       (let [params  (:query-params request)
             pstyle  (:type params "js")
-            context (assoc @context :param-style pstyle)]
+            context (assoc context :param-style pstyle)]
 
         {::yres/status 200
          ::yres/body (-> (io/resource "app/templates/api-doc.tmpl")
@@ -178,7 +178,8 @@
     (fn [_]
       {::yres/status 200
        ::yres/headers {"content-type" "application/json; charset=utf-8"}
-       ::yres/body (json/encode @context)})
+       ::yres/body (json/encode context)})
+
     (fn [_]
       {::yres/status 404})))
 
@@ -208,7 +209,7 @@
 
 (defmethod ig/init-key ::routes
   [_ {:keys [::rpc/methods] :as cfg}]
-  [(let [context (delay (prepare-doc-context methods))]
+  [(let [context (prepare-doc-context methods)]
      [["/_doc"
        {:handler (doc-handler context)
         :allowed-methods #{:get}}]
@@ -216,7 +217,7 @@
        {:handler (doc-handler context)
         :allowed-methods #{:get}}]])
 
-   (let [context (delay (prepare-openapi-context methods))]
+   (let [context (prepare-openapi-context methods)]
      [["/openapi"
        {:handler (openapi-handler)
         :allowed-methods #{:get}}]

backend/src/app/srepl/components_v2.clj

@@ -0,0 +1,306 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.srepl.components-v2
+  (:require
+   [app.common.fressian :as fres]
+   [app.common.logging :as l]
+   [app.db :as db]
+   [app.features.components-v2 :as feat]
+   [app.main :as main]
+   [app.srepl.helpers :as h]
+   [app.util.events :as events]
+   [app.util.time :as dt]
+   [app.worker :as-alias wrk]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io]
+   [promesa.exec :as px]
+   [promesa.exec.semaphore :as ps]
+   [promesa.util :as pu]))
+
+(def ^:dynamic *scope* nil)
+(def ^:dynamic *semaphore* nil)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; PRIVATE HELPERS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private sql:get-files-by-created-at
+  "SELECT id, features,
+          row_number() OVER (ORDER BY created_at DESC) AS rown
+     FROM file
+    WHERE deleted_at IS NULL
+    ORDER BY created_at DESC")
+
+(defn- get-files
+  [conn]
+  (->> (db/cursor conn [sql:get-files-by-created-at] {:chunk-size 500})
+       (map feat/decode-row)
+       (remove (fn [{:keys [features]}]
+                 (contains? features "components/v2")))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; PUBLIC API
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn migrate-file!
+  [file-id & {:keys [rollback? validate? label cache skip-on-graphic-error?]
+              :or {rollback? true
+                   validate? false
+                   skip-on-graphic-error? true}}]
+  (l/dbg :hint "migrate:start" :rollback rollback?)
+  (let [tpoint  (dt/tpoint)
+        file-id (h/parse-uuid file-id)]
+
+    (binding [feat/*stats* (atom {})
+              feat/*cache* cache]
+      (try
+        (-> (assoc main/system ::db/rollback rollback?)
+            (feat/migrate-file! file-id
+                                :validate? validate?
+                                :skip-on-graphic-error? skip-on-graphic-error?
+                                :label label))
+
+        (-> (deref feat/*stats*)
+            (assoc :elapsed (dt/format-duration (tpoint))))
+
+        (catch Throwable cause
+          (l/wrn :hint "migrate:error" :cause cause))
+
+        (finally
+          (let [elapsed (dt/format-duration (tpoint))]
+            (l/dbg :hint "migrate:end" :rollback rollback? :elapsed elapsed)))))))
+
+(defn migrate-team!
+  [team-id & {:keys [rollback? skip-on-graphic-error? validate? label cache]
+              :or {rollback? true
+                   validate? true
+                   skip-on-graphic-error? true}}]
+
+  (l/dbg :hint "migrate:start" :rollback rollback?)
+
+  (let [team-id (h/parse-uuid team-id)
+        stats   (atom {})
+        tpoint  (dt/tpoint)]
+
+    (binding [feat/*stats* stats
+              feat/*cache* cache]
+      (try
+        (-> (assoc main/system ::db/rollback rollback?)
+            (feat/migrate-team! team-id
+                                :label label
+                                :validate? validate?
+                                :skip-on-graphics-error? skip-on-graphic-error?))
+
+        (-> (deref feat/*stats*)
+            (assoc :elapsed (dt/format-duration (tpoint))))
+
+        (catch Throwable cause
+          (l/dbg :hint "migrate:error" :cause cause))
+
+        (finally
+          (let [elapsed (dt/format-duration (tpoint))]
+            (l/dbg :hint "migrate:end" :rollback rollback? :elapsed elapsed)))))))
+
+(defn migrate-files!
+  "A REPL helper for migrate all files.
+
+  This function starts multiple concurrent file migration processes
+  until thw maximum number of jobs is reached which by default has the
+  value of `1`. This is controled with the `:max-jobs` option.
+
+  If you want to run this on multiple machines you will need to specify
+  the total number of partitions and the current partition.
+
+  In order to get the report table populated, you will need to provide
+  a correct `:label`. That label is also used for persist a file
+  snaphot before continue with the migration."
+  [& {:keys [max-jobs max-items rollback? validate?
+             cache skip-on-graphic-error?
+             label partitions current-partition]
+      :or {validate? false
+           rollback? true
+           max-jobs 1
+           current-partition 1
+           skip-on-graphic-error? true
+           max-items Long/MAX_VALUE}}]
+
+  (when (int? partitions)
+    (when-not (int? current-partition)
+      (throw (IllegalArgumentException. "missing `current-partition` parameter")))
+    (when-not (<= 0 current-partition partitions)
+      (throw (IllegalArgumentException. "invalid value on `current-partition` parameter"))))
+
+  (let [stats     (atom {})
+        tpoint    (dt/tpoint)
+        factory   (px/thread-factory :virtual false :prefix "penpot/migration/")
+        executor  (px/cached-executor :factory factory)
+
+        sjobs     (ps/create :permits max-jobs)
+
+        migrate-file
+        (fn [file-id rown]
+          (try
+            (db/tx-run! (assoc main/system ::db/rollback rollback?)
+                        (fn [system]
+                          (db/exec-one! system ["SET LOCAL idle_in_transaction_session_timeout = 0"])
+                          (feat/migrate-file! system file-id
+                                              :rown rown
+                                              :label label
+                                              :validate? validate?
+                                              :skip-on-graphic-error? skip-on-graphic-error?)))
+
+            (catch Throwable cause
+              (l/wrn :hint "unexpected error on processing file (skiping)"
+                     :file-id (str file-id))
+
+              (events/tap :error
+                          (ex-info "unexpected error on processing file (skiping)"
+                                   {:file-id file-id}
+                                   cause))
+
+              (swap! stats update :errors (fnil inc 0)))
+
+            (finally
+              (ps/release! sjobs))))
+
+        process-file
+        (fn [{:keys [id rown]}]
+          (ps/acquire! sjobs)
+          (px/run! executor (partial migrate-file id rown)))]
+
+    (l/dbg :hint "migrate:start"
+           :label label
+           :rollback rollback?
+           :max-jobs max-jobs
+           :max-items max-items)
+
+    (binding [feat/*stats* stats
+              feat/*cache* cache]
+      (try
+        (db/tx-run! main/system
+                    (fn [{:keys [::db/conn] :as system}]
+                      (db/exec! conn ["SET LOCAL statement_timeout = 0"])
+                      (db/exec! conn ["SET LOCAL idle_in_transaction_session_timeout = 0"])
+
+                      (run! process-file
+                            (->> (get-files conn)
+                                 (filter (fn [{:keys [rown] :as row}]
+                                           (if (int? partitions)
+                                             (= current-partition (inc (mod rown partitions)))
+                                             true)))
+                                 (take max-items)))
+
+                      ;; Close and await tasks
+                      (pu/close! executor)))
+
+        (-> (deref stats)
+            (assoc :elapsed (dt/format-duration (tpoint))))
+
+        (catch Throwable cause
+          (l/dbg :hint "migrate:error" :cause cause)
+          (events/tap :error cause))
+
+        (finally
+          (let [elapsed (dt/format-duration (tpoint))]
+            (l/dbg :hint "migrate:end"
+                   :rollback rollback?
+                   :elapsed elapsed)))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; CACHE POPULATE
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def sql:sobjects-for-cache
+  "SELECT id,
+          row_number() OVER (ORDER BY created_at) AS index
+     FROM storage_object
+    WHERE (metadata->>'~:bucket' = 'file-media-object' OR
+           metadata->>'~:bucket' IS NULL)
+      AND metadata->>'~:content-type' = 'image/svg+xml'
+      AND deleted_at IS NULL
+      AND size < 1135899
+    ORDER BY created_at ASC")
+
+(defn populate-cache!
+  "A REPL helper for migrate all files.
+
+  This function starts multiple concurrent file migration processes
+  until thw maximum number of jobs is reached which by default has the
+  value of `1`. This is controled with the `:max-jobs` option.
+
+  If you want to run this on multiple machines you will need to specify
+  the total number of partitions and the current partition.
+
+  In order to get the report table populated, you will need to provide
+  a correct `:label`. That label is also used for persist a file
+  snaphot before continue with the migration."
+  [& {:keys [max-jobs] :or {max-jobs 1}}]
+
+  (let [tpoint    (dt/tpoint)
+
+        factory   (px/thread-factory :virtual false :prefix "penpot/cache/")
+        executor  (px/cached-executor :factory factory)
+
+        sjobs     (ps/create :permits max-jobs)
+
+        retrieve-sobject
+        (fn [id index]
+          (let [path   (feat/get-sobject-cache-path id)
+                parent (fs/parent path)]
+
+            (try
+              (when-not (fs/exists? parent)
+                (fs/create-dir parent))
+
+              (if (fs/exists? path)
+                (l/inf :hint "create cache entry" :status "exists" :index index :id (str id) :path (str path))
+                (let [svg-data (feat/get-optimized-svg id)]
+                  (with-open [^java.lang.AutoCloseable stream (io/output-stream path)]
+                    (let [writer (fres/writer stream)]
+                      (fres/write! writer svg-data)))
+
+                  (l/inf :hint "create cache entry" :status "created"
+                         :index index
+                         :id (str id)
+                         :path (str path))))
+
+              (catch Throwable cause
+                (l/wrn :hint "create cache entry"
+                       :status "error"
+                       :index index
+                       :id (str id)
+                       :path (str path)
+                       :cause cause))
+
+              (finally
+                (ps/release! sjobs)))))
+
+        process-sobject
+        (fn [{:keys [id index]}]
+          (ps/acquire! sjobs)
+          (px/run! executor (partial retrieve-sobject id index)))]
+
+    (l/dbg :hint "migrate:start"
+           :max-jobs max-jobs)
+
+    (try
+      (binding [feat/*system* main/system]
+        (run! process-sobject
+              (db/exec! main/system [sql:sobjects-for-cache]))
+
+        ;; Close and await tasks
+        (pu/close! executor))
+
+      {:elapsed (dt/format-duration (tpoint))}
+
+      (catch Throwable cause
+        (l/dbg :hint "populate:error" :cause cause))
+
+      (finally
+        (let [elapsed (dt/format-duration (tpoint))]
+          (l/dbg :hint "populate:end"
+                 :elapsed elapsed))))))

backend/src/app/srepl/fixes/lost_colors.clj

@@ -1,88 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.srepl.fixes.lost-colors
-  "A collection of adhoc fixes scripts."
-  (:require
-   [app.binfile.common :as bfc]
-   [app.common.logging :as l]
-   [app.common.types.color :as types.color]
-   [app.db :as db]
-   [app.srepl.helpers :as h]))
-
-(def sql:get-affected-files
-  "SELECT fm.file_id AS id FROM file_migration AS fm WHERE fm.name = '0008-fix-library-colors-v2'")
-
-(def sql:get-matching-snapshot
-  "SELECT * FROM file_change
-    WHERE file_id = ?
-      AND created_at <= ?
-      AND label IS NOT NULL
-      AND data IS NOT NULL
-    ORDER BY created_at DESC
-    LIMIT 2")
-
-(defn get-affected-migration
-  [conn file-id]
-  (db/get* conn :file-migration
-           {:name "0008-fix-library-colors-v2"
-            :file-id file-id}))
-
-(defn get-last-valid-snapshot
-  [conn migration]
-  (let [[snapshot] (db/exec! conn [sql:get-matching-snapshot
-                                   (:file-id migration)
-                                   (:created-at migration)])]
-    (when snapshot
-      (let [snapshot (assoc snapshot :id (:file-id snapshot))]
-        (bfc/decode-file h/*system* snapshot)))))
-
-(defn restore-color
-  [{:keys [data] :as snapshot} color]
-  (when-let [scolor (get-in data [:colors (:id color)])]
-    (-> (select-keys scolor types.color/library-color-attrs)
-        (types.color/check-library-color))))
-
-(defn restore-missing-colors
-  [{:keys [id] :as file} & _opts]
-  (l/inf :hint "process file" :file-id (str id) :name (:name file) :has-colors (-> file :data :colors not-empty boolean))
-  (if-let [colors (-> file :data :colors not-empty)]
-    (let [migration (get-affected-migration h/*system* id)]
-      (if-let [snapshot (get-last-valid-snapshot h/*system* migration)]
-        (do
-          (l/inf :hint "using snapshot" :snapshot (:label snapshot))
-          (let [colors (reduce-kv (fn [colors color-id color]
-                                    (if-let [result (restore-color snapshot color)]
-                                      (do
-                                        (l/inf :hint "restored color" :file-id (str id) :color-id (str color-id))
-                                        (assoc colors color-id result))
-                                      (do
-                                        (l/wrn :hint "ignoring color" :file-id (str id) :color (pr-str color))
-                                        colors)))
-                                  colors
-                                  colors)
-                file   (-> file
-                           (update :data assoc :colors colors)
-                           (update :migrations disj "0008-fix-library-colors-v2"))]
-
-            (db/delete! h/*system* :file-migration
-                        {:name "0008-fix-library-colors-v2"
-                         :file-id (:id file)})
-            file))
-
-        (do
-          (db/delete! h/*system* :file-migration
-                      {:name "0008-fix-library-colors-v2"
-                       :file-id (:id file)})
-          nil)))
-
-    (do
-      (db/delete! h/*system* :file-migration
-                  {:name "0008-fix-library-colors-v2"
-                   :file-id (:id file)})
-      nil)))
-
-

backend/src/app/srepl/helpers.clj

@@ -13,6 +13,7 @@
    [app.common.files.migrations :as fmg]
    [app.common.files.validate :as cfv]
    [app.db :as db]
+   [app.features.components-v2 :as feat.comp-v2]
    [app.main :as main]
    [app.rpc.commands.files :as files]
    [app.rpc.commands.files-snapshot :as fsnap]
@@ -61,27 +62,6 @@
                 {:id id})
     team))
 
-(def ^:private sql:get-and-lock-team-files
-  "SELECT f.id
-     FROM file AS f
-     JOIN project AS p ON (p.id = f.project_id)
-    WHERE p.team_id = ?
-      AND p.deleted_at IS NULL
-      AND f.deleted_at IS NULL
-      FOR UPDATE")
-
-(defn get-team
-  [conn team-id]
-  (-> (db/get conn :team {:id team-id}
-              {::db/remove-deleted false
-               ::db/check-deleted false})
-      (update :features db/decode-pgarray #{})))
-
-(defn get-and-lock-team-files
-  [conn team-id]
-  (transduce (map :id) conj []
-             (db/plan conn [sql:get-and-lock-team-files team-id])))
-
 (defn reset-file-data!
   "Hardcode replace of the data of one file."
   [system id data]
@@ -116,7 +96,7 @@
 (defn take-team-snapshot!
   [system team-id label]
   (let [conn (db/get-connection system)]
-    (->> (get-and-lock-team-files conn team-id)
+    (->> (feat.comp-v2/get-and-lock-team-files conn team-id)
          (reduce (fn [result file-id]
                    (let [file (fsnap/get-file-snapshots system file-id)]
                      (fsnap/create-file-snapshot! system file
@@ -128,16 +108,19 @@
 (defn restore-team-snapshot!
   [system team-id label]
   (let [conn (db/get-connection system)
-        ids  (->> (get-and-lock-team-files conn team-id)
+        ids  (->> (feat.comp-v2/get-and-lock-team-files conn team-id)
                   (into #{}))
 
         snap (search-file-snapshots conn ids label)
 
-        ids' (into #{} (map :file-id) snap)]
+        ids' (into #{} (map :file-id) snap)
+        team (-> (feat.comp-v2/get-team conn team-id)
+                 (update :features disj "components/v2"))]
 
     (when (not= ids ids')
       (throw (RuntimeException. "no uniform snapshot available")))
 
+    (feat.comp-v2/update-team! conn team)
     (reduce (fn [result {:keys [file-id id]}]
               (fsnap/restore-file-snapshot! system file-id id)
               (inc result))
@@ -146,9 +129,13 @@
 
 (defn process-file!
   [system file-id update-fn & {:keys [label validate? with-libraries?] :or {validate? true} :as opts}]
-  (let [file  (bfc/get-file system file-id ::db/for-update true)
+  (let [conn  (db/get-connection system)
+        file  (bfc/get-file system file-id ::db/for-update true)
         libs  (when with-libraries?
-                (bfc/get-resolved-file-libraries system file))
+                (->> (files/get-file-libraries conn file-id)
+                     (into [file] (map (fn [{:keys [id]}]
+                                         (bfc/get-file system id))))
+                     (d/index-by :id)))
 
         file' (when file
                 (if with-libraries?

backend/src/app/srepl/main.clj

@@ -17,12 +17,12 @@
    [app.common.files.validate :as cfv]
    [app.common.logging :as l]
    [app.common.pprint :as p]
-   [app.common.schema :as sm]
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
    [app.db.sql :as-alias sql]
+   [app.features.components-v2 :as feat.comp-v2]
    [app.features.fdata :as feat.fdata]
    [app.loggers.audit :as audit]
    [app.main :as main]
@@ -391,27 +391,14 @@
   [file-id]
   (let [file-id (h/parse-uuid file-id)]
     (db/tx-run! (assoc main/system ::db/rollback true)
-                (fn [system]
-                  (let [file (bfc/get-file system file-id)
-                        libs (bfc/get-resolved-file-libraries system file)]
+                (fn [{:keys [::db/conn] :as system}]
+                  (let [file (h/get-file system file-id)
+                        libs (->> (files/get-file-libraries conn file-id)
+                                  (into [file] (map (fn [{:keys [id]}]
+                                                      (h/get-file system id))))
+                                  (d/index-by :id))]
                     (cfv/validate-file file libs))))))
 
-(defn validate-file-schema
-  "Validate structure, referencial integrity and semantic coherence of
-  all contents of a file. Returns a list of errors."
-  [file-id]
-  (let [file-id (h/parse-uuid file-id)]
-    (db/tx-run! (assoc main/system ::db/rollback true)
-                (fn [system]
-                  (try
-                    (let [file (bfc/get-file system file-id)]
-                      (cfv/validate-file-schema! file)
-                      (println "OK"))
-                    (catch Exception cause
-                      (if-let [explain (-> cause ex-data ::sm/explain)]
-                        (println (sm/humanize-explain explain))
-                        (ex/print-throwable cause))))))))
-
 (defn repair-file!
   "Repair the list of errors detected by validation."
   [file-id & {:keys [rollback?] :or {rollback? true} :as opts}]
@@ -452,7 +439,7 @@
 
                   (binding [h/*system* system
                             db/*conn* (db/get-connection system)]
-                    (->> (h/get-and-lock-team-files conn team-id)
+                    (->> (feat.comp-v2/get-and-lock-team-files conn team-id)
                          (reduce (fn [result file-id]
                                    (if (h/process-file! system file-id update-fn opts)
                                      (inc result)
@@ -491,8 +478,7 @@
                      :index idx)
               (let [system (assoc main/system ::db/rollback rollback?)]
                 (db/tx-run! system (fn [system]
-                                     (binding [h/*system* system
-                                               db/*conn* (db/get-connection system)]
+                                     (binding [h/*system* system]
                                        (h/process-file! system file-id update-fn opts)))))
 
               (catch Throwable cause

backend/src/app/tasks/objects_gc.clj

@@ -9,6 +9,7 @@
   of deleted or unreachable objects."
   (:require
    [app.common.logging :as l]
+   [app.config :as cf]
    [app.db :as db]
    [app.storage :as sto]
    [app.util.time :as dt]
@@ -17,15 +18,15 @@
 (def ^:private sql:get-profiles
   "SELECT id, photo_id FROM profile
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-profiles!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-profiles deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-profiles min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id photo-id]}]
                  (l/trc :hint "permanently delete" :rel "profile" :id (str id))
 
@@ -40,15 +41,15 @@
 (def ^:private sql:get-teams
   "SELECT deleted_at, id, photo_id FROM team
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-teams!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-teams deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-teams min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id photo-id deleted-at]}]
                  (l/trc :hint "permanently delete"
                         :rel "team"
@@ -68,15 +69,15 @@
   "SELECT id, team_id, deleted_at, woff1_file_id, woff2_file_id, otf_file_id, ttf_file_id
      FROM team_font_variant
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-fonts!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-fonts deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-fonts min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id team-id deleted-at] :as font}]
                  (l/trc :hint "permanently delete"
                         :rel "team-font-variant"
@@ -100,15 +101,15 @@
   "SELECT id, deleted_at, team_id
      FROM project
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-projects!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size] :as cfg}]
-  (->> (db/plan conn [sql:get-projects deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size] :as cfg}]
+  (->> (db/plan conn [sql:get-projects min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id team-id deleted-at]}]
                  (l/trc :hint "permanently delete"
                         :rel "project"
@@ -126,15 +127,15 @@
   "SELECT id, deleted_at, project_id, data_backend, data_ref_id
      FROM file
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-files!
-  [{:keys [::db/conn ::sto/storage ::deletion-threshold ::chunk-size] :as cfg}]
-  (->> (db/plan conn [sql:get-files deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::sto/storage ::min-age ::chunk-size] :as cfg}]
+  (->> (db/plan conn [sql:get-files min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id deleted-at project-id] :as file}]
                  (l/trc :hint "permanently delete"
                         :rel "file"
@@ -155,15 +156,15 @@
   "SELECT file_id, revn, media_id, deleted_at
      FROM file_thumbnail
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn delete-file-thumbnails!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-file-thumbnails deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-file-thumbnails min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [file-id revn media-id deleted-at]}]
                  (l/trc :hint "permanently delete"
                         :rel "file-thumbnail"
@@ -184,15 +185,15 @@
   "SELECT file_id, object_id, media_id, deleted_at
      FROM file_tagged_object_thumbnail
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn delete-file-object-thumbnails!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-file-object-thumbnails deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-file-object-thumbnails min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [file-id object-id media-id deleted-at]}]
                  (l/trc :hint "permanently delete"
                         :rel "file-tagged-object-thumbnail"
@@ -213,15 +214,15 @@
   "SELECT file_id, id, deleted_at, data_ref_id
      FROM file_data_fragment
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-file-data-fragments!
-  [{:keys [::db/conn ::sto/storage ::deletion-threshold ::chunk-size] :as cfg}]
-  (->> (db/plan conn [sql:get-file-data-fragments deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::sto/storage ::min-age ::chunk-size] :as cfg}]
+  (->> (db/plan conn [sql:get-file-data-fragments min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [file-id id deleted-at data-ref-id]}]
                  (l/trc :hint "permanently delete"
                         :rel "file-data-fragment"
@@ -239,15 +240,15 @@
   "SELECT id, file_id, media_id, thumbnail_id, deleted_at
      FROM file_media_object
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-file-media-objects!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-file-media-objects deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-file-media-objects min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id file-id deleted-at] :as fmo}]
                  (l/trc :hint "permanently delete"
                         :rel "file-media-object"
@@ -268,15 +269,15 @@
   "SELECT id, file_id, deleted_at, data_backend, data_ref_id
      FROM file_change
     WHERE deleted_at IS NOT NULL
-      AND deleted_at < now() + ?::interval
+      AND deleted_at < now() - ?::interval
     ORDER BY deleted_at ASC
     LIMIT ?
       FOR UPDATE
      SKIP LOCKED")
 
 (defn- delete-file-changes!
-  [{:keys [::db/conn ::deletion-threshold ::chunk-size ::sto/storage] :as cfg}]
-  (->> (db/plan conn [sql:get-file-change deletion-threshold chunk-size] {:fetch-size 5})
+  [{:keys [::db/conn ::min-age ::chunk-size ::sto/storage] :as cfg}]
+  (->> (db/plan conn [sql:get-file-change min-age chunk-size] {:fetch-size 5})
        (reduce (fn [total {:keys [id file-id deleted-at] :as xlog}]
                  (l/trc :hint "permanently delete"
                         :rel "file-change"
@@ -323,13 +324,16 @@
 
 (defmethod ig/expand-key ::handler
   [k v]
-  {k (assoc v ::chunk-size 100)})
+  {k (assoc v
+            ::min-age (cf/get-deletion-delay)
+            ::chunk-size 100)})
 
 (defmethod ig/init-key ::handler
   [_ cfg]
   (fn [{:keys [props] :as task}]
-    (let [threshold (dt/duration (get props :deletion-threshold 0))
-          cfg       (assoc cfg ::deletion-threshold (db/interval threshold))]
+    (let [min-age (dt/duration (or (:min-age props) (::min-age cfg)))
+          cfg     (assoc cfg ::min-age (db/interval min-age))]
+
       (loop [procs (map deref deletion-proc-vars)
              total 0]
         (if-let [proc-fn (first procs)]

backend/src/app/util/events.clj

@@ -10,6 +10,7 @@
   to them. Mainly used in http.sse for progress reporting."
   (:refer-clojure :exclude [tap run!])
   (:require
+   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.logging :as l]
    [promesa.exec :as px]
@@ -17,30 +18,33 @@
 
 (def ^:dynamic *channel* nil)
 
+(defn channel
+  []
+  (sp/chan :buf 32))
+
 (defn tap
-  ([type data]
-   (when-let [channel *channel*]
-     (sp/put! channel [type data])
-     nil))
-  ([channel type data]
-   (when channel
-     (sp/put! channel [type data])
-     nil)))
+  [type data]
+  (when-let [channel *channel*]
+    (sp/put! channel [type data])
+    nil))
 
 (defn start-listener
-  [channel on-event on-close]
-  (assert (sp/chan? channel) "expected active events channel")
+  [on-event on-close]
+
+  (dm/assert!
+   "expected active events channel"
+   (sp/chan? *channel*))
 
   (px/thread
     {:virtual true}
     (try
       (loop []
-        (when-let [event (sp/take! channel)]
+        (when-let [event (sp/take! *channel*)]
           (let [result (ex/try! (on-event event))]
             (if (ex/exception? result)
               (do
                 (l/wrn :hint "unexpected exception" :cause result)
-                (sp/close! channel))
+                (sp/close! *channel*))
               (recur)))))
       (finally
         (on-close)))))
@@ -51,7 +55,7 @@
   [f on-event]
 
   (binding [*channel* (sp/chan :buf 32)]
-    (let [listener (start-listener *channel* on-event (constantly nil))]
+    (let [listener (start-listener on-event (constantly nil))]
       (try
         (f)
         (finally

backend/test/backend_tests/helpers.clj

@@ -222,7 +222,7 @@
   ([params]
    (mark-file-deleted* *system* params))
   ([conn {:keys [id] :as params}]
-   (#'files/mark-file-deleted conn {} id)))
+   (#'files/mark-file-deleted conn id)))
 
 (defn create-team*
   ([i params] (create-team* *system* i params))

backend/test/backend_tests/rpc_file_test.clj

@@ -8,10 +8,10 @@
   (:require
    [app.common.features :as cfeat]
    [app.common.pprint :as pp]
+   [app.common.pprint :as pp]
    [app.common.thumbnails :as thc]
    [app.common.types.shape :as cts]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.db.sql :as sql]
    [app.http :as http]
@@ -123,27 +123,8 @@
                   :components-v2 true}
             out (th/command! data)]
 
-
         ;; (th/print-result! out)
-        (t/is (nil? (:error out)))
 
-        (let [result (:result out)]
-          (t/is (some? (:deleted-at result)))
-          (t/is (= file-id (:id result)))
-          (t/is (= "new name" (:name result)))
-          (t/is (= 1 (count (get-in result [:data :pages]))))
-          (t/is (nil? (:users result))))))
-
-    (th/db-update! :file
-                   {:deleted-at (dt/now)}
-                   {:id file-id})
-
-    (t/testing "query single file after delete and wait"
-      (let [data {::th/type :get-file
-                  ::rpc/profile-id (:id prof)
-                  :id file-id
-                  :components-v2 true}
-            out (th/command! data)]
         (let [error      (:error out)
               error-data (ex-data error)]
           (t/is (th/ex-info? error))
@@ -214,7 +195,7 @@
         (t/is (= 5 (count rows))))
 
       ;; The objects-gc should remove unused fragments
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 3 (:processed res))))
 
       ;; Check the number of fragments
@@ -249,7 +230,7 @@
       (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
 
       ;; The objects-gc should remove unused fragments
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 3 (:processed res))))
 
       ;; Check the number of fragments;
@@ -273,7 +254,7 @@
         (t/is (= 4 (count rows)))
         (t/is (= 2 (count (remove (comp some? :deleted-at) rows)))))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       (let [rows (th/db-query :file-data-fragment {:file-id (:id file)})]
@@ -343,9 +324,8 @@
                 :name "image"
                 :frame-id uuid/zero
                 :parent-id uuid/zero
-                :type :rect
-                :fills [{:fill-opacity 1
-                         :fill-image {:id (:id fmo1) :width 100 :height 100 :mtype "image/jpeg"}}]})}])
+                :type :image
+                :metadata {:id (:id fmo1) :width 100 :height 100 :mtype "image/jpeg"}})}])
 
       ;; Check that reference storage objects on filemediaobjects
       ;; are the same because of deduplication feature.
@@ -375,7 +355,7 @@
         (t/is (= 2 (count rows)))
         (t/is (= 1 (count (remove (comp some? :deleted-at) rows)))))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 3 (:processed res))))
 
       ;; check file media objects
@@ -406,7 +386,7 @@
 
       ;; This only clears fragments, the file media objects still referenced because
       ;; snapshots are preserved
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       ;; Mark all snapshots to be a non-snapshot file change
@@ -415,7 +395,7 @@
 
       ;; Rerun the file-gc and objects-gc
       (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       ;; Now that file-gc have deleted the file-media-object usage,
@@ -463,8 +443,7 @@
           fmo3    (add-file-media-object :profile-id (:id profile) :file-id (:id file))
           fmo4    (add-file-media-object :profile-id (:id profile) :file-id (:id file))
           fmo5    (add-file-media-object :profile-id (:id profile) :file-id (:id file))
-          s1-shid  (uuid/random)
-          s2-shid  (uuid/random)
+          s-shid  (uuid/random)
           t-shid  (uuid/random)
 
           page-id (first (get-in file [:data :pages]))]
@@ -483,31 +462,19 @@
        :changes
        [{:type :add-obj
          :page-id page-id
-         :id s1-shid
+         :id s-shid
          :parent-id uuid/zero
          :frame-id uuid/zero
          :components-v2 true
          :obj (cts/setup-shape
-               {:id s1-shid
+               {:id s-shid
                 :name "image"
                 :frame-id uuid/zero
                 :parent-id uuid/zero
-                :type :rect
-                :fills [{:fill-opacity 1 :fill-image {:id (:id fmo2) :width 101 :height 100 :mtype "image/jpeg"}}]
-                :strokes [{:stroke-opacity 1 :stroke-image {:id (:id fmo3) :width 102 :height 100 :mtype "image/jpeg"}}]})}
-        {:type :add-obj
-         :page-id page-id
-         :id s2-shid
-         :parent-id uuid/zero
-         :frame-id uuid/zero
-         :components-v2 true
-         :obj (cts/setup-shape
-               {:id s2-shid
-                :name "image"
-                :frame-id uuid/zero
-                :parent-id uuid/zero
-                :type :rect
-                :fills [{:fill-opacity 1 :fill-image {:id (:id fmo1) :width 103 :height 100 :mtype "image/jpeg"}}]})}
+                :type :image
+                :metadata {:id (:id fmo1) :width 100 :height 100 :mtype "image/jpeg"}
+                :fills [{:opacity 1 :fill-image {:id (:id fmo2) :width 100 :height 100 :mtype "image/jpeg"}}]
+                :strokes [{:opacity 1 :stroke-image {:id (:id fmo3) :width 100 :height 100 :mtype "image/jpeg"}}]})}
         {:type :add-obj
          :page-id page-id
          :id t-shid
@@ -533,8 +500,7 @@
                                                              {:fills [{:fill-opacity 1
                                                                        :fill-color "#000000"}]
                                                               :text "bye"}]}]}]}
-                :strokes [{:stroke-opacity 1 :stroke-image {:id (:id fmo5) :width 100 :height 100 :mtype "image/jpeg"}}]})}])
-
+                :strokes [{:opacity 1 :stroke-image {:id (:id fmo5) :width 100 :height 100 :mtype "image/jpeg"}}]})}])
 
       ;; run the file-gc task immediately without forced min-age
       (t/is (false? (th/run-task! :file-gc {:file-id (:id file)})))
@@ -542,7 +508,7 @@
       ;; run the task again
       (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       (let [rows (th/db-query :file-data-fragment {:file-id (:id file)
@@ -572,13 +538,10 @@
        :vern 0
        :changes [{:type :del-obj
                   :page-id (first (get-in file [:data :pages]))
-                  :id s1-shid}
+                  :id s-shid}
                  {:type :del-obj
                   :page-id (first (get-in file [:data :pages]))
-                  :id t-shid}
-                 {:type :del-obj
-                  :page-id (first (get-in file [:data :pages]))
-                  :id s2-shid}])
+                  :id t-shid}])
 
       ;; Now, we have deleted the usage of pointers to the
       ;; file-media-objects, if we paste file-gc, they should be marked
@@ -587,7 +550,7 @@
 
       ;; This only removes unused fragments, file media are still
       ;; referenced on snapshots.
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       ;; Mark all snapshots to be a non-snapshot file change
@@ -597,7 +560,7 @@
       ;; Rerun file-gc and objects-gc task for the same file once all snapshots are
       ;; "expired/deleted"
       (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 6 (:processed res))))
 
       (let [rows (th/db-query :file-data-fragment {:file-id (:id file)
@@ -749,7 +712,7 @@
       ;; Now that file-gc have marked for deletion the object
       ;; thumbnail lets execute the objects-gc task which remove
       ;; the rows and mark as touched the storage object rows
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 5 (:processed res))))
 
       ;; Now that objects-gc have deleted the object thumbnail lets
@@ -778,7 +741,7 @@
         (t/is (= 1 (count rows)))
         (t/is (= 0 (count (remove (comp some? :deleted-at) rows)))))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         ;; (pp/pprint res)
         (t/is (= 3 (:processed res))))
 
@@ -913,7 +876,7 @@
                                      :profile-id (:id profile1)})]
     ;; file is not deleted because it does not meet all
     ;; conditions to be deleted.
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of files
@@ -944,7 +907,7 @@
         (t/is (= 0 (count result)))))
 
     ;; run permanent deletion (should be noop)
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age (dt/duration {:minutes 1})})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of file libraries of a after hard deletion
@@ -958,7 +921,7 @@
         (t/is (= 0 (count result)))))
 
     ;; run permanent deletion
-    (let [result (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed result))))
 
     ;; query the list of file libraries of a after hard deletion
@@ -1213,7 +1176,7 @@
         (t/is (= 2 (count rows)))
         (t/is (= 1 (count (remove :deleted-at rows)))))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 4 (:processed res))))
 
       (let [rows (th/db-query :file-tagged-object-thumbnail {:file-id (:id file)})]
@@ -1269,7 +1232,7 @@
         (t/is (= 2 (count rows)))
         (t/is (= 1 (count (remove (comp some? :deleted-at) rows)))))
 
-      (let [res (th/run-task! :objects-gc {})]
+      (let [res (th/run-task! :objects-gc {:min-age 0})]
         (t/is (= 2 (:processed res))))
 
       (let [rows (th/db-query :file-thumbnail {:file-id (:id file)})]
@@ -1288,7 +1251,7 @@
     (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
 
       ;; Preventive objects-gc
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed result))))
 
       ;; Check the number of fragments before adding the page
@@ -1309,7 +1272,7 @@
       (th/run-pending-tasks!))
 
       ;; Clean objects after file-gc
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed result))))
 
       ;; Check the number of fragments before adding the page
@@ -1361,7 +1324,7 @@
     (t/is (true? (th/run-task! :file-gc {:min-age 0 :file-id (:id file)})))
 
       ;; The objects-gc should remove unused fragments
-    (let [res (th/run-task! :objects-gc {})]
+    (let [res (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 2 (:processed res))))
 
       ;; Check the number of fragments before adding the page
@@ -1749,7 +1712,6 @@
         [{:fill-image
           {:id (:id fmedia)
            :name "test"
-           :mtype "image/jpeg"
            :width 200
            :height 200}}]]
 
@@ -1858,7 +1820,8 @@
       (t/is (= (:id file-2) (:file-id (get rows 1))))
       (t/is (nil? (:deleted-at (get rows 1)))))
 
-    (th/run-task! :objects-gc {})
+    (th/run-task! :objects-gc
+                  {:min-age 0})
 
     (let [rows (th/db-exec! ["SELECT * FROM file_media_object ORDER BY created_at ASC"])]
       (t/is (= 1 (count rows)))

backend/test/backend_tests/rpc_font_test.clj

@@ -7,7 +7,6 @@
 (ns backend-tests.rpc-font-test
   (:require
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.http :as http]
    [app.rpc :as-alias rpc]
@@ -145,7 +144,7 @@
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
-    (let [res (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [res (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 2 (:processed res))))
 
     (let [res (th/run-task! :storage-gc-touched {:min-age 0})]
@@ -205,7 +204,7 @@
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
-    (let [res (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [res (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed res))))
 
     (let [res (th/run-task! :storage-gc-touched {:min-age 0})]
@@ -264,7 +263,7 @@
       (t/is (= 0 (:freeze res)))
       (t/is (= 0 (:delete res))))
 
-    (let [res (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [res (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed res))))
 
     (let [res (th/run-task! :storage-gc-touched {:min-age 0})]

backend/test/backend_tests/rpc_media_test.clj

@@ -48,7 +48,7 @@
         (t/is (sto/object? mobj1))
         (t/is (sto/object? mobj2))
         (t/is (= 122785 (:size mobj1)))
-        (t/is (= 3297 (:size mobj2)))))))
+        (t/is (= 3299 (:size mobj2)))))))
 
 (t/deftest media-object-upload
   (let [prof   (th/create-profile* 1)
@@ -85,7 +85,7 @@
         (t/is (sto/object? mobj1))
         (t/is (sto/object? mobj2))
         (t/is (= 312043 (:size mobj1)))
-        (t/is (= 3890   (:size mobj2)))))))
+        (t/is (= 3901   (:size mobj2)))))))
 
 
 (t/deftest media-object-upload-idempotency
@@ -163,7 +163,7 @@
         (t/is (sto/object? mobj1))
         (t/is (sto/object? mobj2))
         (t/is (= 122785 (:size mobj1)))
-        (t/is (= 3297 (:size mobj2)))))))
+        (t/is (= 3299 (:size mobj2)))))))
 
 (t/deftest media-object-upload-command
   (let [prof   (th/create-profile* 1)
@@ -200,7 +200,7 @@
         (t/is (sto/object? mobj1))
         (t/is (sto/object? mobj2))
         (t/is (= 312043 (:size mobj1)))
-        (t/is (= 3890   (:size mobj2)))))))
+        (t/is (= 3901   (:size mobj2)))))))
 
 
 (t/deftest media-object-upload-idempotency-command

backend/test/backend_tests/rpc_profile_test.clj

@@ -209,16 +209,16 @@
                     ::rpc/profile-id (:id prof1)
                     :id (:id team1)}
             out    (th/command! params)]
-        ;; (th/print-result! out)
+      ;; (th/print-result! out)
 
         (let [team (th/db-get :team {:id (:id team1)} {::db/remove-deleted false})]
           (t/is (dt/instant? (:deleted-at team)))))
 
-      ;; Request profile to be deleted
+    ;; Request profile to be deleted
       (let [params {::th/type :delete-profile
                     ::rpc/profile-id (:id prof1)}
             out    (th/command! params)]
-        ;; (th/print-result! out)
+      ;; (th/print-result! out)
         (t/is (nil? (:result out)))
         (t/is (nil? (:error out)))))))
 
@@ -379,14 +379,15 @@
 (t/deftest prepare-register-and-register-profile-1
   (let [data  {::th/type :prepare-register-profile
                :email "user@example.com"
-               :fullname "foobar"
                :password "foobar"}
         out   (th/command! data)
         token (get-in out [:result :token])]
     (t/is (string? token))
 
     ;; try register without token
-    (let [data  {::th/type :register-profile}
+    (let [data  {::th/type :register-profile
+                 :fullname "foobar"
+                 :accept-terms-and-privacy true}
           out   (th/command! data)]
       ;; (th/print-result! out)
       (let [error (:error out)]
@@ -397,8 +398,11 @@
     ;; try correct register
     (let [data  {::th/type :register-profile
                  :token token
+                 :fullname "foobar"
                  :utm_campaign "utma"
-                 :mtm_campaign "mtma"}]
+                 :mtm_campaign "mtma"
+                 :accept-terms-and-privacy true
+                 :accept-newsletter-subscription true}]
       (let [{:keys [result error]} (th/command! data)]
         (t/is (nil? error))))
 
@@ -420,7 +424,6 @@
       ;; PREPARE REGISTER
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
-                   :fullname "foobar"
                    :password "foobar"}
             out   (th/command! data)
             token (get-in out [:result :token])]
@@ -429,7 +432,10 @@
 
       ;; DO REGISTRATION
       (let [data  {::th/type :register-profile
-                   :token @current-token}
+                   :token @current-token
+                   :fullname "foobar"
+                   :accept-terms-and-privacy true
+                   :accept-newsletter-subscription true}
             out   (th/command! data)]
         (t/is (nil? (:error out)))
         (t/is (= 1 (:call-count @mock))))
@@ -439,7 +445,6 @@
       ;; PREPARE REGISTER: second attempt
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
-                   :fullname "foobar"
                    :password "foobar"}
             out   (th/command! data)
             token (get-in out [:result :token])]
@@ -474,7 +479,6 @@
       ;; PREPARE REGISTER
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
-                   :fullname "foobar"
                    :password "foobar"}
             out   (th/command! data)
             token (get-in out [:result :token])]
@@ -483,7 +487,10 @@
 
       ;; DO REGISTRATION
       (let [data  {::th/type :register-profile
-                   :token @current-token}
+                   :token @current-token
+                   :fullname "foobar"
+                   :accept-terms-and-privacy true
+                   :accept-newsletter-subscription true}
             out   (th/command! data)]
         (t/is (nil? (:error out)))
         (t/is (= 1 (:call-count @mock))))
@@ -497,7 +504,6 @@
       ;; PREPARE REGISTER: second attempt
       (let [data  {::th/type :prepare-register-profile
                    :email "hello@example.com"
-                   :fullname "foobar"
                    :password "foobar"}
             out   (th/command! data)
             token (get-in out [:result :token])]
@@ -508,7 +514,10 @@
                       :return true}]
         ;; DO REGISTRATION: second attempt
         (let [data  {::th/type :register-profile
-                     :token @current-token}
+                     :token @current-token
+                     :fullname "foobar"
+                     :accept-terms-and-privacy true
+                     :accept-newsletter-subscription true}
               out   (th/command! data)]
           (t/is (nil? (:error out)))
           (t/is (= 0 (:call-count @mock))))))))
@@ -523,7 +532,6 @@
                                  :member-email "user@example.com"})
         data  {::th/type :prepare-register-profile
                :invitation-token itoken
-               :fullname "foobar"
                :email "user@example.com"
                :password "foobar"}
 
@@ -534,7 +542,8 @@
 
     (let [rtoken (:token result)
           data   {::th/type :register-profile
-                  :token rtoken}
+                  :token rtoken
+                  :fullname "foobar"}
 
           {:keys [result error] :as out} (th/command! data)]
         ;; (th/print-result! out)
@@ -554,7 +563,6 @@
         data  {::th/type :prepare-register-profile
                :invitation-token itoken
                :email "user@example.com"
-               :fullname "foobar"
                :password "foobar"}
         out   (th/command! data)]
 
@@ -574,7 +582,6 @@
                                    :member-email "user@example.com"})
           data  {::th/type :prepare-register-profile
                  :invitation-token itoken
-                 :fullname "foobar"
                  :email "user@example.com"
                  :password "foobar"}
           out (th/command! data)]
@@ -597,7 +604,6 @@
           data  {::th/type :prepare-register-profile
                  :invitation-token itoken
                  :email "user@example.com"
-                 :fullname "foobar"
                  :password "foobar"}
           out   (th/command! data)]
 
@@ -618,7 +624,6 @@
 
           data  {::th/type :prepare-register-profile
                  :invitation-token itoken
-                 :fullname "foobar"
                  :email "user@example.com"
                  :password "foobar"}
           out   (th/command! data)]
@@ -631,7 +636,6 @@
 (t/deftest prepare-register-with-registration-disabled
   (with-redefs [app.config/flags #{}]
     (let [data  {::th/type :prepare-register-profile
-                 :fullname "foobar"
                  :email "user@example.com"
                  :password "foobar"}
           out  (th/command! data)]
@@ -644,7 +648,6 @@
 (t/deftest prepare-register-with-existing-user
   (let [profile (th/create-profile* 1)
         data    {::th/type :prepare-register-profile
-                 :fullname "foobar"
                  :email (:email profile)
                  :password "foobar"}
         out     (th/command! data)]
@@ -657,7 +660,6 @@
 
   (let [pool  (:app.db/pool th/*system*)
         data  {::th/type :prepare-register-profile
-               :fullname "foobar"
                :email "user@example.com"
                :password "foobar"}]
 
@@ -672,7 +674,6 @@
 (t/deftest register-profile-with-complained-email
   (let [pool  (:app.db/pool th/*system*)
         data  {::th/type :prepare-register-profile
-               :fullname "foobar"
                :email "user@example.com"
                :password "foobar"}]
 
@@ -687,7 +688,6 @@
 
 (t/deftest register-profile-with-email-as-password
   (let [data {::th/type :prepare-register-profile
-              :fullname "foobar"
               :email "user@example.com"
               :password "USER@example.com"}
         out  (th/command! data)]

backend/test/backend_tests/rpc_project_test.clj

@@ -7,7 +7,6 @@
 (ns backend-tests.rpc-project-test
   (:require
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.http :as http]
    [app.rpc :as-alias rpc]
@@ -179,7 +178,7 @@
 
     ;; project is not deleted because it does not meet all
     ;; conditions to be deleted.
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of projects
@@ -211,7 +210,7 @@
         (t/is (= 1 (count result)))))
 
     ;; run permanent deletion (should be noop)
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age (dt/duration {:minutes 1})})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of files of a after soft deletion
@@ -225,7 +224,7 @@
         (t/is (= 0 (count result)))))
 
     ;; run permanent deletion
-    (let [result (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 1 (:processed result))))
 
     ;; query the list of files of a after hard deletion

backend/test/backend_tests/rpc_team_test.clj

@@ -8,7 +8,6 @@
   (:require
    [app.common.logging :as l]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.http :as http]
    [app.rpc :as-alias rpc]
@@ -450,26 +449,6 @@
       (t/is (nil? res)))))
 
 
-(t/deftest get-owned-teams
-  (let [profile1 (th/create-profile* 1 {:is-active true})
-        profile2 (th/create-profile* 2 {:is-active true})
-        team1    (th/create-team* 1 {:profile-id (:id profile1)})
-        team2    (th/create-team* 2 {:profile-id (:id profile2)})
-
-        params   {::th/type :get-owned-teams
-                  ::rpc/profile-id (:id profile1)}
-        out      (th/command! params)]
-
-    ;; (th/print-result! out)
-    (t/is (th/success? out))
-    (let [[item1 :as result] (:result out)]
-      (t/is (= 1 (count result)))
-      (t/is (= (:id team1) (:id item1)))
-      (t/is (= 1 (:total-members item1)))
-      (t/is (= 1 (:total-editors item1)))
-      (t/is (not= (:default-team-id profile1) (:id item1))))))
-
-
 (t/deftest team-deletion-1
   (let [profile1 (th/create-profile* 1 {:is-active true})
         team     (th/create-team* 1 {:profile-id (:id profile1)})
@@ -480,7 +459,7 @@
 
     ;; team is not deleted because it does not meet all
     ;; conditions to be deleted.
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age (dt/duration 0)})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of teams
@@ -514,7 +493,7 @@
     (th/run-pending-tasks!)
 
     ;; run permanent deletion (should be noop)
-    (let [result (th/run-task! :objects-gc {})]
+    (let [result (th/run-task! :objects-gc {:min-age (dt/duration {:minutes 1})})]
       (t/is (= 0 (:processed result))))
 
     ;; query the list of projects after hard deletion
@@ -528,7 +507,7 @@
         (t/is (= :not-found (:type edata)))))
 
     ;; run permanent deletion
-    (let [result (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [result (th/run-task! :objects-gc {:min-age (dt/duration 0)})]
       (t/is (= 2 (:processed result))))
 
     ;; query the list of projects of a after hard deletion
@@ -542,6 +521,7 @@
       (let [edata (-> out :error ex-data)]
         (t/is (= :not-found (:type edata)))))))
 
+
 (t/deftest team-deletion-2
   (let [storage (-> (:app.storage/storage th/*system*)
                     (assoc ::sto/backend :assets-fs))
@@ -584,7 +564,7 @@
       (t/is (= 1 (count rows)))
       (t/is (dt/instant? (:deleted-at (first rows)))))
 
-    (let [result (th/run-task! :objects-gc {:deletion-threshold (cf/get-deletion-delay)})]
+    (let [result (th/run-task! :objects-gc {:min-age 0})]
       (t/is (= 5 (:processed result))))))
 
 (t/deftest create-team-access-request

backend/yarn.lock

@@ -19,34 +19,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@isaacs/fs-minipass@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "@isaacs/fs-minipass@npm:4.0.1"
-  dependencies:
-    minipass: "npm:^7.0.4"
-  checksum: 10c0/c25b6dc1598790d5b55c0947a9b7d111cfa92594db5296c3b907e2f533c033666f692a3939eadac17b1c7c40d362d0b0635dc874cbfe3e70db7c2b07cc97a5d2
-  languageName: node
-  linkType: hard
-
-"@npmcli/agent@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@npmcli/agent@npm:3.0.0"
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
   dependencies:
     agent-base: "npm:^7.1.0"
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.1"
     lru-cache: "npm:^10.0.1"
     socks-proxy-agent: "npm:^8.0.3"
-  checksum: 10c0/efe37b982f30740ee77696a80c196912c274ecd2cb243bc6ae7053a50c733ce0f6c09fda085145f33ecf453be19654acca74b69e81eaad4c90f00ccffe2f9271
+  checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@npmcli/fs@npm:4.0.0"
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@npmcli/fs@npm:3.1.1"
   dependencies:
     semver: "npm:^7.3.5"
-  checksum: 10c0/c90935d5ce670c87b6b14fab04a965a3b8137e585f8b2a6257263bd7f97756dd736cb165bb470e5156a9e718ecd99413dccc54b1138c1a46d6ec7cf325982fe5
+  checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99
   languageName: node
   linkType: hard
 
@@ -57,17 +48,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "abbrev@npm:3.0.1"
-  checksum: 10c0/21ba8f574ea57a3106d6d35623f2c4a9111d9ee3e9a5be47baed46ec2457d2eac46e07a5c4a60186f88cb98abbe3e24f2d4cca70bc2b12f1692523e2209a9ccf
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.1.0, agent-base@npm:^7.1.2":
-  version: 7.1.3
-  resolution: "agent-base@npm:7.1.3"
-  checksum: 10c0/6192b580c5b1d8fb399b9c62bf8343d76654c2dd62afcb9a52b2cf44a8b6ace1e3b704d3fe3547d91555c857d3df02603341ff2cb961b9cfe2b12f9f3c38ee11
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
+  dependencies:
+    debug: "npm:^4.3.4"
+  checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50
+  languageName: node
+  linkType: hard
+
+"aggregate-error@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "aggregate-error@npm:3.1.0"
+  dependencies:
+    clean-stack: "npm:^2.0.0"
+    indent-string: "npm:^4.0.0"
+  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
   languageName: node
   linkType: hard
 
@@ -79,9 +82,9 @@ __metadata:
   linkType: hard
 
 "ansi-regex@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "ansi-regex@npm:6.1.0"
-  checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
   languageName: node
   linkType: hard
 
@@ -138,21 +141,21 @@ __metadata:
   linkType: hard
 
 "brace-expansion@npm:^1.1.7":
-  version: 1.1.12
-  resolution: "brace-expansion@npm:1.1.12"
+  version: 1.1.11
+  resolution: "brace-expansion@npm:1.1.11"
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 10c0/975fecac2bb7758c062c20d0b3b6288c7cc895219ee25f0a64a9de662dbac981ff0b6e89909c3897c1f84fa353113a721923afdec5f8b2350255b097f12b1f73
+  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
   languageName: node
   linkType: hard
 
 "brace-expansion@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "brace-expansion@npm:2.0.2"
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
   dependencies:
     balanced-match: "npm:^1.0.0"
-  checksum: 10c0/6d117a4c793488af86b83172deb6af143e94c17bc53b0b3cec259733923b4ca84679d506ac261f4ba3c7ed37c46018e2ff442f9ce453af8643ecd64f4a54e6cf
+  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
   languageName: node
   linkType: hard
 
@@ -172,11 +175,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^19.0.1":
-  version: 19.0.1
-  resolution: "cacache@npm:19.0.1"
+"cacache@npm:^18.0.0":
+  version: 18.0.3
+  resolution: "cacache@npm:18.0.3"
   dependencies:
-    "@npmcli/fs": "npm:^4.0.0"
+    "@npmcli/fs": "npm:^3.1.0"
     fs-minipass: "npm:^3.0.0"
     glob: "npm:^10.2.2"
     lru-cache: "npm:^10.0.1"
@@ -184,11 +187,11 @@ __metadata:
     minipass-collect: "npm:^2.0.1"
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
-    p-map: "npm:^7.0.2"
-    ssri: "npm:^12.0.0"
-    tar: "npm:^7.4.3"
-    unique-filename: "npm:^4.0.0"
-  checksum: 10c0/01f2134e1bd7d3ab68be851df96c8d63b492b1853b67f2eecb2c37bb682d37cb70bb858a16f2f0554d3c0071be6dfe21456a1ff6fa4b7eed996570d6a25ffe9c
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10c0/dfda92840bb371fb66b88c087c61a74544363b37a265023223a99965b16a16bbb87661fe4948718d79df6e0cc04e85e62784fbcf1832b2a5e54ff4c46fbb45b7
   languageName: node
   linkType: hard
 
@@ -211,10 +214,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chownr@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "chownr@npm:3.0.0"
-  checksum: 10c0/43925b87700f7e3893296c8e9c56cc58f926411cce3a6e5898136daaf08f08b9a8eb76d37d3267e707d0dcc17aed2e2ebdf5848c0c3ce95cf910a919935c1b10
+"chownr@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "chownr@npm:2.0.0"
+  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+  languageName: node
+  linkType: hard
+
+"clean-stack@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "clean-stack@npm:2.2.0"
+  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
   languageName: node
   linkType: hard
 
@@ -241,26 +251,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.6":
-  version: 7.0.6
-  resolution: "cross-spawn@npm:7.0.6"
+"cross-spawn@npm:^7.0.0":
+  version: 7.0.3
+  resolution: "cross-spawn@npm:7.0.3"
   dependencies:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: 10c0/053ea8b2135caff68a9e81470e845613e374e7309a47731e81639de3eaeb90c3d01af0e0b44d2ab9d50b43467223b88567dfeb3262db942dc063b9976718ffc1
+  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
   languageName: node
   linkType: hard
 
 "debug@npm:4, debug@npm:^4, debug@npm:^4.3.4":
-  version: 4.4.1
-  resolution: "debug@npm:4.4.1"
+  version: 4.3.4
+  resolution: "debug@npm:4.3.4"
   dependencies:
-    ms: "npm:^2.1.3"
+    ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
+  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
   languageName: node
   linkType: hard
 
@@ -309,21 +319,9 @@ __metadata:
   linkType: hard
 
 "exponential-backoff@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "exponential-backoff@npm:3.1.2"
-  checksum: 10c0/d9d3e1eafa21b78464297df91f1776f7fbaa3d5e3f7f0995648ca5b89c069d17055033817348d9f4a43d1c20b0eab84f75af6991751e839df53e4dfd6f22e844
-  languageName: node
-  linkType: hard
-
-"fdir@npm:^6.4.4":
-  version: 6.4.6
-  resolution: "fdir@npm:6.4.6"
-  peerDependencies:
-    picomatch: ^3 || ^4
-  peerDependenciesMeta:
-    picomatch:
-      optional: true
-  checksum: 10c0/45b559cff889934ebb8bc498351e5acba40750ada7e7d6bde197768d2fa67c149be8ae7f8ff34d03f4e1eb20f2764116e56440aaa2f6689e9a4aa7ef06acafe9
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
   languageName: node
   linkType: hard
 
@@ -337,12 +335,21 @@ __metadata:
   linkType: hard
 
 "foreground-child@npm:^3.1.0":
-  version: 3.3.1
-  resolution: "foreground-child@npm:3.3.1"
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
   dependencies:
-    cross-spawn: "npm:^7.0.6"
+    cross-spawn: "npm:^7.0.0"
     signal-exit: "npm:^4.0.1"
-  checksum: 10c0/8986e4af2430896e65bc2788d6679067294d6aee9545daefc84923a0a4b399ad9c7a3ea7bd8c0b2b80fdf4a92de4c69df3f628233ff3224260e9c1541a9e9ed3
+  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "fs-minipass@npm:2.1.0"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
   languageName: node
   linkType: hard
 
@@ -383,19 +390,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^10.2.2":
-  version: 10.4.5
-  resolution: "glob@npm:10.4.5"
+"glob@npm:^10.2.2, glob@npm:^10.3.10":
+  version: 10.3.16
+  resolution: "glob@npm:10.3.16"
   dependencies:
     foreground-child: "npm:^3.1.0"
     jackspeak: "npm:^3.1.2"
-    minimatch: "npm:^9.0.4"
-    minipass: "npm:^7.1.2"
-    package-json-from-dist: "npm:^1.0.0"
-    path-scurry: "npm:^1.11.1"
+    minimatch: "npm:^9.0.1"
+    minipass: "npm:^7.0.4"
+    path-scurry: "npm:^1.11.0"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e
+  checksum: 10c0/f7eb4c3e66f221f0be3967c02527047167967549bdf8ed1bd5f6277d43a35191af4e2bb8c89f07a79664958bae088fd06659e69a0f1de462972f1eab52a715e8
   languageName: node
   linkType: hard
 
@@ -414,9 +420,9 @@ __metadata:
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.1":
-  version: 4.2.0
-  resolution: "http-cache-semantics@npm:4.2.0"
-  checksum: 10c0/45b66a945cf13ec2d1f29432277201313babf4a01d9e52f44b31ca923434083afeca03f18417f599c9ab3d0e7b618ceb21257542338b57c54b710463b4a53e37
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
   languageName: node
   linkType: hard
 
@@ -431,12 +437,12 @@ __metadata:
   linkType: hard
 
 "https-proxy-agent@npm:^7.0.1":
-  version: 7.0.6
-  resolution: "https-proxy-agent@npm:7.0.6"
+  version: 7.0.4
+  resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
-    agent-base: "npm:^7.1.2"
+    agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 10c0/f729219bc735edb621fa30e6e84e60ee5d00802b8247aac0d7b79b0bd6d4b3294737a337b93b86a0bd9e68099d031858a39260c976dc14cdbba238ba1f8779ac
+  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
   languageName: node
   linkType: hard
 
@@ -463,6 +469,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"indent-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "indent-string@npm:4.0.0"
+  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+  languageName: node
+  linkType: hard
+
 "ip-address@npm:^9.0.5":
   version: 9.0.5
   resolution: "ip-address@npm:9.0.5"
@@ -505,6 +518,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-lambda@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-lambda@npm:1.0.1"
+  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+  languageName: node
+  linkType: hard
+
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
@@ -527,15 +547,15 @@ __metadata:
   linkType: hard
 
 "jackspeak@npm:^3.1.2":
-  version: 3.4.3
-  resolution: "jackspeak@npm:3.4.3"
+  version: 3.1.2
+  resolution: "jackspeak@npm:3.1.2"
   dependencies:
     "@isaacs/cliui": "npm:^8.0.2"
     "@pkgjs/parseargs": "npm:^0.11.0"
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 10c0/6acc10d139eaefdbe04d2f679e6191b3abf073f111edf10b1de5302c97ec93fffeb2fdd8681ed17f16268aa9dd4f8c588ed9d1d3bffbbfa6e8bf897cbb3149b9
+  checksum: 10c0/5f1922a1ca0f19869e23f0dc4374c60d36e922f7926c76fecf8080cc6f7f798d6a9caac1b9428327d14c67731fd551bb3454cb270a5e13a0718f3b3660ec3d5d
   languageName: node
   linkType: hard
 
@@ -547,35 +567,36 @@ __metadata:
   linkType: hard
 
 "lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
-  version: 10.4.3
-  resolution: "lru-cache@npm:10.4.3"
-  checksum: 10c0/ebd04fbca961e6c1d6c0af3799adcc966a1babe798f685bb84e6599266599cd95d94630b10262f5424539bc4640107e8a33aa28585374abf561d30d16f4b39fb
+  version: 10.2.2
+  resolution: "lru-cache@npm:10.2.2"
+  checksum: 10c0/402d31094335851220d0b00985084288136136992979d0e015f0f1697e15d1c86052d7d53ae86b614e5b058425606efffc6969a31a091085d7a2b80a8a1e26d6
   languageName: node
   linkType: hard
 
 "luxon@npm:^3.4.4":
-  version: 3.6.1
-  resolution: "luxon@npm:3.6.1"
-  checksum: 10c0/906d57a9dc4d1de9383f2e9223e378c298607c1b4d17b6657b836a3cd120feb1c1de3b5d06d846a3417e1ca764de8476e8c23b3cd4083b5cdb870adcb06a99d5
+  version: 3.4.4
+  resolution: "luxon@npm:3.4.4"
+  checksum: 10c0/02e26a0b039c11fd5b75e1d734c8f0332c95510f6a514a9a0991023e43fb233884da02d7f966823ffb230632a733fc86d4a4b1e63c3fbe00058b8ee0f8c728af
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^14.0.3":
-  version: 14.0.3
-  resolution: "make-fetch-happen@npm:14.0.3"
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.1
+  resolution: "make-fetch-happen@npm:13.0.1"
   dependencies:
-    "@npmcli/agent": "npm:^3.0.0"
-    cacache: "npm:^19.0.1"
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
     http-cache-semantics: "npm:^4.1.1"
+    is-lambda: "npm:^1.0.1"
     minipass: "npm:^7.0.2"
-    minipass-fetch: "npm:^4.0.0"
+    minipass-fetch: "npm:^3.0.0"
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
-    negotiator: "npm:^1.0.0"
-    proc-log: "npm:^5.0.0"
+    negotiator: "npm:^0.6.3"
+    proc-log: "npm:^4.2.0"
     promise-retry: "npm:^2.0.1"
-    ssri: "npm:^12.0.0"
-  checksum: 10c0/c40efb5e5296e7feb8e37155bde8eb70bc57d731b1f7d90e35a092fde403d7697c56fb49334d92d330d6f1ca29a98142036d6480a12681133a0a1453164cb2f0
+    ssri: "npm:^10.0.0"
+  checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e
   languageName: node
   linkType: hard
 
@@ -588,12 +609,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.4":
-  version: 9.0.5
-  resolution: "minimatch@npm:9.0.5"
+"minimatch@npm:^9.0.1":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed
+  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
   languageName: node
   linkType: hard
 
@@ -606,18 +627,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "minipass-fetch@npm:4.0.1"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.5
+  resolution: "minipass-fetch@npm:3.0.5"
   dependencies:
     encoding: "npm:^0.1.13"
     minipass: "npm:^7.0.3"
     minipass-sized: "npm:^1.0.3"
-    minizlib: "npm:^3.0.1"
+    minizlib: "npm:^2.1.2"
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/a3147b2efe8e078c9bf9d024a0059339c5a09c5b1dded6900a219c218cc8b1b78510b62dae556b507304af226b18c3f1aeb1d48660283602d5b6586c399eed5c
+  checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b
   languageName: node
   linkType: hard
 
@@ -657,68 +678,76 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
-  version: 7.1.2
-  resolution: "minipass@npm:7.1.2"
-  checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
   languageName: node
   linkType: hard
 
-"minizlib@npm:^3.0.1":
-  version: 3.0.2
-  resolution: "minizlib@npm:3.0.2"
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
+  version: 7.1.1
+  resolution: "minipass@npm:7.1.1"
+  checksum: 10c0/fdccc2f99c31083f45f881fd1e6971d798e333e078ab3c8988fb818c470fbd5e935388ad9adb286397eba50baebf46ef8ff487c8d3f455a69c6f3efc327bdff9
+  languageName: node
+  linkType: hard
+
+"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "minizlib@npm:2.1.2"
   dependencies:
-    minipass: "npm:^7.1.2"
-  checksum: 10c0/9f3bd35e41d40d02469cb30470c55ccc21cae0db40e08d1d0b1dff01cc8cc89a6f78e9c5d2b7c844e485ec0a8abc2238111213fdc5b2038e6d1012eacf316f78
+    minipass: "npm:^3.0.0"
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mkdirp@npm:3.0.1"
+"mkdirp@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
   bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 10c0/9f2b975e9246351f5e3a40dcfac99fcd0baa31fbfab615fe059fb11e51f10e4803c63de1f384c54d656e4db31d000e4767e9ef076a22e12a641357602e31d57d
+    mkdirp: bin/cmd.js
+  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
   languageName: node
   linkType: hard
 
-"ms@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "ms@npm:2.1.3"
-  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
+"ms@npm:2.1.2":
+  version: 2.1.2
+  resolution: "ms@npm:2.1.2"
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
   languageName: node
   linkType: hard
 
-"negotiator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "negotiator@npm:1.0.0"
-  checksum: 10c0/4c559dd52669ea48e1914f9d634227c561221dd54734070791f999c52ed0ff36e437b2e07d5c1f6e32909fc625fe46491c16e4a8f0572567d4dd15c3a4fda04b
+"negotiator@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "negotiator@npm:0.6.3"
+  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 11.2.0
-  resolution: "node-gyp@npm:11.2.0"
+  version: 10.1.0
+  resolution: "node-gyp@npm:10.1.0"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
+    glob: "npm:^10.3.10"
     graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^14.0.3"
-    nopt: "npm:^8.0.0"
-    proc-log: "npm:^5.0.0"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^3.0.0"
     semver: "npm:^7.3.5"
-    tar: "npm:^7.4.3"
-    tinyglobby: "npm:^0.2.12"
-    which: "npm:^5.0.0"
+    tar: "npm:^6.1.2"
+    which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10c0/bd8d8c76b06be761239b0c8680f655f6a6e90b48e44d43415b11c16f7e8c15be346fba0cbf71588c7cdfb52c419d928a7d3db353afc1d952d19756237d8f10b9
+  checksum: 10c0/9cc821111ca244a01fb7f054db7523ab0a0cd837f665267eb962eb87695d71fb1e681f9e21464cc2fd7c05530dc4c81b810bca1a88f7d7186909b74477491a3c
   languageName: node
   linkType: hard
 
 "nodemon@npm:^3.1.2":
-  version: 3.1.10
-  resolution: "nodemon@npm:3.1.10"
+  version: 3.1.2
+  resolution: "nodemon@npm:3.1.2"
   dependencies:
     chokidar: "npm:^3.5.2"
     debug: "npm:^4"
@@ -732,18 +761,18 @@ __metadata:
     undefsafe: "npm:^2.0.5"
   bin:
     nodemon: bin/nodemon.js
-  checksum: 10c0/95b64d647f2c22e85e375b250517b0a4b32c2d2392ad898444e331f70d6b1ab43b17f53a8a1d68d5879ab8401fc6cd6e26f0d2a8736240984f6b5a8435b407c0
+  checksum: 10c0/7a091067d766768fb6660b796194b01748bba5dc3f1e3ed3dd5f804bfa305e207d24635755078ee5e7cc53848cea35204901e0a6e51ac64483bb8e9ecb237c95
   languageName: node
   linkType: hard
 
-"nopt@npm:^8.0.0":
-  version: 8.1.0
-  resolution: "nopt@npm:8.1.0"
+"nopt@npm:^7.0.0":
+  version: 7.2.1
+  resolution: "nopt@npm:7.2.1"
   dependencies:
-    abbrev: "npm:^3.0.0"
+    abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 10c0/62e9ea70c7a3eb91d162d2c706b6606c041e4e7b547cbbb48f8b3695af457dd6479904d7ace600856bf923dd8d1ed0696f06195c8c20f02ac87c1da0e1d315ef
+  checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81
   languageName: node
   linkType: hard
 
@@ -754,17 +783,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-map@npm:^7.0.2":
-  version: 7.0.3
-  resolution: "p-map@npm:7.0.3"
-  checksum: 10c0/46091610da2b38ce47bcd1d8b4835a6fa4e832848a6682cf1652bc93915770f4617afc844c10a77d1b3e56d2472bb2d5622353fa3ead01a7f42b04fc8e744a5c
-  languageName: node
-  linkType: hard
-
-"package-json-from-dist@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "package-json-from-dist@npm:1.0.1"
-  checksum: 10c0/62ba2785eb655fec084a257af34dbe24292ab74516d6aecef97ef72d4897310bc6898f6c85b5cd22770eaa1ce60d55a0230e150fb6a966e3ecd6c511e23d164b
+"p-map@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-map@npm:4.0.0"
+  dependencies:
+    aggregate-error: "npm:^3.0.0"
+  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
   languageName: node
   linkType: hard
 
@@ -775,7 +799,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.11.1":
+"path-scurry@npm:^1.11.0":
   version: 1.11.1
   resolution: "path-scurry@npm:1.11.1"
   dependencies:
@@ -792,17 +816,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picomatch@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "picomatch@npm:4.0.2"
-  checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc
+"proc-log@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "proc-log@npm:3.0.0"
+  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
   languageName: node
   linkType: hard
 
-"proc-log@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "proc-log@npm:5.0.0"
-  checksum: 10c0/bbe5edb944b0ad63387a1d5b1911ae93e05ce8d0f60de1035b218cdcceedfe39dbd2c697853355b70f1a090f8f58fe90da487c85216bf9671f9499d1a897e9e3
+"proc-log@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "proc-log@npm:4.2.0"
+  checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9
   languageName: node
   linkType: hard
 
@@ -854,11 +878,11 @@ __metadata:
   linkType: hard
 
 "semver@npm:^7.3.5, semver@npm:^7.5.3":
-  version: 7.7.2
-  resolution: "semver@npm:7.7.2"
+  version: 7.6.2
+  resolution: "semver@npm:7.6.2"
   bin:
     semver: bin/semver.js
-  checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea
+  checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c
   languageName: node
   linkType: hard
 
@@ -902,23 +926,23 @@ __metadata:
   linkType: hard
 
 "socks-proxy-agent@npm:^8.0.3":
-  version: 8.0.5
-  resolution: "socks-proxy-agent@npm:8.0.5"
+  version: 8.0.3
+  resolution: "socks-proxy-agent@npm:8.0.3"
   dependencies:
-    agent-base: "npm:^7.1.2"
+    agent-base: "npm:^7.1.1"
     debug: "npm:^4.3.4"
-    socks: "npm:^2.8.3"
-  checksum: 10c0/5d2c6cecba6821389aabf18728325730504bf9bb1d9e342e7987a5d13badd7a98838cc9a55b8ed3cb866ad37cc23e1086f09c4d72d93105ce9dfe76330e9d2a6
+    socks: "npm:^2.7.1"
+  checksum: 10c0/4950529affd8ccd6951575e21c1b7be8531b24d924aa4df3ee32df506af34b618c4e50d261f4cc603f1bfd8d426915b7d629966c8ce45b05fb5ad8c8b9a6459d
   languageName: node
   linkType: hard
 
-"socks@npm:^2.8.3":
-  version: 2.8.5
-  resolution: "socks@npm:2.8.5"
+"socks@npm:^2.7.1":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
     ip-address: "npm:^9.0.5"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10c0/e427d0eb0451cfd04e20b9156ea8c0e9b5e38a8d70f21e55c30fbe4214eda37cfc25d782c63f9adc5fbdad6d062a0f127ef2cefc9a44b6fee2b9ea5d1ed10827
+  checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7
   languageName: node
   linkType: hard
 
@@ -946,12 +970,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "ssri@npm:12.0.0"
+"ssri@npm:^10.0.0":
+  version: 10.0.6
+  resolution: "ssri@npm:10.0.6"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 10c0/caddd5f544b2006e88fa6b0124d8d7b28208b83c72d7672d5ade44d794525d23b540f3396108c4eb9280dcb7c01f0bef50682f5b4b2c34291f7c5e211fd1417d
+  checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227
   languageName: node
   linkType: hard
 
@@ -1004,27 +1028,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^7.4.3":
-  version: 7.4.3
-  resolution: "tar@npm:7.4.3"
+"tar@npm:^6.1.11, tar@npm:^6.1.2":
+  version: 6.2.1
+  resolution: "tar@npm:6.2.1"
   dependencies:
-    "@isaacs/fs-minipass": "npm:^4.0.0"
-    chownr: "npm:^3.0.0"
-    minipass: "npm:^7.1.2"
-    minizlib: "npm:^3.0.1"
-    mkdirp: "npm:^3.0.1"
-    yallist: "npm:^5.0.0"
-  checksum: 10c0/d4679609bb2a9b48eeaf84632b6d844128d2412b95b6de07d53d8ee8baf4ca0857c9331dfa510390a0727b550fd543d4d1a10995ad86cdf078423fbb8d99831d
-  languageName: node
-  linkType: hard
-
-"tinyglobby@npm:^0.2.12":
-  version: 0.2.14
-  resolution: "tinyglobby@npm:0.2.14"
-  dependencies:
-    fdir: "npm:^6.4.4"
-    picomatch: "npm:^4.0.2"
-  checksum: 10c0/f789ed6c924287a9b7d3612056ed0cda67306cd2c80c249fd280cf1504742b12583a2089b61f4abbd24605f390809017240e250241f09938054c9b363e51c0a6
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    minipass: "npm:^5.0.0"
+    minizlib: "npm:^2.1.1"
+    mkdirp: "npm:^1.0.3"
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537
   languageName: node
   linkType: hard
 
@@ -1053,21 +1067,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-filename@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "unique-filename@npm:4.0.0"
+"unique-filename@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-filename@npm:3.0.0"
   dependencies:
-    unique-slug: "npm:^5.0.0"
-  checksum: 10c0/38ae681cceb1408ea0587b6b01e29b00eee3c84baee1e41fd5c16b9ed443b80fba90c40e0ba69627e30855570a34ba8b06702d4a35035d4b5e198bf5a64c9ddc
+    unique-slug: "npm:^4.0.0"
+  checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unique-slug@npm:5.0.0"
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: 10c0/d324c5a44887bd7e105ce800fcf7533d43f29c48757ac410afd42975de82cc38ea2035c0483f4de82d186691bf3208ef35c644f73aa2b1b20b8e651be5afd293
+  checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
   languageName: node
   linkType: hard
 
@@ -1082,14 +1096,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "which@npm:5.0.0"
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
   dependencies:
     isexe: "npm:^3.1.1"
   bin:
     node-which: bin/which.js
-  checksum: 10c0/e556e4cd8b7dbf5df52408c9a9dd5ac6518c8c5267c8953f5b0564073c66ed5bf9503b14d876d0e9c7844d4db9725fb0dcf45d6e911e17e26ab363dc3965ae7b
+  checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
   languageName: node
   linkType: hard
 
@@ -1116,8 +1130,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.17.0":
-  version: 8.18.2
-  resolution: "ws@npm:8.18.2"
+  version: 8.17.0
+  resolution: "ws@npm:8.17.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -1126,7 +1140,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/4b50f67931b8c6943c893f59c524f0e4905bbd183016cfb0f2b8653aa7f28dad4e456b9d99d285bbb67cca4fedd9ce90dfdfaa82b898a11414ebd66ee99141e4
+  checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990
   languageName: node
   linkType: hard
 
@@ -1136,10 +1150,3 @@ __metadata:
   checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
   languageName: node
   linkType: hard
-
-"yallist@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "yallist@npm:5.0.0"
-  checksum: 10c0/a499c81ce6d4a1d260d4ea0f6d49ab4da09681e32c3f0472dee16667ed69d01dae63a3b81745a24bd78476ec4fcf856114cb4896ace738e01da34b2c42235416
-  languageName: node
-  linkType: hard

common/deps.edn

@@ -1,10 +1,10 @@
 {:deps
- {org.clojure/clojure {:mvn/version "1.12.1"}
+ {org.clojure/clojure {:mvn/version "1.12.0"}
   org.clojure/data.json {:mvn/version "2.5.1"}
   org.clojure/tools.cli {:mvn/version "1.1.230"}
+  org.clojure/clojurescript {:mvn/version "1.12.38"}
   org.clojure/test.check {:mvn/version "1.1.1"}
   org.clojure/data.fressian {:mvn/version "1.1.0"}
-  org.clojure/clojurescript {:mvn/version "1.12.42"}
 
   ;; Logging
   org.apache.logging.log4j/log4j-api {:mvn/version "2.24.3"}
@@ -12,14 +12,14 @@
   org.apache.logging.log4j/log4j-web {:mvn/version "2.24.3"}
   org.apache.logging.log4j/log4j-jul {:mvn/version "2.24.3"}
   org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.24.3"}
-  org.slf4j/slf4j-api {:mvn/version "2.0.17"}
+  org.slf4j/slf4j-api {:mvn/version "2.0.16"}
   pl.tkowalcz.tjahzi/log4j2-appender {:mvn/version "0.9.32"}
 
-  selmer/selmer {:mvn/version "1.12.62"}
+  selmer/selmer {:mvn/version "1.12.61"}
   criterium/criterium {:mvn/version "0.4.6"}
 
   metosin/jsonista {:mvn/version "0.3.13"}
-  metosin/malli {:mvn/version "0.18.0"}
+  metosin/malli {:mvn/version "0.17.0"}
 
   expound/expound {:mvn/version "0.9.0"}
   com.cognitect/transit-clj {:mvn/version "1.0.333"}
@@ -28,9 +28,9 @@
   integrant/integrant {:mvn/version "0.13.1"}
 
   funcool/tubax {:mvn/version "2021.05.20-0"}
-  funcool/cuerdas {:mvn/version "2025.06.16-414"}
+  funcool/cuerdas {:mvn/version "2023.11.09-407"}
   funcool/promesa
-  {:git/sha "f52f58cfacf62f59eab717e2637f37729d0cc383"
+  {:git/sha "0c5ed6ad033515a2df4b55addea044f60e9653d0"
    :git/url "https://github.com/funcool/promesa"}
 
   funcool/datoteka
@@ -59,7 +59,7 @@
  {:dev
   {:extra-deps
    {org.clojure/tools.namespace {:mvn/version "RELEASE"}
-    thheller/shadow-cljs {:mvn/version "3.1.5"}
+    thheller/shadow-cljs {:mvn/version "3.0.3"}
     com.clojure-goes-fast/clj-async-profiler {:mvn/version "RELEASE"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}
     criterium/criterium {:mvn/version "RELEASE"}
@@ -68,7 +68,7 @@
 
   :build
   {:extra-deps
-   {io.github.clojure/tools.build {:git/tag "v0.10.9" :git/sha "e405aac"}}
+   {io.github.clojure/tools.build {:git/tag "v0.10.6" :git/sha "52cf7d6"}}
    :ns-default build}
 
   :test
@@ -76,9 +76,9 @@
    :extra-deps {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}
 
   :shadow-cljs
-  {:main-opts ["-m" "shadow.cljs.devtools.cli"]
-   :jvm-opts ["--sun-misc-unsafe-memory-access=allow"]}
+  {:main-opts ["-m" "shadow.cljs.devtools.cli"]}
 
   :outdated
   {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
    :main-opts ["-m" "antq.core"]}}}
+

common/package.json

@@ -4,20 +4,22 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC",
   "private": true,
-  "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c",
+  "packageManager": "yarn@4.8.1+sha512.bc946f2a022d7a1a38adfc15b36a66a3807a67629789496c3714dd1703d2e6c6b1c69ff9ec3b43141ac7a1dd853b7685638eb0074300386a59c18df351ef8ff6",
   "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "dependencies": {
-    "luxon": "^3.6.1"
+    "luxon": "^3.4.4",
+    "sax": "^1.4.1"
   },
   "devDependencies": {
-    "concurrently": "^9.1.2",
-    "nodemon": "^3.1.10",
+    "concurrently": "^9.0.1",
+    "nodemon": "^3.1.7",
+    "shadow-cljs": "3.0.3",
     "source-map-support": "^0.5.21",
-    "ws": "^8.18.2"
+    "ws": "^8.17.0"
   },
   "scripts": {
     "fmt:clj:check": "cljfmt check --parallel=false src/ test/",

common/src/app/common/buffer.cljc

@@ -1,165 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.buffer
-  "A collection of helpers and macros for work with byte buffers"
-  (:refer-clojure :exclude [clone])
-  (:require
-   [app.common.uuid :as uuid])
-  #?(:cljs
-     (:require-macros [app.common.buffer])
-     :clj
-     (:import [java.nio ByteBuffer ByteOrder])))
-
-(defmacro read-byte
-  [target offset]
-  (if (:ns &env)
-    `(.getInt8 ~target ~offset true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(long (.get ~target ~offset)))))
-
-(defmacro read-bool
-  [target offset]
-  (if (:ns &env)
-    `(== 1 (.getInt8 ~target ~offset true))
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(== 1 (.get ~target ~offset)))))
-
-(defmacro read-short
-  [target offset]
-  (if (:ns &env)
-    `(.getInt16 ~target ~offset true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(.getShort ~target ~offset))))
-
-(defmacro read-int
-  [target offset]
-  (if (:ns &env)
-    `(.getInt32 ~target ~offset true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(long (.getInt ~target ~offset)))))
-
-(defmacro read-float
-  [target offset]
-  (if (:ns &env)
-    `(.getFloat32 ~target ~offset true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(double (.getFloat ~target ~offset)))))
-
-(defmacro read-uuid
-  [target offset]
-  (if (:ns &env)
-    `(let [a# (.getUint32 ~target (+ ~offset 0) true)
-           b# (.getUint32 ~target (+ ~offset 4) true)
-           c# (.getUint32 ~target (+ ~offset 8) true)
-           d# (.getUint32 ~target (+ ~offset 12) true)]
-       (uuid/from-unsigned-parts a# b# c# d#))
-
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(try
-         (.order ~target ByteOrder/BIG_ENDIAN)
-         (let [msb# (.getLong ~target (+ ~offset 0))
-               lsb# (.getLong ~target (+ ~offset 8))]
-           (java.util.UUID. (long msb#) (long lsb#)))
-         (finally
-           (.order ~target ByteOrder/LITTLE_ENDIAN))))))
-
-(defmacro write-byte
-  [target offset value]
-  (if (:ns &env)
-    `(.setInt8 ~target ~offset ~value true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(.put ~target ~offset (unchecked-byte ~value)))))
-
-(defmacro write-short
-  [target offset value]
-  (if (:ns &env)
-    `(.setInt16 ~target ~offset ~value true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(.putShort ~target ~offset (unchecked-short ~value)))))
-
-(defmacro write-int
-  [target offset value]
-  (if (:ns &env)
-    `(.setInt32 ~target ~offset ~value true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(.putInt ~target ~offset (unchecked-int ~value)))))
-
-(defmacro write-float
-  [target offset value]
-  (if (:ns &env)
-    `(.setFloat32 ~target ~offset ~value true)
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
-      `(.putFloat ~target ~offset (unchecked-float ~value)))))
-
-(defmacro write-uuid
-  [target offset value]
-  (if (:ns &env)
-    `(let [barray# (uuid/get-u32 ~value)]
-       (.setUint32 ~target (+ ~offset 0)  (aget barray# 0) true)
-       (.setUint32 ~target (+ ~offset 4)  (aget barray# 1) true)
-       (.setUint32 ~target (+ ~offset 8)  (aget barray# 2) true)
-       (.setUint32 ~target (+ ~offset 12) (aget barray# 3) true))
-
-    (let [target (with-meta target {:tag 'java.nio.ByteBuffer})
-          value  (with-meta value {:tag 'java.util.UUID})]
-      `(try
-         (.order ~target ByteOrder/BIG_ENDIAN)
-         (.putLong ~target (+ ~offset 0) (.getMostSignificantBits ~value))
-         (.putLong ~target (+ ~offset 8) (.getLeastSignificantBits ~value))
-         (finally
-           (.order ~target ByteOrder/LITTLE_ENDIAN))))))
-
-(defn allocate
-  [size]
-  #?(:clj (let [buffer (ByteBuffer/allocate (int size))]
-            (.order buffer ByteOrder/LITTLE_ENDIAN))
-     :cljs (new js/DataView (new js/ArrayBuffer size))))
-
-(defn clone
-  [buffer]
-  #?(:clj
-     (let [src (.array ^ByteBuffer buffer)
-           len (alength ^bytes src)
-           dst (byte-array len)]
-       (System/arraycopy src 0 dst 0 len)
-       (let [buffer (ByteBuffer/wrap dst)]
-         (.order buffer ByteOrder/LITTLE_ENDIAN)))
-     :cljs
-     (let [buffer'  (.-buffer ^js/DataView buffer)
-           src-view (js/Uint32Array. buffer')
-           dst-buff (js/ArrayBuffer. (.-byteLength buffer'))
-           dst-view (js/Uint32Array. dst-buff)]
-       (.set dst-view src-view)
-       (js/DataView. dst-buff))))
-
-(defn equals?
-  [buffer-a buffer-b]
-  #?(:clj
-     (.equals ^ByteBuffer buffer-a
-              ^ByteBuffer buffer-b)
-
-     :cljs
-     (let [buffer-a (.-buffer buffer-a)
-           buffer-b (.-buffer buffer-b)]
-       (if (= (.-byteLength buffer-a)
-              (.-byteLength buffer-b))
-         (let [cb (js/Uint32Array. buffer-a)
-               ob (js/Uint32Array. buffer-b)
-               sz (alength cb)]
-           (loop [i 0]
-             (if (< i sz)
-               (if (== (aget ob i)
-                       (aget cb i))
-                 (recur (inc i))
-                 false)
-               true)))
-         false))))
-
-(defn buffer?
-  [o]
-  #?(:clj (instance? ByteBuffer o)
-     :cljs (instance? js/DataView o)))

common/src/app/common/data.cljc

@@ -33,16 +33,6 @@
 (def boolean-or-nil?
   (some-fn nil? boolean?))
 
-(defn in-range?
-  [size i]
-  (and (< i size) (>= i 0)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Commonly used transducers
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def xf:map-id (map :id))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Data Structures
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

common/src/app/common/exceptions.cljc

@@ -47,26 +47,10 @@
     `(try ~@exprs (catch Throwable e# nil))))
 
 (defmacro try!
-  [expr & {:keys [reraise-with on-exception]}]
-  (let [ex-sym
-        (gensym "exc")
-
-        generate-catch
-        (fn []
-          (cond
-            (map? reraise-with)
-            `(ex/raise ~@(mapcat identity reraise-with) :cause ~ex-sym)
-
-            on-exception
-            `(let [handler# ~on-exception]
-               (handler# ~ex-sym))
-
-            :else
-            ex-sym))]
-
-    (if (:ns &env)
-      `(try ~expr (catch :default ~ex-sym ~(generate-catch)))
-      `(try ~expr (catch Throwable ~ex-sym ~(generate-catch))))))
+  [& exprs]
+  (if (:ns &env)
+    `(try ~@exprs (catch :default e# e#))
+    `(try ~@exprs (catch Throwable e# e#))))
 
 (defn ex-info?
   [v]

common/src/app/common/files/builder.cljc

@@ -10,20 +10,20 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
+   [app.common.features :as cfeat]
    [app.common.files.changes :as ch]
-   ;; [app.common.features :as cfeat]
-   [app.common.files.helpers :as cph]
    [app.common.files.migrations :as fmig]
+   [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.schema :as sm]
    [app.common.svg :as csvg]
-   [app.common.time :as dt]
    [app.common.types.color :as types.color]
-   [app.common.types.component :as types.comp]
+   [app.common.types.component :as types.component]
+   [app.common.types.components-list :as types.components-list]
+   [app.common.types.container :as types.container]
    [app.common.types.file :as types.file]
    [app.common.types.page :as types.page]
-   [app.common.types.path :as types.path]
+   [app.common.types.pages-list :as types.pages-list]
    [app.common.types.shape :as types.shape]
    [app.common.types.typography :as types.typography]
    [app.common.uuid :as uuid]
@@ -37,36 +37,41 @@
 (def ^:private conjv (fnil conj []))
 (def ^:private conjs (fnil conj #{}))
 
-(defn- default-uuid
+(defn default-uuid
   [v]
   (or v (uuid/next)))
 
 (defn- track-used-name
-  [state name]
-  (let [container-id (::current-page-id state)]
-    (update-in state [::unames container-id] conjs name)))
+  [file name]
+  (let [container-id (::current-page-id file)]
+    (update-in file [::unames container-id] conjs name)))
 
 (defn- commit-change
-  [state change & {:keys [add-container]}]
-  (let [file-id (get state ::current-file-id)]
-    (assert (uuid? file-id) "no current file id")
+  [file change & {:keys [add-container]
+                  :or   {add-container false}}]
 
-    (let [change (cond-> change
-                   add-container
-                   (assoc :page-id  (::current-page-id state)
-                          :frame-id (::current-frame-id state)))]
-      (update-in state [::files file-id :data] ch/process-changes [change] false))))
+  (let [change (cond-> change
+                 add-container
+                 (assoc :page-id  (::current-page-id file)
+                        :frame-id (::current-frame-id file)))]
+    (-> file
+        (update ::changes conjv change)
+        (update :data ch/process-changes [change] false))))
+
+(defn- lookup-objects
+  [file]
+  (dm/get-in file [:data :pages-index (::current-page-id file) :objects]))
 
 (defn- commit-shape
-  [state shape]
+  [file shape]
   (let [parent-id
-        (-> state ::parent-stack peek)
+        (-> file ::parent-stack peek)
 
         frame-id
-        (get state ::current-frame-id)
+        (::current-frame-id file)
 
         page-id
-        (get state ::current-page-id)
+        (::current-page-id file)
 
         change
         {:type :add-obj
@@ -77,31 +82,39 @@
          :frame-id frame-id
          :page-id page-id}]
 
-    (-> state
+    (-> file
         (commit-change change)
         (track-used-name (:name shape)))))
 
+(defn- generate-name
+  [type data]
+  (if (= type :svg-raw)
+    (let [tag (dm/get-in data [:content :tag])]
+      (str "svg-" (cond (string? tag) tag
+                        (keyword? tag) (d/name tag)
+                        (nil? tag) "node"
+                        :else (str tag))))
+    (str/capital (d/name type))))
+
 (defn- unique-name
-  [name state]
-  (let [container-id (::current-page-id state)
-        unames       (dm/get-in state [:unames container-id])]
+  [name file]
+  (let [container-id (::current-page-id file)
+        unames (dm/get-in file [:unames container-id])]
     (d/unique-name name (or unames #{}))))
 
 (defn- clear-names [file]
   (dissoc file ::unames))
 
-(defn- assign-shape-name
+(defn- assign-name
   "Given a tag returns its layer name"
-  [shape state]
-  (cond-> shape
-    (nil? (:name shape))
-    (assoc :name (let [type (get shape :type)]
-                   (case type
-                     :frame "Board"
-                     (str/capital (d/name type)))))
+  [data file type]
+
+  (cond-> data
+    (nil? (:name data))
+    (assoc :name (generate-name type data))
 
     :always
-    (update :name unique-name state)))
+    (update :name unique-name file)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMAS
@@ -117,26 +130,25 @@
   (sm/decode-fn types.shape/schema:shape-attrs sm/json-transformer))
 
 (def decode-library-color
-  (sm/decode-fn types.color/schema:library-color sm/json-transformer))
+  (sm/decode-fn types.color/schema:color sm/json-transformer))
 
 (def decode-library-typography
   (sm/decode-fn types.typography/schema:typography sm/json-transformer))
 
-(def schema:add-component
+(def decode-component
+  (sm/decode-fn types.component/schema:component sm/json-transformer))
+
+(def schema:add-component-instance
   [:map
    [:component-id ::sm/uuid]
-   [:file-id {:optional true} ::sm/uuid]
-   [:name {:optional true} ::sm/text]
-   [:path {:optional true} ::sm/text]
-   [:frame-id {:optional true} ::sm/uuid]
-   [:page-id {:optional true} ::sm/uuid]])
+   [:x ::sm/safe-number]
+   [:y ::sm/safe-number]])
 
-(def ^:private check-add-component
-  (sm/check-fn schema:add-component
-               :hint "invalid arguments passed for add-component"))
+(def check-add-component-instance
+  (sm/check-fn schema:add-component-instance))
 
-(def decode-add-component
-  (sm/decode-fn schema:add-component sm/json-transformer))
+(def decode-add-component-instance
+  (sm/decode-fn schema:add-component-instance sm/json-transformer))
 
 (def schema:add-bool
   [:map
@@ -146,97 +158,37 @@
 (def decode-add-bool
   (sm/decode-fn schema:add-bool sm/json-transformer))
 
-(def ^:private check-add-bool
+(def check-add-bool
   (sm/check-fn schema:add-bool))
 
-(def schema:add-file-media
-  [:map
-   [:id {:optional true} ::sm/uuid]
-   [:name ::sm/text]
-   [:width ::sm/int]
-   [:height ::sm/int]])
-
-(def decode-add-file-media
-  (sm/decode-fn schema:add-file-media sm/json-transformer))
-
-(def check-add-file-media
-  (sm/check-fn schema:add-file-media))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; PUBLIC API
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn create-state
-  []
-  {})
-
-(defn get-current-page
-  [state]
-  (let [file-id (get state ::current-file-id)
-        page-id (get state ::current-page-id)]
-
-    (assert (uuid? file-id) "expected current-file-id to be assigned")
-    (assert (uuid? page-id) "expected current-page-id to be assigned")
-    (dm/get-in state [::files file-id :data :pages-index page-id])))
-
-(defn get-current-objects
-  [state]
-  (-> (get-current-page state)
-      (get :objects)))
-
-(defn get-shape
-  [state shape-id]
-  (-> (get-current-objects state)
+(defn lookup-shape [file shape-id]
+  (-> (lookup-objects file)
       (get shape-id)))
 
-;; WORKAROUND: A copy of features from staging for make the library
-;; generate files compatible with version released right now. This
-;; should be removed and replaced with cfeat/default-features when 2.8
-;; version is released
+(defn get-current-page
+  [file]
+  (let [page-id (::current-page-id file)]
+    (dm/get-in file [:data :pages-index page-id])))
 
-(def default-features
-  #{"fdata/shape-data-type"
-    "styles/v2"
-    "layout/grid"
-    "components/v2"
-    "plugins/runtime"
-    "design-tokens/v1"})
-
-;; WORKAROUND: the same as features
-(def available-migrations
-  (-> fmig/available-migrations
-      (disj "003-convert-path-content")
-      (disj "0002-clean-shape-interactions")
-      (disj "0003-fix-root-shape")))
-
-(defn add-file
-  [state params]
+(defn create-file
+  [params]
   (let [params (-> params
-                   (assoc :features default-features)
-                   (assoc :migrations available-migrations)
-                   (update :id default-uuid))
-        file   (types.file/make-file params :create-page false)]
-    (-> state
-        (update ::files assoc (:id file) file)
-        (assoc ::current-file-id (:id file)))))
-
-(declare close-page)
-
-(defn close-file
-  [state]
-  (let [state (-> state
-                  (close-page)
-                  (dissoc ::current-file-id))]
-    state))
+                   (assoc :features cfeat/default-features)
+                   (assoc :migrations fmig/available-migrations))]
+    (types.file/make-file params :create-page false)))
 
 (defn add-page
-  [state params]
+  [file params]
   (let [page   (-> (types.page/make-empty-page params)
                    (types.page/check-page))
         change {:type :add-page
                 :page page}]
 
-    (-> state
+    (-> file
         (commit-change change)
 
         ;; Current page being edited
@@ -251,233 +203,215 @@
         ;; Last object id added
         (assoc ::last-id nil))))
 
-(defn close-page [state]
-  (-> state
+(defn close-page [file]
+  (-> file
       (dissoc ::current-page-id)
       (dissoc ::parent-stack)
       (dissoc ::last-id)
       (clear-names)))
 
-(defn add-board
-  [state params]
+(defn add-artboard
+  [file data]
   (let [{:keys [id] :as shape}
-        (-> params
+        (-> data
             (update :id default-uuid)
             (assoc :type :frame)
-            (assign-shape-name state)
+            (assign-name file :frame)
             (types.shape/setup-shape)
             (types.shape/check-shape))]
 
-    (-> state
+    (-> file
         (commit-shape shape)
         (update ::parent-stack conjv id)
         (assoc ::current-frame-id id)
         (assoc ::last-id id))))
 
-(defn close-board
-  [state]
-  (let [parent-id (-> state ::parent-stack peek)
-        parent    (get-shape state parent-id)]
-    (-> state
+(defn close-artboard
+  [file]
+  (let [parent-id (-> file ::parent-stack peek)
+        parent    (lookup-shape file parent-id)]
+    (-> file
         (assoc ::current-frame-id (or (:frame-id parent) root-id))
         (update ::parent-stack pop))))
 
 (defn add-group
-  [state params]
+  [file params]
   (let [{:keys [id] :as shape}
         (-> params
             (update :id default-uuid)
             (assoc :type :group)
-            (assign-shape-name state)
+            (assign-name file :group)
             (types.shape/setup-shape)
             (types.shape/check-shape))]
-    (-> state
+    (-> file
         (commit-shape shape)
         (assoc ::last-id id)
         (update ::parent-stack conjv id))))
 
 (defn close-group
-  [state]
-  (let [group-id (-> state ::parent-stack peek)
-        group    (get-shape state group-id)
+  [file]
+  (let [group-id (-> file :parent-stack peek)
+        group    (lookup-shape file group-id)
         children (->> (get group :shapes)
-                      (into [] (keep (partial get-shape state)))
+                      (into [] (keep (partial lookup-shape file)))
                       (not-empty))]
 
     (assert (some? children) "group expect to have at least 1 children")
 
-    (let [state (if (:masked-group group)
-                  (let [mask  (first children)
-                        change {:type :mod-obj
-                                :id group-id
-                                :operations
-                                [{:type :set :attr :x :val (-> mask :selrect :x) :ignore-touched true}
-                                 {:type :set :attr :y :val (-> mask :selrect :y) :ignore-touched true}
-                                 {:type :set :attr :width :val (-> mask :selrect :width) :ignore-touched true}
-                                 {:type :set :attr :height :val (-> mask :selrect :height) :ignore-touched true}
-                                 {:type :set :attr :flip-x :val (-> mask :flip-x) :ignore-touched true}
-                                 {:type :set :attr :flip-y :val (-> mask :flip-y) :ignore-touched true}
-                                 {:type :set :attr :selrect :val (-> mask :selrect) :ignore-touched true}
-                                 {:type :set :attr :points :val (-> mask :points) :ignore-touched true}]}]
-                    (commit-change state change :add-container true))
-                  (let [group  (gsh/update-group-selrect group children)
-                        change {:type :mod-obj
-                                :id group-id
-                                :operations
-                                [{:type :set :attr :selrect :val (:selrect group) :ignore-touched true}
-                                 {:type :set :attr :points  :val (:points group) :ignore-touched true}
-                                 {:type :set :attr :x       :val (-> group :selrect :x) :ignore-touched true}
-                                 {:type :set :attr :y       :val (-> group :selrect :y) :ignore-touched true}
-                                 {:type :set :attr :width   :val (-> group :selrect :width) :ignore-touched true}
-                                 {:type :set :attr :height  :val (-> group :selrect :height) :ignore-touched true}]}]
+    (let [file (if (:masked-group group)
+                 (let [mask  (first children)
+                       change {:type :mod-obj
+                               :id group-id
+                               :operations
+                               [{:type :set :attr :x :val (-> mask :selrect :x) :ignore-touched true}
+                                {:type :set :attr :y :val (-> mask :selrect :y) :ignore-touched true}
+                                {:type :set :attr :width :val (-> mask :selrect :width) :ignore-touched true}
+                                {:type :set :attr :height :val (-> mask :selrect :height) :ignore-touched true}
+                                {:type :set :attr :flip-x :val (-> mask :flip-x) :ignore-touched true}
+                                {:type :set :attr :flip-y :val (-> mask :flip-y) :ignore-touched true}
+                                {:type :set :attr :selrect :val (-> mask :selrect) :ignore-touched true}
+                                {:type :set :attr :points :val (-> mask :points) :ignore-touched true}]}]
+                   (commit-change file change :add-container true))
+                 (let [group  (gsh/update-group-selrect group children)
+                       change {:type :mod-obj
+                               :id group-id
+                               :operations
+                               [{:type :set :attr :selrect :val (:selrect group) :ignore-touched true}
+                                {:type :set :attr :points  :val (:points group) :ignore-touched true}
+                                {:type :set :attr :x       :val (-> group :selrect :x) :ignore-touched true}
+                                {:type :set :attr :y       :val (-> group :selrect :y) :ignore-touched true}
+                                {:type :set :attr :width   :val (-> group :selrect :width) :ignore-touched true}
+                                {:type :set :attr :height  :val (-> group :selrect :height) :ignore-touched true}]}]
 
-                    (commit-change state change :add-container true)))]
-      (update state ::parent-stack pop))))
-
-(defn- update-bool-style-properties
-  [bool-shape objects]
-  (let [xform
-        (comp
-         (map (d/getf objects))
-         (remove cph/frame-shape?)
-         (remove types.comp/is-variant?))
-
-        children
-        (->> (get bool-shape :shapes)
-             (into [] xform)
-             (not-empty))]
-
-    (when-not children
-      (ex/raise :type :validation
-                :code :empty-children
-                :hint "expected a group with at least one shape for creating a bool"))
-
-    (let [head  (if (= type :difference)
-                  (first children)
-                  (last children))
-          fills (if (and (contains? head :svg-attrs) (empty? (:fills head)))
-                  types.path/default-bool-fills
-                  (get head :fills))]
-      (-> bool-shape
-          (assoc :fills fills)
-          (assoc :stroks (get head :strokes))))))
+                   (commit-change file change :add-container true)))]
+      (update file ::parent-stack pop))))
 
 (defn add-bool
-  [state params]
+  [file params]
   (let [{:keys [group-id type]}
         (check-add-bool params)
 
         group
-        (get-shape state group-id)
+        (lookup-shape file group-id)
 
-        objects
-        (get-current-objects state)
+        children
+        (->> (get group :shapes)
+             (not-empty))]
 
-        bool
-        (-> group
-            (assoc :type :bool)
-            (assoc :bool-type type)
-            (update-bool-style-properties objects)
-            (types.path/update-bool-shape objects))
+    (assert (some? children) "expect group to have at least 1 element")
 
-        selrect
-        (get bool :selrect)
+    (let [objects  (lookup-objects file)
+          bool     (-> group
+                       (assoc :type :bool)
+                       (gsh/update-bool objects))
+          change   {:type :mod-obj
+                    :id (:id bool)
+                    :operations
+                    [{:type :set :attr :content :val (:content bool) :ignore-touched true}
+                     {:type :set :attr :type :val :bool :ignore-touched true}
+                     {:type :set :attr :bool-type :val type :ignore-touched true}
+                     {:type :set :attr :selrect :val (:selrect bool) :ignore-touched true}
+                     {:type :set :attr :points  :val (:points bool) :ignore-touched true}
+                     {:type :set :attr :x       :val (-> bool :selrect :x) :ignore-touched true}
+                     {:type :set :attr :y       :val (-> bool :selrect :y) :ignore-touched true}
+                     {:type :set :attr :width   :val (-> bool :selrect :width) :ignore-touched true}
+                     {:type :set :attr :height  :val (-> bool :selrect :height) :ignore-touched true}]}]
 
-        operations
-        [{:type :set :attr :content :val (:content bool) :ignore-touched true}
-         {:type :set :attr :type :val :bool :ignore-touched true}
-         {:type :set :attr :bool-type :val type :ignore-touched true}
-         {:type :set :attr :selrect :val selrect :ignore-touched true}
-         {:type :set :attr :points :val (:points bool) :ignore-touched true}
-         {:type :set :attr :x :val (get selrect :x) :ignore-touched true}
-         {:type :set :attr :y :val (get selrect :y) :ignore-touched true}
-         {:type :set :attr :width :val (get selrect :width) :ignore-touched true}
-         {:type :set :attr :height :val (get selrect :height) :ignore-touched true}
-         {:type :set :attr :fills :val (:fills bool) :ignore-touched true}
-         {:type :set :attr :strokes :val (:strokes bool) :ignore-touched true}]
-
-        change
-        {:type :mod-obj
-         :id (:id bool)
-         :operations operations}]
-
-    (-> state
-        (commit-change change :add-container true)
-        (assoc ::last-id group-id))))
+      (-> file
+          (commit-change change :add-container true)
+          (assoc ::last-id group-id)))))
 
 (defn add-shape
-  [state params]
+  [file params]
   (let [obj (-> params
                 (d/update-when :svg-attrs csvg/attrs->props)
                 (types.shape/setup-shape)
-                (assign-shape-name state))]
-    (-> state
+                (assign-name file :type))]
+    (-> file
         (commit-shape obj)
         (assoc ::last-id (:id obj)))))
 
 (defn add-library-color
-  [state color]
+  [file color]
   (let [color  (-> color
-                   (update :opacity d/nilv 1)
                    (update :id default-uuid)
                    (types.color/check-library-color color))
-
         change {:type :add-color
                 :color color}]
-
-    (-> state
+    (-> file
         (commit-change change)
         (assoc ::last-id (:id color)))))
 
 (defn add-library-typography
-  [state typography]
+  [file typography]
   (let [typography (-> typography
                        (update :id default-uuid)
                        (d/without-nils))
         change     {:type :add-typography
                     :id (:id typography)
                     :typography typography}]
-    (-> state
+    (-> file
         (commit-change change)
         (assoc ::last-id (:id typography)))))
 
 (defn add-component
-  [state params]
-  (let [{:keys [component-id file-id page-id frame-id name path]}
-        (-> (check-add-component params)
-            (update :component-id default-uuid))
+  [file params]
+  (let [change1 {:type :add-component
+                 :id (or (:id params) (uuid/next))
+                 :name (:name params)
+                 :path (:path params)
+                 :main-instance-id (:main-instance-id params)
+                 :main-instance-page (:main-instance-page params)}
 
-        file-id
-        (or file-id (::current-file-id state))
+        comp-id (get change1 :id)
+
+        change2 {:type :mod-obj
+                 :id (:main-instance-id params)
+                 :operations
+                 [{:type :set :attr :component-root :val true}
+                  {:type :set :attr :component-id :val comp-id}
+                  {:type :set :attr :component-file :val (:id file)}]}]
+    (-> file
+        (commit-change change1)
+        (commit-change change2)
+        (assoc ::last-id comp-id)
+        (assoc ::current-frame-id comp-id))))
+
+(defn add-component-instance
+  [{:keys [id data] :as file} params]
+
+  (let [{:keys [component-id x y]}
+        (check-add-component-instance params)
+
+        component
+        (types.components-list/get-component data component-id)
 
         page-id
-        (or page-id (get state ::current-page-id))
+        (get file ::current-page-id)]
 
-        frame-id
-        (or frame-id (get state ::current-frame-id))
+    (assert (uuid? page-id) "page-id is expected to be set")
+    (assert (uuid? component) "component is expected to exist")
 
-        change1
-        (d/without-nils
-         {:type :add-component
-          :id component-id
-          :name (or name "anonmous")
-          :path path
-          :main-instance-id frame-id
-          :main-instance-page page-id})
+    ;; FIXME: this should be on files and not in pages-list
+    (let [page (types.pages-list/get-page (:data file) page-id)
+          pos  (gpt/point x y)
 
-        change2
-        {:type :mod-obj
-         :id frame-id
-         :page-id page-id
-         :operations
-         [{:type :set :attr :component-root :val true}
-          {:type :set :attr :main-instance :val true}
-          {:type :set :attr :component-id :val component-id}
-          {:type :set :attr :component-file :val file-id}]}]
+          [shape shapes]
+          (types.container/make-component-instance page component id pos)
 
-    (-> state
-        (commit-change change1)
-        (commit-change change2))))
+          file
+          (reduce #(commit-change %1
+                                  {:type :add-obj
+                                   :id (:id %2)
+                                   :page-id (:id page)
+                                   :parent-id (:parent-id %2)
+                                   :frame-id (:frame-id %2)
+                                   :ignore-touched true
+                                   :obj %2})
+                  file
+                  shapes)]
+
+      (assoc file ::last-id (:id shape)))))
 
 (defn delete-shape
   [file id]
@@ -489,12 +423,10 @@
     :id id}))
 
 (defn update-shape
-  [state shape-id f]
-  (let [page-id   (get state ::current-page-id)
-
-        objects   (get-current-objects state)
+  [file shape-id f]
+  (let [page-id   (::current-page-id file)
+        objects   (lookup-objects file)
         old-shape (get objects shape-id)
-
         new-shape (f old-shape)
         attrs     (d/concat-set
                    (keys old-shape)
@@ -508,7 +440,7 @@
               changes
               (conj changes {:type :set :attr attr :val new-val :ignore-touched true}))))]
 
-    (-> state
+    (-> file
         (commit-change
          {:type :mod-obj
           :operations (reduce generate-operation [] attrs)
@@ -517,12 +449,12 @@
         (assoc ::last-id shape-id))))
 
 (defn add-guide
-  [state guide]
+  [file guide]
   (let [guide (cond-> guide
                 (nil? (:id guide))
-                (update :id default-uuid))
-        page-id (::current-page-id state)]
-    (-> state
+                (assoc :id (uuid/next)))
+        page-id (::current-page-id file)]
+    (-> file
         (commit-change
          {:type :set-guide
           :page-id page-id
@@ -531,56 +463,24 @@
         (assoc ::last-id (:id guide)))))
 
 (defn delete-guide
-  [state id]
-  (let [page-id (::current-page-id state)]
-    (commit-change state
+  [file id]
+
+  (let [page-id (::current-page-id file)]
+    (commit-change file
                    {:type :set-guide
                     :page-id page-id
                     :id id
                     :params nil})))
 
 (defn update-guide
-  [state guide]
-  (let [page-id (::current-page-id state)]
-    (commit-change state
+  [file guide]
+  (let [page-id (::current-page-id file)]
+    (commit-change file
                    {:type :set-guide
                     :page-id page-id
                     :id (:id guide)
                     :params guide})))
 
-(defrecord BlobWrapper [mtype size blob])
-
-(defn add-file-media
-  [state params blob]
-  (assert (instance? BlobWrapper blob) "expect blob to be wrapped")
-
-  (let [media-id
-        (uuid/next)
-
-        file-id
-        (get state ::current-file-id)
-
-        {:keys [id width height name]}
-        (-> params
-            (update :id default-uuid)
-            (check-add-file-media params))]
-
-    (-> state
-        (update ::blobs assoc media-id blob)
-        (update ::media assoc media-id
-                {:id media-id
-                 :bucket "file-media-object"
-                 :content-type (get blob :mtype)
-                 :size (get blob :size)})
-        (update ::file-media assoc id
-                {:id id
-                 :created-at (dt/now)
-                 :name name
-                 :width width
-                 :height height
-                 :file-id file-id
-                 :media-id media-id
-                 :is-local true
-                 :mtype (get blob :mtype)})
-
-        (assoc ::last-id id))))
+(defn strip-image-extension [filename]
+  (let [image-extensions-re #"(\.png)|(\.jpg)|(\.jpeg)|(\.webp)|(\.gif)|(\.svg)$"]
+    (str/replace filename image-extensions-re "")))

common/src/app/common/files/changes.cljc

@@ -16,6 +16,7 @@
    [app.common.schema.desc-native :as smd]
    [app.common.schema.generators :as sg]
    [app.common.types.color :as ctc]
+   [app.common.types.colors-list :as ctcl]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
@@ -23,7 +24,6 @@
    [app.common.types.grid :as ctg]
    [app.common.types.page :as ctp]
    [app.common.types.pages-list :as ctpl]
-   [app.common.types.path :as path]
    [app.common.types.shape :as cts]
    [app.common.types.shape-tree :as ctst]
    [app.common.types.tokens-lib :as ctob]
@@ -47,14 +47,14 @@
      [:type [:= :assign]]
      ;; NOTE: the full decoding is happening on the handler because it
      ;; needs a proper context of the current shape and its type
-     [:value [:map-of :keyword ::sm/any]]
+     [:value [:map-of :keyword :any]]
      [:ignore-touched {:optional true} :boolean]
      [:ignore-geometry {:optional true} :boolean]]]
    [:set
     [:map {:title "SetOperation"}
      [:type [:= :set]]
      [:attr :keyword]
-     [:val ::sm/any]
+     [:val :any]
      [:ignore-touched {:optional true} :boolean]
      [:ignore-geometry {:optional true} :boolean]]]
    [:set-touched
@@ -238,10 +238,10 @@
       [:component-id {:optional true} ::sm/uuid]
       [:ignore-touched {:optional true} :boolean]
       [:parent-id ::sm/uuid]
-      [:shapes ::sm/any]
+      [:shapes :any]
       [:index {:optional true} [:maybe :int]]
-      [:after-shape {:optional true} ::sm/any]
-      [:allow-altering-copies {:optional true} :boolean]]]
+      [:after-shape {:optional true} :any]
+      [:component-swap {:optional true} :boolean]]]
 
     [:reorder-children
      [:map {:title "ReorderChildrenChange"}
@@ -250,14 +250,14 @@
       [:component-id {:optional true} ::sm/uuid]
       [:ignore-touched {:optional true} :boolean]
       [:parent-id ::sm/uuid]
-      [:shapes ::sm/any]]]
+      [:shapes :any]]]
 
     [:add-page
      [:map {:title "AddPageChange"}
       [:type [:= :add-page]]
       [:id {:optional true} ::sm/uuid]
       [:name {:optional true} :string]
-      [:page {:optional true} ::sm/any]]]
+      [:page {:optional true} :any]]]
 
     [:mod-page
      [:map {:title "ModPageChange"}
@@ -265,7 +265,7 @@
       [:id ::sm/uuid]
       ;; All props are optional, background can be nil because is the
       ;; way to remove already set background
-      [:background {:optional true} [:maybe ctc/schema:hex-color]]
+      [:background {:optional true} [:maybe ::ctc/rgb-color]]
       [:name {:optional true} :string]]]
 
     [:set-plugin-data schema:set-plugin-data-change]
@@ -291,12 +291,12 @@
     [:add-color
      [:map {:title "AddColorChange"}
       [:type [:= :add-color]]
-      [:color ctc/schema:library-color]]]
+      [:color ::ctc/color]]]
 
     [:mod-color
      [:map {:title "ModColorChange"}
       [:type [:= :mod-color]]
-      [:color ctc/schema:library-color]]]
+      [:color ::ctc/color]]]
 
     [:del-color
      [:map {:title "DelColorChange"}
@@ -310,12 +310,12 @@
     [:add-media
      [:map {:title "AddMediaChange"}
       [:type [:= :add-media]]
-      [:object ctf/schema:media]]]
+      [:object ::ctf/media-object]]]
 
     [:mod-media
      [:map {:title "ModMediaChange"}
       [:type [:= :mod-media]]
-      [:object ctf/schema:media]]]
+      [:object ::ctf/media-object]]]
 
     [:del-media
      [:map {:title "DelMediaChange"}
@@ -327,14 +327,14 @@
       [:type [:= :add-component]]
       [:id ::sm/uuid]
       [:name :string]
-      [:shapes {:optional true} [:vector {:gen/max 3} ::sm/any]]
+      [:shapes {:optional true} [:vector {:gen/max 3} :any]]
       [:path {:optional true} :string]]]
 
     [:mod-component
      [:map {:title "ModCompoenentChange"}
       [:type [:= :mod-component]]
       [:id ::sm/uuid]
-      [:shapes {:optional true} [:vector {:gen/max 3} ::sm/any]]
+      [:shapes {:optional true} [:vector {:gen/max 3} :any]]
       [:name {:optional true} :string]
       [:variant-id {:optional true} ::sm/uuid]
       [:variant-properties {:optional true} [:vector ::ctv/variant-property]]]]
@@ -377,7 +377,7 @@
     [:update-active-token-themes
      [:map {:title "UpdateActiveTokenThemes"}
       [:type [:= :update-active-token-themes]]
-      [:theme-paths [:set :string]]]]
+      [:theme-ids [:set :string]]]]
 
     [:rename-token-set-group
      [:map {:title "RenameTokenSetGroup"}
@@ -411,26 +411,21 @@
     [:set-tokens-lib
      [:map {:title "SetTokensLib"}
       [:type [:= :set-tokens-lib]]
-      [:tokens-lib ::sm/any]]]
+      [:tokens-lib :any]]]
 
     [:set-token-set
      [:map {:title "SetTokenSetChange"}
       [:type [:= :set-token-set]]
       [:set-name :string]
       [:group? :boolean]
-      [:token-set [:maybe [:fn ctob/token-set?]]]]]
+      [:token-set [:maybe ctob/schema:token-set-attrs]]]]
 
     [:set-token
      [:map {:title "SetTokenChange"}
       [:type [:= :set-token]]
       [:set-name :string]
       [:token-name :string]
-      [:token [:maybe ctob/schema:token-attrs]]]]
-
-    [:set-base-font-size
-     [:map {:title "ModBaseFontSize"}
-      [:type [:= :set-base-font-size]]
-      [:base-font-size :string]]]]])
+      [:token [:maybe ctob/schema:token-attrs]]]]]])
 
 (def schema:changes
   [:sequential {:gen/max 5 :gen/min 1} schema:change])
@@ -487,9 +482,7 @@
                                (cts/shape? shape-new))
                   (ex/raise :type :assertion
                             :code :data-validation
-                            :hint (str "invalid shape found after applying changes on file "
-                                       (:id data-new))
-                            :file-id (:id data-new)
+                            :hint "invalid shape found after applying changes"
                             ::sm/explain (cts/explain-shape shape-new))))))]
 
     (->> (into #{} (map :page-id) items)
@@ -746,7 +739,7 @@
                 group
 
                 (= :bool (:type group))
-                (path/update-bool-shape group objects)
+                (gsh/update-bool group objects)
 
                 (:masked-group group)
                 (->> (map lookup children)
@@ -761,7 +754,7 @@
       (d/update-in-when data [:components component-id :objects] reg-objects))))
 
 (defmethod process-change :mov-objects
-  [data {:keys [parent-id shapes index page-id component-id ignore-touched after-shape allow-altering-copies syncing]}]
+  [data {:keys [parent-id shapes index page-id component-id ignore-touched after-shape component-swap syncing]}]
   (letfn [(calculate-invalid-targets [objects shape-id]
             (let [reduce-fn #(into %1 (calculate-invalid-targets objects %2))]
               (->> (get-in objects [shape-id :shapes])
@@ -776,7 +769,7 @@
               (and shape
                    (not (invalid-targets parent-id))
                    (not (cfh/components-nesting-loop? objects shape-id parent-id))
-                   (or allow-altering-copies ;; In some cases (like a component swap) it's allowed to change the structure of a copy
+                   (or component-swap ;; On a component swap it's allowed to change the structure of a copy
                        syncing ;; If we are syncing the changes of a main component, it's allowed to change the structure of a copy
                        (and
                         (not (ctk/in-component-copy? (get objects (:parent-id shape)))) ;; We don't want to change the structure of component copies
@@ -927,15 +920,15 @@
 
 (defmethod process-change :add-color
   [data {:keys [color]}]
-  (ctc/add-color data color))
+  (ctcl/add-color data color))
 
 (defmethod process-change :mod-color
   [data {:keys [color]}]
-  (ctc/set-color data color))
+  (ctcl/set-color data color))
 
 (defmethod process-change :del-color
   [data {:keys [id]}]
-  (ctc/delete-color data id))
+  (ctcl/delete-color data id))
 
 ;; DEPRECATED: remove before 2.3
 (defmethod process-change :add-recent-color
@@ -1027,10 +1020,11 @@
                   (ctob/delete-set lib' set-name))
 
                 (not (ctob/get-set lib' set-name))
-                (ctob/add-set lib' token-set)
+                (ctob/add-set lib' (ctob/make-token-set token-set))
 
                 :else
-                (ctob/update-set lib' set-name (fn [_] token-set)))))))
+                (ctob/update-set lib' set-name (fn [prev-token-set]
+                                                 (ctob/make-token-set (merge prev-token-set token-set)))))))))
 
 (defmethod process-change :set-token-theme
   [data {:keys [group theme-name theme]}]
@@ -1051,9 +1045,9 @@
                                      (ctob/make-token-theme (merge prev-token-theme theme)))))))))
 
 (defmethod process-change :update-active-token-themes
-  [data {:keys [theme-paths]}]
+  [data {:keys [theme-ids]}]
   (update data :tokens-lib #(-> % (ctob/ensure-tokens-lib)
-                                (ctob/set-active-themes theme-paths))))
+                                (ctob/set-active-themes theme-ids))))
 
 (defmethod process-change :rename-token-set-group
   [data {:keys [set-group-path set-group-fname]}]
@@ -1074,13 +1068,6 @@
                                 (ctob/ensure-tokens-lib)
                                 (ctob/move-set-group from-path to-path before-path before-group))))
 
-;; === Base font size
-
-(defmethod process-change :set-base-font-size
-  [data {:keys [base-font-size]}]
-  (ctf/set-base-font-size data base-font-size))
-
-
 ;; === Operations
 
 (def ^:private decode-shape

common/src/app/common/files/changes_builder.cljc

@@ -18,26 +18,24 @@
    [app.common.schema :as sm]
    [app.common.types.component :as ctk]
    [app.common.types.file :as ctf]
-   [app.common.types.path :as path]
    [app.common.types.shape.layout :as ctl]
    [app.common.types.tokens-lib :as ctob]
    [app.common.uuid :as uuid]))
 
 ;; Auxiliary functions to help create a set of changes (undo + redo)
 
-(def schema:changes
-  (sm/register!
-   ^{::sm/type ::changes}
-   [:map {:title "changes"}
-    [:redo-changes vector?]
-    [:undo-changes seq?]
-    [:origin {:optional true} ::sm/any]
-    [:save-undo? {:optional true} boolean?]
-    [:stack-undo? {:optional true} boolean?]
-    [:undo-group {:optional true} ::sm/any]]))
+(sm/register!
+ ^{::sm/type ::changes}
+ [:map {:title "changes"}
+  [:redo-changes vector?]
+  [:undo-changes seq?]
+  [:origin {:optional true} any?]
+  [:save-undo? {:optional true} boolean?]
+  [:stack-undo? {:optional true} boolean?]
+  [:undo-group {:optional true} any?]])
 
 (def check-changes!
-  (sm/check-fn schema:changes))
+  (sm/check-fn ::changes))
 
 (defn empty-changes
   ([origin page-id]
@@ -126,40 +124,28 @@
 ; TODO: remove this when not needed
 (defn- assert-page-id!
   [changes]
-  (assert
-   (contains? (meta changes) ::page-id)
-   "Give a page-id or call (with-page) before using this function"))
-
-(defn- assert-page!
-  [changes]
-  (assert
-   (contains? (meta changes) ::page)
-   "Give a page or call (with-page) before using this function"))
+  (dm/assert!
+   "Give a page-id or call (with-page) before using this function"
+   (contains? (meta changes) ::page-id)))
 
 (defn- assert-container-id!
   [changes]
-  (assert
+  (dm/assert!
+   "Give a page-id or call (with-container) before using this function"
    (or (contains? (meta changes) ::page-id)
-       (contains? (meta changes) ::component-id))
-   "Give a page-id or call (with-container) before using this function"))
+       (contains? (meta changes) ::component-id))))
 
 (defn- assert-objects!
   [changes]
-  (assert
-   (contains? (meta changes) ::file-data)
-   "Call (with-objects) before using this function"))
+  (dm/assert!
+   "Call (with-objects) before using this function"
+   (contains? (meta changes) ::file-data)))
 
 (defn- assert-library!
   [changes]
-  (assert
-   (contains? (meta changes) ::library-data)
-   "Call (with-library-data) before using this function"))
-
-(defn- assert-file-data!
-  [changes]
-  (assert
-   (contains? (meta changes) ::file-data)
-   "Call (with-file-data) before using this function"))
+  (dm/assert!
+   "Call (with-library-data) before using this function"
+   (contains? (meta changes) ::library-data)))
 
 (defn- lookup-objects
   [changes]
@@ -168,9 +154,9 @@
 
 (defn apply-changes-local
   [changes & {:keys [apply-to-library?]}]
-  (assert
-   (check-changes! changes)
-   "expected valid changes")
+  (dm/assert!
+   "expected valid changes"
+   (check-changes! changes))
 
   (if-let [file-data (::file-data (meta changes))]
     (let [library-data  (::library-data (meta changes))
@@ -209,7 +195,6 @@
 
 (defn mod-page
   ([changes options]
-   (assert-page! changes)
    (let [page (::page (meta changes))]
      (mod-page changes page options)))
 
@@ -240,7 +225,6 @@
   ([changes type id namespace key value]
    (set-plugin-data changes type id nil namespace key value))
   ([changes type id page-id namespace key value]
-   (assert-file-data! changes)
    (let [data (::file-data (meta changes))
          old-val
          (case type
@@ -307,8 +291,6 @@
 
 (defn set-guide
   [changes id guide]
-  (assert-page-id! changes)
-  (assert-page! changes)
   (let [page-id (::page-id (meta changes))
         page    (::page (meta changes))
         old-val (dm/get-in page [:guides id])]
@@ -322,11 +304,8 @@
                                     :page-id page-id
                                     :id id
                                     :params old-val}))))
-
 (defn set-flow
   [changes id flow]
-  (assert-page-id! changes)
-  (assert-page! changes)
   (let [page-id (::page-id (meta changes))
         page    (::page (meta changes))
         old-val (dm/get-in page [:flows id])
@@ -345,8 +324,6 @@
 
 (defn set-comment-thread-position
   [changes {:keys [id frame-id position] :as thread}]
-  (assert-page-id! changes)
-  (assert-page! changes)
   (let [page-id (::page-id (meta changes))
         page    (::page (meta changes))
 
@@ -368,8 +345,6 @@
 
 (defn set-default-grid
   [changes type params]
-  (assert-page-id! changes)
-  (assert-page! changes)
   (let [page-id (::page-id (meta changes))
         page    (::page (meta changes))
         old-val (dm/get-in page [:grids type])
@@ -464,8 +439,8 @@
 
            (some? index)
            (assoc :index index)
-           (:allow-altering-copies options)
-           (assoc :allow-altering-copies true)
+           (:component-swap options)
+           (assoc :component-swap true)
            (:ignore-touched options)
            (assoc :ignore-touched true))
 
@@ -473,14 +448,12 @@
          (fn [undo-changes shape]
            (let [prev-sibling (cfh/get-prev-sibling objects (:id shape))]
              (conj undo-changes
-                   (cond-> {:type :mov-objects
-                            :page-id (::page-id (meta changes))
-                            :parent-id (:parent-id shape)
-                            :shapes [(:id shape)]
-                            :after-shape prev-sibling
-                            :index 0} ; index is used in case there is no after-shape (moving bottom shapes)
-                     (:allow-altering-copies options)
-                     (assoc :allow-altering-copies true)))))
+                   {:type :mov-objects
+                    :page-id (::page-id (meta changes))
+                    :parent-id (:parent-id shape)
+                    :shapes [(:id shape)]
+                    :after-shape prev-sibling
+                    :index 0}))) ; index is used in case there is no after-shape (moving bottom shapes)
 
          restore-touched-change
          {:type :mod-obj
@@ -686,10 +659,10 @@
                                  (empty? children) ;; a parent with no children will be deleted,
                                  nil               ;; so it does not need resize
 
-                                 (cfh/bool-shape? parent)
-                                 (path/update-bool-shape parent objects)
+                                 (= (:type parent) :bool)
+                                 (gsh/update-bool parent objects)
 
-                                 (cfh/group-shape? parent)
+                                 (= (:type parent) :group)
                                  ;; FIXME: this functions should be
                                  ;; normalized in the same way as
                                  ;; update-bool in order to make all
@@ -800,10 +773,10 @@
         (apply-changes-local))))
 
 (defn update-active-token-themes
-  [changes active-theme-paths prev-active-theme-paths]
+  [changes token-active-theme-ids prev-token-active-theme-ids]
   (-> changes
-      (update :redo-changes conj {:type :update-active-token-themes :theme-paths active-theme-paths})
-      (update :undo-changes conj {:type :update-active-token-themes :theme-paths prev-active-theme-paths})
+      (update :redo-changes conj {:type :update-active-token-themes :theme-ids token-active-theme-ids})
+      (update :undo-changes conj {:type :update-active-token-themes :theme-ids prev-token-active-theme-ids})
       (apply-changes-local)))
 
 (defn set-token-theme [changes group theme-name theme]
@@ -873,7 +846,6 @@
 
 (defn set-tokens-lib
   [changes tokens-lib]
-  (assert-library! changes)
   (let [library-data (::library-data (meta changes))
         prev-tokens-lib (get library-data :tokens-lib)]
     (-> changes
@@ -918,7 +890,7 @@
     (-> changes
         (update :redo-changes conj {:type :set-token-set
                                     :set-name name
-                                    :token-set (ctob/rename prev-token-set new-name)
+                                    :token-set (assoc prev-token-set :name new-name)
                                     :group? false})
         (update :undo-changes conj {:type :set-token-set
                                     :set-name new-name
@@ -939,11 +911,11 @@
                                     :group? group?})
         (update :undo-changes conj (if prev-token-set
                                      {:type :set-token-set
-                                      :set-name (if token-set
-                                                  ;; Undo of edit
-                                                  (ctob/get-name token-set)
-                                                  ;; Undo of delete
-                                                  set-name)
+                                      :set-name (or
+                                                 ;; Undo of edit
+                                                 (:name token-set)
+                                                 ;; Undo of delete
+                                                 set-name)
                                       :token-set prev-token-set
                                       :group? group?}
                                      ;; Undo of create
@@ -1163,16 +1135,3 @@
 (defn get-page-id
   [changes]
   (::page-id (meta changes)))
-
-(defn set-base-font-size
-  [changes new-base-font-size]
-  (assert-file-data! changes)
-  (let [file-data  (::file-data (meta changes))
-        previous-font-size (ctf/get-base-font-size file-data)]
-    (-> changes
-        (update :redo-changes conj {:type :set-base-font-size
-                                    :base-font-size new-base-font-size})
-
-        (update :undo-changes conj {:type :set-base-font-size
-                                    :base-font-size previous-font-size})
-        (apply-changes-local))))

common/src/app/common/files/helpers.cljc

@@ -117,12 +117,6 @@
   ([shape]
    (d/not-empty? (:shapes shape))))
 
-(defn has-layout?
-  "Returns true if the provided shape has a layout assigned"
-  [objects id]
-  (let [shape (get objects id)]
-    (boolean (and shape (:layout shape)))))
-
 (defn group-like-shape?
   ([objects id]
    (group-like-shape? (get objects id)))
@@ -133,41 +127,13 @@
 
 ;; ---- ACCESSORS
 
-(defn get-selected-type
-  "Returns the type of the shape if only one, or :multiple if more
-  than one"
-  [objects selected]
-  (if (= 1 (count selected))
-    (let [shape (get objects (first selected))]
-      (:type shape))
-    :multiple))
-
-(defn get-shape-type
-  "Returns the type of the shape, or 'root' if it's Root Frame, always
-  as string"
-  [objects id]
-  (let [shape (get objects id)]
-    (if (root? shape)
-      :root
-      (dm/get-prop shape :type))))
-
 (defn get-children-ids
-  "Returns the ids of all the descendants of the shape identified
-  by the id. Optionally, you can pass an ignore function to indicate
-  when to ignore a descendant (and all its descendants)"
-  ([objects id]
-   (get-children-ids objects id {}))
-  ([objects id {:keys [ignore-children-fn]
-                ;;ignore-children-fn should receive a shape and return a boolean
-                :or {ignore-children-fn (constantly false)}}]
-   (letfn [(get-children-ids-rec [id processed]
-             (when-not (contains? processed id)
-               (when-let [shapes (as-> (get objects id) $
-                                   (:shapes $)
-                                   (remove ignore-children-fn $)
-                                   (some-> $ vec))]
-                 (into shapes (mapcat #(get-children-ids-rec % (conj processed id))) shapes))))]
-     (get-children-ids-rec id #{}))))
+  [objects id]
+  (letfn [(get-children-ids-rec [id processed]
+            (when (not (contains? processed id))
+              (when-let [shapes (-> (get objects id) :shapes (some-> vec))]
+                (into shapes (mapcat #(get-children-ids-rec % (conj processed id))) shapes))))]
+    (get-children-ids-rec id #{})))
 
 (defn get-children-ids-with-self
   [objects id]
@@ -660,9 +626,6 @@
               (map? (:fill-image form))
               (update-in [:fill-image :id] lookup-index)
 
-              (map? (:stroke-image form))
-              (update-in [:stroke-image :id] lookup-index)
-
               ;; This covers old shapes and the new :fills.
               (uuid? (:fill-color-ref-file form))
               (update :fill-color-ref-file lookup-index)

common/src/app/common/files/migrations.cljc

@@ -22,17 +22,15 @@
    [app.common.schema :as sm]
    [app.common.svg :as csvg]
    [app.common.text :as txt]
-   [app.common.types.color :as types.color]
+   [app.common.types.color :as ctc]
    [app.common.types.component :as ctk]
    [app.common.types.container :as ctn]
    [app.common.types.file :as ctf]
-   [app.common.types.fill :as types.fill]
    [app.common.types.path :as path]
    [app.common.types.path.segment :as path.segment]
    [app.common.types.shape :as cts]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.shadow :as ctss]
-   [app.common.types.text :as cttx]
    [app.common.uuid :as uuid]
    [clojure.set :as set]
    [cuerdas.core :as str]))
@@ -60,21 +58,18 @@
   (map :name))
 
 (defn migrate
-  [{:keys [id] :as file} libs]
+  [{:keys [id] :as file}]
 
   (let [diff
         (set/difference available-migrations (:migrations file))
 
-        data (-> (:data file)
-                 (assoc :libs libs))
-
         data
-        (reduce migrate-data data diff)
+        (reduce migrate-data (:data file) diff)
 
         data
         (-> data
             (assoc :id id)
-            (dissoc :version :libs))]
+            (dissoc :version))]
 
     (-> file
         (assoc :data data)
@@ -93,35 +88,24 @@
     result))
 
 (defn migrate-file
-  [file libs]
+  [file]
   (binding [cfeat/*new* (atom #{})]
-    (let [version
-          (or (:version file) (-> file :data :version))
-
-          migrations
-          (not-empty (get file :migrations))
-
-          file
-          (-> file
-              (assoc :version cfd/version)
-              (assoc :migrations
-                     (if migrations
-                       migrations
-                       (generate-migrations-from-version version)))
-              ;; NOTE: in some future we can consider to apply a
-              ;; migration to the whole database and remove this code
-              ;; from this function that executes on each file
-              ;; migration operation
-              (update :features cfeat/migrate-legacy-features)
-              (migrate libs)
-              (update :features (fnil into #{}) (deref cfeat/*new*)))]
-
-      ;; NOTE: When we have no previous migrations, we report all
-      ;; migrations as migrated in order to correctly persist them all
-      ;; and not only the really applied migrations
-      (if (not migrations)
-        (vary-meta file assoc ::migrated (:migrations file))
-        file))))
+    (let [version (or (:version file)
+                      (-> file :data :version))]
+      (-> file
+          (assoc :version cfd/version)
+          (update :migrations
+                  (fn [migrations]
+                    (if (nil? migrations)
+                      (generate-migrations-from-version version)
+                      migrations)))
+          ;; NOTE: in some future we can consider to apply
+          ;; a migration to the whole database and remove
+          ;; this code from this function that executes on
+          ;; each file migration operation
+          (update :features cfeat/migrate-legacy-features)
+          (migrate)
+          (update :features (fnil into #{}) (deref cfeat/*new*))))))
 
 (defn migrated?
   [file]
@@ -838,7 +822,7 @@
         (d/update-when :components d/update-vals update-container))))
 
 (def ^:private valid-fill?
-  (sm/lazy-validator types.fill/schema:fill))
+  (sm/lazy-validator ::cts/fill))
 
 (defmethod migrate-data "legacy-43"
   [data _]
@@ -856,7 +840,7 @@
 
           (update-object [object]
             (if (cfh/text-shape? object)
-              (update object :content #(txt/transform-nodes txt/is-content-node? update-text-node %))
+              (update object :content #(txt/transform-nodes identity update-text-node %))
               object))
 
           (update-container [container]
@@ -1016,12 +1000,15 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
+(def ^:private valid-color?
+  (sm/lazy-validator ::ctc/color))
+
 (defmethod migrate-data "legacy-51"
   [data _]
   (let [update-colors
         (fn [colors]
-          (into {} (filter #(-> % val types.color/valid-library-color?) colors)))]
-    (d/update-when data :colors update-colors)))
+          (into {} (filter #(-> % val valid-color?) colors)))]
+    (update data :colors update-colors)))
 
 (defmethod migrate-data "legacy-52"
   [data _]
@@ -1035,6 +1022,7 @@
 
     (update data :pages-index d/update-vals update-page)))
 
+
 (defmethod migrate-data "legacy-53"
   [data _]
   (migrate-data data "legacy-26"))
@@ -1105,7 +1093,7 @@
                 ;; The text shape also can has fills on the text
                 ;; fragments so we need to fix fills there
                 (cond-> (cfh/text-shape? object)
-                  (update :content (partial txt/transform-nodes txt/is-content-node? fix-fills)))))
+                  (update :content (partial txt/transform-nodes identity fix-fills)))))
 
           (update-container [container]
             (d/update-when container :objects d/update-vals update-object))]
@@ -1277,21 +1265,21 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
-(defmethod migrate-data "0002-normalize-bool-content-v2"
+(defmethod migrate-data "0002-normalize-bool-content"
   [data _]
   (letfn [(update-object [object]
+            ;; NOTE: we still preserve the previous value for possible
+            ;; rollback, we still need to perform an other migration
+            ;; for properly delete the bool-content prop from shapes
+            ;; once the know the migration was OK
             (if (cfh/bool-shape? object)
-              (if (contains? object :content)
-                (dissoc object :bool-content)
-                (let [content (:bool-content object)]
-                  (-> object
-                      (assoc :content content)
-                      (dissoc :bool-content))))
-
+              (if-let [content (:bool-content object)]
+                (assoc object :content content)
+                object)
               (dissoc object :bool-content :bool-type)))
 
           (update-container [container]
-            (d/update-when container :objects d/update-vals update-object))]
+            (d/update-when container :objects update-vals update-object))]
 
     (-> data
         (update :pages-index d/update-vals update-container)
@@ -1319,240 +1307,23 @@
         (d/update-when :components d/update-vals update-container)
         (d/without-nils))))
 
-(defmethod migrate-data "0003-convert-path-content-v2"
+(defmethod migrate-data "0003-convert-path-content"
   [data _]
   (some-> cfeat/*new* (swap! conj "fdata/path-data"))
 
-  (let [decode-segments
-        (sm/decoder path/schema:segments sm/json-transformer)
-
-        update-object
-        (fn [object]
-          (if (or (cfh/bool-shape? object)
-                  (cfh/path-shape? object))
-            (let [content (get object :content)
-                  content (cond
-                            (path/content? content)
-                            content
-
-                            (nil? content)
-                            (path/content [])
-
-                            :else
-                            (-> content
-                                (decode-segments)
-                                (path/content)))]
-              (assoc object :content content))
-            object))
-
-        update-container
-        (fn [container]
-          (d/update-when container :objects d/update-vals update-object))]
-
-    (-> data
-        (update :pages-index d/update-vals update-container)
-        (d/update-when :components d/update-vals update-container))))
-
-(defmethod migrate-data "0004-clean-shadow-color"
-  [data _]
-  (let [decode-color (sm/decoder types.color/schema:color sm/json-transformer)
-
-        clean-shadow-color
-        (fn [color]
-          (let [ref-id   (get color :id)
-                ref-file (get color :file-id)]
-            (-> (d/without-qualified color)
-                (select-keys [:opacity :color :gradient :image :ref-id :ref-file])
-                (cond-> ref-id
-                  (assoc :ref-id ref-id))
-                (cond-> ref-file
-                  (assoc :ref-file ref-file))
-                (decode-color))))
-
-        clean-shadow
-        (fn [shadow]
-          (update shadow :color clean-shadow-color))
-
-        update-object
-        (fn [object]
-          (d/update-when object :shadow #(mapv clean-shadow %)))
-
-        update-container
-        (fn [container]
-          (d/update-when container :objects d/update-vals update-object))]
-
-    (-> data
-        (update :pages-index d/update-vals update-container)
-        (d/update-when :components d/update-vals update-container))))
-
-(defmethod migrate-data "0005-deprecate-image-type"
-  [data _]
   (letfn [(update-object [object]
-            (if (cfh/image-shape? object)
-              (let [metadata (:metadata object)
-                    fills (into [{:fill-image (assoc metadata :keep-aspect-ratio false)
-                                  :opacity    1}]
-                                (:fills object))]
-                (-> object
-                    (assoc :fills fills)
-                    (dissoc :metadata)
-                    (assoc :type :rect)))
+            (if (or (cfh/bool-shape? object)
+                    (cfh/path-shape? object))
+              (update object :content path/content)
               object))
 
           (update-container [container]
-            (d/update-when container :objects d/update-vals update-object))]
+            (d/update-when container :objects update-vals update-object))]
 
     (-> data
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
-(defmethod migrate-data "0006-fix-old-texts-fills"
-  [data _]
-  (letfn [(fix-fills [node]
-            (let [fills (if (and (not (seq (:fills node)))
-                                 (or (some? (:fill-color node))
-                                     (some? (:fill-opacity node))
-                                     (some? (:fill-color-gradient node))))
-                          [(d/without-nils (select-keys node [:fill-color :fill-opacity :fill-color-gradient
-                                                              :fill-color-ref-id :fill-color-ref-file]))]
-                          (:fills node))]
-              (-> node
-                  (assoc :fills fills)
-                  (dissoc :fill-color :fill-opacity :fill-color-gradient
-                          :fill-color-ref-id :fill-color-ref-file))))
-
-          (update-object [object]
-            (if (cfh/text-shape? object)
-              (update object :content (partial txt/transform-nodes txt/is-content-node? fix-fills))
-              object))
-
-          (update-container [container]
-            (d/update-when container :objects d/update-vals update-object))]
-
-    (-> data
-        (update :pages-index d/update-vals update-container)
-        (d/update-when :components d/update-vals update-container))))
-
-(def ^:private valid-stroke?
-  (sm/lazy-validator cts/schema:stroke))
-
-(defmethod migrate-data "0007-clear-invalid-strokes-and-fills-v2"
-  [data _]
-  (letfn [(clear-color-image [image]
-            (select-keys image types.color/image-attrs))
-
-          (clear-color-gradient [gradient]
-            (select-keys gradient types.color/gradient-attrs))
-
-          (clear-stroke [stroke]
-            (-> stroke
-                (select-keys cts/stroke-attrs)
-                (d/update-when :stroke-color-gradient clear-color-gradient)
-                (d/update-when :stroke-image clear-color-image)
-                (d/update-when :stroke-style #(if (#{:svg :none} %) :solid %))))
-
-          (fix-strokes [strokes]
-            (->> (map clear-stroke strokes)
-                 (filterv valid-stroke?)))
-
-          ;; Fixes shapes with nested :fills in the :fills attribute
-          ;; introduced in a migration `0006-fix-old-texts-fills` when
-          ;; txt/transform-nodes with identity pred was broken
-          (remove-nested-fills [[fill :as fills]]
-            (if (and (= 1 (count fills))
-                     (contains? fill :fills))
-              (:fills fill)
-              fills))
-
-          (clear-fill [fill]
-            (-> fill
-                (select-keys types.fill/fill-attrs)
-                (d/update-when :fill-image clear-color-image)
-                (d/update-when :fill-color-gradient clear-color-gradient)))
-
-          (fix-fills [fills]
-            (->> fills
-                 (remove-nested-fills)
-                 (map clear-fill)
-                 (filterv valid-fill?)))
-
-          (fix-object [object]
-            (-> object
-                (d/update-when :strokes fix-strokes)
-                (d/update-when :fills fix-fills)))
-
-          (fix-text-content [content]
-            (->> content
-                 (txt/transform-nodes txt/is-content-node? fix-object)
-                 (txt/transform-nodes txt/is-paragraph-set-node? #(dissoc % :fills))))
-
-          (update-shape [object]
-            (-> object
-                (fix-object)
-                ;; The text shape also can has strokes and fils on the
-                ;; text fragments so we need to fix them there
-                (cond-> (cfh/text-shape? object)
-                  (update :content fix-text-content))))
-
-          (update-container [container]
-            (d/update-when container :objects d/update-vals update-shape))]
-
-    (-> data
-        (update :pages-index d/update-vals update-container)
-        (d/update-when :components d/update-vals update-container))))
-
-(defmethod migrate-data "0008-fix-library-colors-v4"
-  [data _]
-  (letfn [(clear-color-opacity [color]
-            (if (and (contains? color :opacity)
-                     (nil? (get color :opacity)))
-              (assoc color :opacity 1)
-              color))
-
-          (clear-color [color]
-            (-> color
-                (select-keys types.color/library-color-attrs)
-                (clear-color-opacity)
-                (d/without-nils)))]
-
-    (d/update-when data :colors d/update-vals clear-color)))
-
-(defmethod migrate-data "0009-clean-library-colors"
-  [data _]
-  (d/update-when data :colors
-                 (fn [colors]
-                   (reduce-kv (fn [colors id color]
-                                (if (types.color/valid-library-color? color)
-                                  colors
-                                  (dissoc colors id)))
-                              colors
-                              colors))))
-
-(defmethod migrate-data "0009-add-partial-text-touched-flags"
-  [data _]
-  (letfn [(update-object [page object]
-            (if (and (cfh/text-shape? object)
-                     (ctk/in-component-copy? object))
-              (let [file            {:id (:id data) :data data}
-                    libs            (when (:libs data)
-                                      (deref (:libs data)))
-                    ref-shape       (ctf/find-ref-shape file page libs object
-                                                        {:include-deleted? true :with-context? true})
-                    partial-touched (when ref-shape
-                                      (cttx/get-diff-type (:content object) (:content ref-shape)))]
-                (if (seq partial-touched)
-                  (update object :touched (fn [touched]
-                                            (reduce #(ctk/set-touched-group %1 %2)
-                                                    touched
-                                                    partial-touched)))
-                  object))
-              object))
-
-          (update-page [page]
-            (d/update-when page :objects d/update-vals (partial update-object page)))]
-
-    (update data :pages-index d/update-vals update-page)))
-
 (def available-migrations
   (into (d/ordered-set)
         ["legacy-2"
@@ -1608,14 +1379,7 @@
          "legacy-66"
          "legacy-67"
          "0001-remove-tokens-from-groups"
-         "0002-normalize-bool-content-v2"
+         "0002-normalize-bool-content"
          "0002-clean-shape-interactions"
          "0003-fix-root-shape"
-         "0003-convert-path-content-v2"
-         "0004-clean-shadow-color"
-         "0005-deprecate-image-type"
-         "0006-fix-old-texts-fills"
-         "0007-clear-invalid-strokes-and-fills-v2"
-         "0008-fix-library-colors-v4"
-         "0009-clean-library-colors"
-         "0009-add-partial-text-touched-flags"]))
+         "0003-convert-path-content"]))

common/src/app/common/files/repair.cljc

@@ -96,7 +96,7 @@
   (log/dbg :hint "repairing shape :invalid-parent" :id (:id shape) :name (:name shape) :page-id page-id)
   (-> (pcb/empty-changes nil page-id)
       (pcb/with-file-data file-data)
-      (pcb/change-parent (:parent-id args) [shape] nil {:allow-altering-copies true})))
+      (pcb/change-parent (:parent-id args) [shape] nil {:component-swap true})))
 
 (defmethod repair-error :frame-not-found
   [_ {:keys [shape page-id] :as error} file-data _]
@@ -387,7 +387,7 @@
     (-> (pcb/empty-changes nil page-id)
         (pcb/with-file-data file-data)
         (pcb/update-shapes [(:id shape)] repair-shape)
-        (pcb/change-parent uuid/zero [shape] nil {:allow-altering-copies true}))))
+        (pcb/change-parent uuid/zero [shape] nil {:component-swap true}))))
 
 (defmethod repair-error :root-copy-not-allowed
   [_ {:keys [shape page-id] :as error} file-data _]
@@ -602,6 +602,11 @@
   (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
   file)
 
+(defmethod repair-error :variant-no-properties
+  [_ error file _]
+  (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))
+  file)
+
 (defmethod repair-error :variant-bad-variant-name
   [_ error file _]
   (log/error :hint "Variant error code, we don't want to auto repair it for now" :code (:code error))

common/src/app/common/files/shapes_helpers.cljc

@@ -91,10 +91,10 @@
            parent-id    (or parent-id (get selected-obj :parent-id))
            base-parent  (get objects parent-id)
 
-           layout-attrs
+           layout-props
            (when (and (= 1 (count selected))
                       (ctl/any-layout? base-parent))
-             (select-keys selected-obj ctl/layout-child-attrs))
+             (select-keys selected-obj ctl/layout-item-props))
 
            target-cell-id
            (if (and (nil? target-cell-id)
@@ -129,8 +129,8 @@
                      :parent-id parent-id
                      :shapes (into [] selected))
 
-              (some? layout-attrs)
-              (d/patch-object layout-attrs)
+              (some? layout-props)
+              (d/patch-object layout-props)
 
               ;; Frames from shapes will not be displayed in viewer and no clipped
               (or (not= frame-id uuid/zero) without-fill?)

common/src/app/common/files/validate.cljc

@@ -68,6 +68,7 @@
     :variant-bad-name
     :variant-bad-variant-name
     :variant-component-bad-name
+    :variant-no-properties
     :variant-component-bad-id})
 
 (def ^:private schema:error
@@ -588,7 +589,11 @@
     (when-not (ctk/is-variant? main-component)
       (report-error :not-a-variant
                     (str/ffmt "Shape % should be a variant" (:id main-component))
-                    main-component file component-page))))
+                    main-component file component-page))
+    (when (< (count (:variant-properties component)) 1)
+      (report-error :variant-no-properties
+                    (str/ffmt "Component variant % should have properties" (:id main-component))
+                    main-component file nil))))
 
 (defn- check-component
   "Validate semantic coherence of a component. Report all errors found."

common/src/app/common/files/variant.cljc

@@ -8,7 +8,8 @@
    [app.common.data.macros :as dm]
    [app.common.types.component :as ctc]
    [app.common.types.components-list :as ctcl]
-   [app.common.types.variant :as ctv]))
+   [app.common.types.variant :as ctv]
+   [cuerdas.core :as str]))
 
 
 (defn find-variant-components
@@ -20,6 +21,11 @@
        (map #(ctcl/get-component data % true))
        reverse))
 
+(defn- dashes-to-end
+  [property-values]
+  (let [dashes (if (some #(= % "--") property-values) ["--"] [])]
+    (concat (remove #(= % "--") property-values) dashes)))
+
 
 (defn extract-properties-names
   [shape data]
@@ -36,7 +42,10 @@
        (group-by :name)
        (map (fn [[k v]]
               {:name k
-               :value (->> v (map :value) distinct)}))))
+               :value (->> v
+                           (map #(if (str/empty? (:value %)) "--" (:value %)))
+                           distinct
+                           dashes-to-end)}))))
 
 (defn get-variant-mains
   [component data]

common/src/app/common/flags.cljc

@@ -116,8 +116,6 @@
     :terms-and-privacy-checkbox
     ;; Only for developtment.
     :tiered-file-data-storage
-    :token-units
-    :token-typography-types
     :transit-readable-response
     :user-feedback
     ;; TODO: remove this flag.
@@ -128,8 +126,7 @@
     :render-wasm-dpr
     :hide-release-modal
     :subscriptions
-    :subscriptions-old
-    :frontend-binary-fills})
+    :subscriptions-old})
 
 (def all-flags
   (set/union email login varia))
@@ -150,8 +147,7 @@
    :enable-onboarding
    :enable-dashboard-templates-section
    :enable-google-fonts-provider
-   :enable-component-thumbnails
-   :enable-render-wasm-dpr])
+   :enable-component-thumbnails])
 
 (defn parse
   [& flags]

common/src/app/common/geom/shapes.cljc

@@ -164,6 +164,7 @@
 (dm/export gtr/calculate-geometry)
 (dm/export gtr/update-group-selrect)
 (dm/export gtr/update-mask-selrect)
+(dm/export gtr/update-bool)
 (dm/export gtr/apply-transform)
 (dm/export gtr/transform-shape)
 (dm/export gtr/transform-selrect)
@@ -194,7 +195,6 @@
 
 ;; Rect
 (dm/export grc/rect->points)
-(dm/export grc/center->rect)
 
 ;;
 (dm/export gsff/fit-frame-modifiers)

common/src/app/common/geom/shapes/grid_layout/layout_data.cljc

@@ -467,15 +467,15 @@
          row-tracks (set-flex-multi-span parent row-tracks children-map shape-cells bounds objects :row)
 
          ;; Once auto sizes have been calculated we get calculate the `fr` unit with the remainining size and adjust the size
-         fr-column-space (max 0 (- bound-width (+ column-total-size-nofr column-total-gap)))
-         fr-row-space    (max 0 (- bound-height (+ row-total-size-nofr row-total-gap)))
+         free-column-space (max 0 (- bound-width (+ column-total-size-nofr column-total-gap)))
+         free-row-space    (max 0 (- bound-height (+ row-total-size-nofr row-total-gap)))
 
          ;; Get the minimum values for fr's
          min-column-fr     (min-fr-value column-tracks)
          min-row-fr        (min-fr-value row-tracks)
 
-         column-fr         (if auto-width? min-column-fr (mth/finite (/ fr-column-space column-frs) 0))
-         row-fr            (if auto-height? min-row-fr (mth/finite (/ fr-row-space row-frs) 0))
+         column-fr         (if auto-width? min-column-fr (mth/finite (/ free-column-space column-frs) 0))
+         row-fr            (if auto-height? min-row-fr (mth/finite (/ free-row-space row-frs) 0))
 
          column-tracks     (set-fr-value column-tracks column-fr auto-width?)
          row-tracks        (set-fr-value row-tracks row-fr auto-height?)
@@ -484,13 +484,13 @@
          column-total-size (tracks-total-size column-tracks)
          row-total-size    (tracks-total-size row-tracks)
 
-         auto-column-space (max 0 (if auto-width? 0 (- bound-width (+ column-total-size column-total-gap))))
-         auto-row-space    (max 0 (if auto-height? 0 (- bound-height (+ row-total-size row-total-gap))))
+         free-column-space (max 0 (if auto-width? 0 (- bound-width (+ column-total-size column-total-gap))))
+         free-row-space    (max 0 (if auto-height? 0 (- bound-height (+ row-total-size row-total-gap))))
          column-autos      (tracks-total-autos column-tracks)
          row-autos         (tracks-total-autos row-tracks)
 
-         column-add-auto   (/ auto-column-space column-autos)
-         row-add-auto      (/ auto-row-space row-autos)
+         column-add-auto   (/ free-column-space column-autos)
+         row-add-auto      (/ free-row-space row-autos)
 
          column-tracks (cond-> column-tracks
                          (= :stretch (:layout-justify-content parent))

common/src/app/common/geom/shapes/transforms.cljc

@@ -346,32 +346,29 @@
 
         center    (gco/points->center points)
         selrect   (calculate-selrect points center)
+        transform (calculate-transform points center selrect)
+        inverse   (when (some? transform) (gmt/inverse transform))]
 
-        [transform inverse]
-        (let [transform (calculate-transform points center selrect)
-              inverse (when (some? transform) (gmt/inverse transform))]
-          (if (and (some? transform) (some? inverse))
-            [transform inverse]
-            [(:transform shape (gmt/matrix)) (:transform-inverse shape (gmt/matrix))]))
+    (if-not (and (some? inverse) (some? transform))
+      shape
+      (let [type     (dm/get-prop shape :type)
+            rotation (mod (+ (d/nilv (:rotation shape) 0)
+                             (d/nilv (dm/get-in shape [:modifiers :rotation]) 0))
+                          360)
 
-        type     (dm/get-prop shape :type)
-        rotation (mod (+ (d/nilv (:rotation shape) 0)
-                         (d/nilv (dm/get-in shape [:modifiers :rotation]) 0))
-                      360)
-
-        shape    (if (or (= type :path) (= type :bool))
-                   (update shape :content path/transform-content transform-mtx)
-                   (assoc shape
-                          :x (dm/get-prop selrect :x)
-                          :y (dm/get-prop selrect :y)
-                          :width (dm/get-prop selrect :width)
-                          :height (dm/get-prop selrect :height)))]
-    (-> shape
-        (assoc :transform transform)
-        (assoc :transform-inverse inverse)
-        (assoc :selrect selrect)
-        (assoc :points points)
-        (assoc :rotation rotation))))
+            shape    (if (or (= type :path) (= type :bool))
+                       (update shape :content path/transform-content transform-mtx)
+                       (assoc shape
+                              :x (dm/get-prop selrect :x)
+                              :y (dm/get-prop selrect :y)
+                              :width (dm/get-prop selrect :width)
+                              :height (dm/get-prop selrect :height)))]
+        (-> shape
+            (assoc :transform transform)
+            (assoc :transform-inverse inverse)
+            (assoc :selrect selrect)
+            (assoc :points points)
+            (assoc :rotation rotation))))))
 
 (defn apply-transform
   "Given a new set of points transformed, set up the rectangle so it keeps
@@ -456,6 +453,13 @@
         (assoc :flip-x  (-> mask :flip-x))
         (assoc :flip-y  (-> mask :flip-y)))))
 
+(defn update-bool
+  "Calculates the selrect+points for the boolean shape"
+  [shape objects]
+  (let [content (path/calc-bool-content shape objects)
+        shape   (assoc shape :content content)]
+    (path/update-geometry shape)))
+
 ;; FIXME: revisit
 (defn update-shapes-geometry
   [objects ids]
@@ -470,7 +474,7 @@
                   (update-mask-selrect shape children)
 
                   (cfh/bool-shape? shape)
-                  (path/update-bool-shape shape objects)
+                  (update-bool shape objects)
 
                   (cfh/group-shape? shape)
                   (update-group-selrect shape children)

common/src/app/common/json.cljc

@@ -98,7 +98,7 @@
 (defn encode
   [data & {:as opts}]
   #?(:clj (j/write-str data opts)
-     :cljs (.stringify js/JSON (->js data opts) nil (:indent opts))))
+     :cljs (.stringify js/JSON (->js data opts))))
 
 (defn decode
   [data & {:as opts}]

common/src/app/common/logic/libraries.cljc

@@ -29,7 +29,6 @@
    [app.common.types.shape-tree :as ctst]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as cttx]
    [app.common.types.token :as cto]
    [app.common.types.typography :as cty]
    [app.common.types.variant :as ctv]
@@ -597,7 +596,7 @@
     (generate-sync-shape-direct changes file libraries container shape-id false)))
 
 (defmethod generate-sync-shape :colors
-  [_ changes library-id _ shape libraries _]
+  [_ changes library-id _ shape _ libraries _]
   (shape-log :debug (:id shape) nil :msg "Sync colors of shape" :shape (:name shape))
 
   ;; Synchronize a shape that uses some colors of the library. The value of the
@@ -608,7 +607,7 @@
                        #(ctc/sync-shape-colors % library-id library-colors))))
 
 (defmethod generate-sync-shape :typographies
-  [_ changes library-id container shape libraries _]
+  [_ changes library-id container shape _ libraries _]
   (shape-log :debug (:id shape) nil :msg "Sync typographies of shape" :shape (:name shape))
 
   ;; Synchronize a shape that uses some typographies of the library. The attributes
@@ -1664,34 +1663,24 @@
                                        {:type :reg-objects
                                         :shapes all-parents})]))))
 
-
-(defn- text-partial-change-value
-  [touched-content untouched-content touched]
-  (cond
-    (touched :text-content-structure-same-attrs)
-    (if (touched :text-content-attribute)
-      ;; Both structure and attrs has been touched, keep the
-      ;; touched-content
-      touched-content
-      ;; Keep the touched-content structure and texts, update
-      ;; its attrs to make them like the untouched-content
-      (cttx/copy-attrs-keys touched-content (cttx/get-first-paragraph-text-attrs untouched-content)))
-
-    (touched :text-content-text)
-    ;; Keep the texts touched in touched-content, so copy the
-    ;; texts from touched-content into untouched-content
-    (cttx/copy-text-keys touched-content untouched-content)
-
-    (touched :text-content-attribute)
-    ;; Keep the attrs touched in touched-content, so copy the
-    ;; texts from untouched-content into touched-content
-    (cttx/copy-text-keys untouched-content touched-content)))
-
 (defn- add-update-attr-operations
-  [attr dest-shape roperations uoperations attr-val]
-  (let [roperation {:type :set
+  [attr dest-shape origin-shape roperations uoperations touched]
+  (let [;; position-data is a special case because can be affected by :geometry-group and :content-group
+        ;; so, if the position-data changes but the geometry is touched we need to reset the position-data
+        ;; so it's calculated again
+        reset-pos-data?
+        (and (cfh/text-shape? origin-shape)
+             (= attr :position-data)
+             (not= (get origin-shape attr) (get dest-shape attr))
+             (touched :geometry-group))
+
+        roperation {:type :set
                     :attr attr
-                    :val attr-val
+                    :val (cond
+                           ;; If position data changes and the geometry group is touched
+                           ;; we need to put to nil so we can regenerate it
+                           reset-pos-data? nil
+                           :else (get origin-shape attr))
                     :ignore-touched true}
         uoperation {:type :set
                     :attr attr
@@ -1700,33 +1689,6 @@
     [(conj roperations roperation)
      (conj uoperations uoperation)]))
 
-(defn- is-text-partial-change?
-  "Check if the attr update is a text partial change"
-  [untouched-shape touched-shape]
-  (let [touched             (get touched-shape :touched #{})
-        partial-text-keys   [:text-content-attribute :text-content-text]
-        active-keys         (filter touched partial-text-keys)
-        untouched-content   (:content untouched-shape)
-        untouched-attrs     (cttx/get-first-paragraph-text-attrs untouched-content)
-        eq-untouched-attrs? (cttx/equal-attrs? untouched-content untouched-attrs)]
-    (and
-     (or
-     ;; One and only one of the keys is pressent
-      (= 1 (count active-keys))
-      (and
-       (not (touched :text-content-attribute))
-       (touched :text-content-structure-same-attrs)))
-
-     (or
-      ;; Both has the same structure
-      (cttx/equal-structure? untouched-content (:content touched-shape))
-
-      ;; The origin and destiny have different structures, but each have the same attrs
-      ;; for all the items on its content tree
-      (and
-       eq-untouched-attrs?
-       (touched :text-content-structure-same-attrs))))))
-
 (defn- update-attrs
   "The main function that implements the attribute sync algorithm. Copy
   attributes that have changed in the origin shape to the dest shape.
@@ -1769,167 +1731,56 @@
             :always
             (generate-update-tokens container dest-shape origin-shape touched omit-touched?))
 
-          (let [attr-group        (get ctk/sync-attrs attr)
-                ;; position-data is a special case because can be affected by
-                ;; :geometry-group and :content-group so, if the position-data
-                ;; changes but the geometry is touched we need to reset the position-data
-                ;; so it's calculated again
-                reset-pos-data? (and (cfh/text-shape? origin-shape)
-                                     (= attr :position-data)
-                                     (not= (:position-data origin-shape) (:position-data dest-shape))
-                                     (touched :geometry-group))
-
-                ;; On texts, when we want to omit the touched attrs, both text (the actual letters)
-                ;; and attrs (bold, font, etc) are in the same attr :content.
-                ;; If only one of them is touched, we want to adress this case and
-                ;; only update the untouched one
-                text-partial-change?
-                (when (and
-                       omit-touched?
-                       (cfh/text-shape? origin-shape)
-                       (= :content attr)
-                       (touched attr-group))
-                  (is-text-partial-change? origin-shape dest-shape))
-
-                skip-operations?
-                (or (= (get origin-shape attr) (get dest-shape attr))
-                    (and (touched attr-group)
-                         omit-touched?
-                         ;; When it is a text-partial-change, we should generate operations
-                         ;; even when omit-touched? is true, but updating only the text or
-                         ;; the attributes, omiting the other part
-                         (not text-partial-change?)))
-
-                attr-val (when-not skip-operations?
-                           (cond
-                             ;; If position data changes and the geometry group is touched
-                             ;; we need to put to nil so we can regenerate it
-                             reset-pos-data?
-                             nil
-
-                             text-partial-change?
-                             (text-partial-change-value (:content dest-shape)
-                                                        (:content origin-shape)
-                                                        touched)
-
-                             :else
-                             (get origin-shape attr)))
-
-                ;; On a text-partial-change, we want to force a position-data reset
-                ;; so it's calculated again
-                [roperations uoperations]
-                (if text-partial-change?
-                  (add-update-attr-operations :position-data dest-shape roperations uoperations nil)
-                  [roperations uoperations])
-
+          (let [attr-group (get ctk/sync-attrs attr)
                 [roperations' uoperations']
-                (if skip-operations?
+                (if (or (= (get origin-shape attr) (get dest-shape attr))
+                        (and (touched attr-group) omit-touched?))
                   [roperations uoperations]
-                  (add-update-attr-operations attr dest-shape roperations uoperations attr-val))]
+                  (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
             (recur (next attrs)
                    roperations'
                    uoperations')))))))
 
 (defn update-attrs-on-switch
-  "Copy attributes that have changed in the shape previous to the switch
-   to the current shape (post switch). Used only on variants switch"
-  ;; NOTE: This function have similitudes but is very different to
-  ;; update-attrs:
-  ;; In components (update-attrs), the source shape is "clean", and the destination
-  ;; shape may have touched elements that shouldn't be overwritten.
-  ;; In variants (update-attrs-on-switch), the destination shape is "clean",
-  ;; and it's the source shape that may have touched elements, and we only want
-  ;; to copy those touched elements.
-  [changes current-shape previous-shape current-root prev-root origin-ref-shape container]
+  "Copy attributes that have changed in the origin shape to the dest shape. Used on variants switch"
+  [changes dest-shape origin-shape dest-root origin-root origin-ref-shape container]
   (let [;; We need to sync only the position relative to the origin of the component.
         ;; (see update-attrs for a full explanation)
-        previous-shape (reposition-shape previous-shape prev-root current-root)
-        touched        (get previous-shape :touched #{})]
+        origin-shape   (reposition-shape origin-shape origin-root dest-root)
+        touched        (get dest-shape :touched #{})
+        touched-origin (get origin-shape :touched #{})]
 
     (loop [attrs       updatable-attrs
-           roperations [{:type :set-touched :touched (:touched previous-shape)}]
-           uoperations (list {:type :set-touched :touched (:touched current-shape)})]
+           roperations [{:type :set-touched :touched (:touched origin-shape)}]
+           uoperations (list {:type :set-touched :touched (:touched dest-shape)})]
       (if-let [attr (first attrs)]
         (let [attr-group (get ctk/sync-attrs attr)
-              skip-operations?
-              (or
-               ;; If the attribute is not valid for the destiny, don't copy it
-               (not (cts/is-allowed-attr? attr (:type current-shape)))
-
-               ;; If the values are already equal, don't copy them
-               (= (get previous-shape attr) (get current-shape attr))
-
-               ;; If both variants (origin and destiny) don't have the same value
-               ;; for that attribute, don't copy it.
-               ;; Exceptions: :points :selrect and :content can be different
-               ;;
-               ;; Sample:
-               ;; 1. We have a variant with C1 (bg red) and C2 (bg blue).
-               ;; 2. We make a copy of C1 called Copy.
-               ;; 3. We set Copy’s bg to green (so it it has an override on the bg).
-               ;; 4. We switch Copy to use C2 as base.
-               ;; 5. The bg of Copy now is blue (we ignore the override)
-               (and
-                (not (contains? #{:points :selrect :content} attr))
-                (not= (get origin-ref-shape attr) (get current-shape attr)))
-
-               ;; The :content attr cant't be copied to elements of different type
-               (and (= attr :content) (not= (:type previous-shape) (:type current-shape)))
-
-               ;; If the attr is not touched, don't copy it
-               (not (touched attr-group)))
-
-              ;; On texts, both text (the actual letters)
-              ;; and attrs (bold, font, etc) are in the same attr :content.
-              ;; If only one of them is touched, we want to adress this case and
-              ;; only update the untouched one
-              text-partial-change?
-              (when (and
-                     (not skip-operations?)
-                     (cfh/text-shape? current-shape)
-                     (cfh/text-shape? previous-shape)
-                     (= :content attr)
-                     (touched attr-group))
-                (is-text-partial-change? current-shape previous-shape))
-
-              ;; position-data is a special case because can be affected by :geometry-group and :content-group
-              ;; so, if the position-data changes but the geometry is touched we need to reset the position-data
-              ;; so it's calculated again
-              reset-pos-data? (and
-                               (not skip-operations?)
-                               (cfh/text-shape? previous-shape)
-                               (= attr :position-data)
-                               (not= (:position-data previous-shape) (:position-data current-shape))
-                               (touched :geometry-group))
-
-              attr-val (when-not skip-operations?
-                         (cond
-                           ;; If position data changes and the geometry group is touched
-                           ;; we need to put to nil so we can regenerate it
-                           reset-pos-data?
-                           nil
-
-                           text-partial-change?
-                           (text-partial-change-value (:content previous-shape)
-                                                      (:content current-shape)
-                                                      touched)
-
-                           :else
-                           (get previous-shape attr)))
-
               [roperations' uoperations']
-              (if skip-operations?
+              (if (or
+                   ;; If the attribute is not valid for the destiny, don't copy it
+                   (not (cts/is-allowed-attr? attr (:type dest-shape)))
+                   ;; If the values are already equal, don't copy it
+                   (= (get origin-shape attr) (get dest-shape attr))
+                   ;; If the referenced shape on the original component doesn't have the same value, don't copy it
+                   ;; Exceptions: :points :selrect and :content can be different
+                   (and
+                    (not (contains? #{:points :selrect :content} attr))
+                    (not= (get origin-ref-shape attr) (get dest-shape attr)))
+                   ;; The :content attr cant't be copied to elements of different type
+                   (and (= attr :content) (not= (:type origin-shape) (:type dest-shape)))
+                   ;; If the attr is not touched in the origin shape, don't copy it
+                   (not (touched-origin attr-group)))
                 [roperations uoperations]
-                (add-update-attr-operations attr current-shape roperations uoperations attr-val))]
+                (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
           (recur (next attrs)
                  roperations'
                  uoperations'))
         (cond-> changes
           (> (count roperations) 1)
-          (add-update-attr-changes current-shape container roperations uoperations)
+          (add-update-attr-changes dest-shape container roperations uoperations)
 
           :always
-          (generate-update-tokens container current-shape previous-shape touched false))))))
+          (generate-update-tokens container dest-shape origin-shape touched false))))))
 
 (defn- propagate-attrs
   "Helper that puts the origin attributes (attrs) into dest but only if
@@ -2204,8 +2055,7 @@
                     (pcb/with-objects objects)
                     (pcb/resize-parents new-objects-ids)
                     ;; Fix the order of the children inside the parent
-                    (cond-> (ctl/any-layout? objects parent-id)
-                      (pcb/reorder-children parent-id (get-in objects [parent-id :shapes]))))]
+                    (pcb/reorder-children parent-id (get-in objects [parent-id :shapes])))]
     (assoc changes :file-id library-id)))
 
 (defn generate-detach-component
@@ -2256,7 +2106,7 @@
                    (pcb/update-shapes [(:id new-shape)] #(d/patch-object % keep-props-values))
 
                    ;; We need to set the same index as the original shape
-                   (pcb/change-parent (:parent-id shape) [new-shape] index {:allow-altering-copies true
+                   (pcb/change-parent (:parent-id shape) [new-shape] index {:component-swap true
                                                                             :ignore-touched true})
                    (change-touched new-shape
                                    shape
@@ -2264,21 +2114,10 @@
                                    {}))]))
 
 (defn generate-component-swap
-  [changes objects shape file page libraries id-new-component
-   index target-cell keep-props-values ignore-swapped?]
-  (let [;; When we keep the touched properties, we can't delete the
-        ;; swapped children (we will keep them too)
-        ignore-swapped-fn
-        (if ignore-swapped?
-          #(-> (get objects %)
-               (ctk/get-swap-slot))
-          (constantly false))
-
-        [all-parents changes]
+  [changes objects shape file page libraries id-new-component index target-cell keep-props-values]
+  (let [[all-parents changes]
         (-> changes
-            (cls/generate-delete-shapes
-             file page objects (d/ordered-set (:id shape))
-             {:allow-altering-copies true :ignore-children-fn ignore-swapped-fn}))
+            (cls/generate-delete-shapes file page objects (d/ordered-set (:id shape)) {:component-swap true}))
         [new-shape changes]
         (-> changes
             (generate-new-shape-for-swap shape file page libraries id-new-component index target-cell keep-props-values))]
@@ -2351,9 +2190,7 @@
                               :starting-frame frame-id}]
 
                 (vswap! unames conj name)
-                (-> changes
-                    (pcb/with-page page)
-                    (pcb/set-flow flow-id new-flow))))
+                (pcb/set-flow changes flow-id new-flow)))
 
             changes
             (->> shapes

common/src/app/common/logic/shapes.cljc

@@ -16,30 +16,19 @@
    [app.common.types.pages-list :as ctpl]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as ctt]
    [app.common.types.token :as cto]
-   [app.common.uuid :as uuid]
-   [clojure.set :as set]))
+   [app.common.uuid :as uuid]))
 
 (defn- generate-unapply-tokens
   "When updating attributes that have a token applied, we must unapply it, because the value
    of the attribute now has been given directly, and does not come from the token."
   [changes objects changed-sub-attr]
-  (let [new-objects     (pcb/get-objects changes)
-        mod-obj-changes (->> (:redo-changes changes)
+  (let [mod-obj-changes (->> (:redo-changes changes)
                              (filter #(= (:type %) :mod-obj)))
 
-        text-changed-attrs
-        (fn [shape]
-          (let [new-shape (get new-objects (:id shape))
-                attrs (ctt/get-diff-attrs (:content shape) (:content new-shape))]
-            (apply set/union (map cto/shape-attr->token-attrs attrs))))
-
         check-attr (fn [shape changes attr]
                      (let [tokens      (get shape :applied-tokens {})
-                           token-attrs (if (or (not= (:type shape) :text) (not= attr :content))
-                                         (cto/shape-attr->token-attrs attr changed-sub-attr)
-                                         (text-changed-attrs shape))]
+                           token-attrs (cto/shape-attr->token-attrs attr changed-sub-attr)]
                        (if (some #(contains? tokens %) token-attrs)
                          (pcb/update-shapes changes [(:id shape)] #(cto/unapply-token-id % token-attrs))
                          changes)))
@@ -99,14 +88,7 @@
                                (pcb/with-library-data file))
                            ids
                            options))
-  ([changes ids {:keys [ignore-touched
-                        allow-altering-copies
-                        ;; We will delete the shapes and its descendants.
-                        ;; ignore-children-fn is used to ignore some descendants
-                        ;; on the deletion process. It should receive a shape and
-                        ;; return a boolean
-                        ignore-children-fn]
-                 :or {ignore-children-fn (constantly false)}}]
+  ([changes ids {:keys [ignore-touched component-swap]}]
    (let [objects (pcb/get-objects changes)
          data    (pcb/get-library-data changes)
          page-id (pcb/get-page-id changes)
@@ -119,12 +101,11 @@
           ;; Look for shapes that are inside a component copy, but are
           ;; not the root. In this case, they must not be deleted,
           ;; but hidden (to be able to recover them more easily).
-          ;; If we want to specifically allow altering the copies, this is
-          ;; a special case, like a component swap, in which case we want
+          ;; Unless we are doing a component swap, in which case we want
           ;; to delete the old shape
            (let [shape           (get objects shape-id)]
              (and (ctn/has-any-copy-parent? objects shape)
-                  (not allow-altering-copies))))
+                  (not component-swap))))
 
          [ids-to-delete ids-to-hide]
          (loop [ids-seq       (seq ids)
@@ -170,9 +151,7 @@
          changes
          (reduce (fn [changes {:keys [id] :as flow}]
                    (if (contains? ids-to-delete (:starting-frame flow))
-                     (-> changes
-                         (pcb/with-page page)
-                         (pcb/set-flow id nil))
+                     (pcb/set-flow changes id nil)
                      changes))
                  changes
                  (:flows page))
@@ -185,15 +164,10 @@
                  (d/ordered-set)
                  (concat ids-to-delete ids-to-hide))
 
-         ;; Descendants of deleted shapes must be also deleted,
-         ;; except the ignored ones by the function ignore-children-fn
-         descendants-to-delete
-         (->> ids-to-delete
+         all-children
+         (->> ids-to-delete ;; Children of deleted shapes must be also deleted.
               (reduce (fn [res id]
-                        (into res (cfh/get-children-ids
-                                   objects
-                                   id
-                                   {:ignore-children-fn ignore-children-fn})))
+                        (into res (cfh/get-children-ids objects id)))
                       [])
               (reverse)
               (into (d/ordered-set)))
@@ -213,10 +187,9 @@
 
          empty-parents
         ;; Any parent whose children are all deleted, must be deleted too.
-        ;; If we want to specifically allow altering the copies, this is a special case,
-        ;; for example during a component swap. in this case we are replacing a shape by
+        ;; Unless we are during a component swap: in this case we are replacing a shape by
         ;; other one, so must not delete empty parents.
-         (if-not allow-altering-copies
+         (if-not component-swap
            (into (d/ordered-set) (find-all-empty-parents #{}))
            #{})
 
@@ -228,7 +201,7 @@
                        (conj components (:component-id shape))
                        components)))
                  []
-                 (into ids-to-delete descendants-to-delete))
+                 (into ids-to-delete all-children))
 
 
          ids-set (set ids-to-delete)
@@ -240,9 +213,7 @@
               (map :id))
 
          changes (reduce (fn [changes guide-id]
-                           (-> changes
-                               (pcb/with-page page)
-                               (pcb/set-flow guide-id nil)))
+                           (pcb/set-flow changes guide-id nil))
                          changes
                          guides-to-delete)
 
@@ -255,7 +226,7 @@
 
          changes (-> changes
                      (generate-update-shape-flags ids-to-hide objects {:hidden true})
-                     (pcb/remove-objects descendants-to-delete {:ignore-touched true})
+                     (pcb/remove-objects all-children {:ignore-touched true})
                      (pcb/remove-objects ids-to-delete {:ignore-touched ignore-touched})
                      (pcb/remove-objects empty-parents)
                      (pcb/resize-parents all-parents)

common/src/app/common/logic/tokens.cljc

@@ -20,15 +20,15 @@
   (let [prev-active-token-themes (ctob/get-active-theme-paths tokens-lib)
         active-token-set-names   (ctob/get-active-themes-set-names tokens-lib)
 
-        prev-hidden-theme  (ctob/get-hidden-theme tokens-lib)
+        prev-hidden-token-theme  (ctob/get-hidden-theme tokens-lib)
 
-        hidden-theme       (-> (some-> prev-hidden-theme (ctob/set-sets active-token-set-names))
-                               (update-theme-fn))]
+        hidden-token-theme       (-> (some-> prev-hidden-token-theme (ctob/set-sets active-token-set-names))
+                                     (update-theme-fn))]
     (-> changes
-        (pcb/update-active-token-themes #{(ctob/theme-path hidden-theme)} prev-active-token-themes)
-        (pcb/set-token-theme (:group prev-hidden-theme)
-                             (:name prev-hidden-theme)
-                             hidden-theme))))
+        (pcb/update-active-token-themes #{ctob/hidden-token-theme-path} prev-active-token-themes)
+        (pcb/set-token-theme (:group prev-hidden-token-theme)
+                             (:name prev-hidden-token-theme)
+                             hidden-token-theme))))
 
 (defn generate-toggle-token-set
   "Toggle a token set at `set-name` in `tokens-lib` without modifying a
@@ -41,7 +41,7 @@
   [group-path tokens-lib tokens-lib-theme]
   (let [deactivate? (contains? #{:all :partial} (ctob/sets-at-path-all-active? tokens-lib group-path))
         sets-names  (->> (ctob/get-sets-at-path tokens-lib group-path)
-                         (map ctob/get-name)
+                         (map :name)
                          (into #{}))]
     (if deactivate?
       (ctob/disable-sets tokens-lib-theme sets-names)

common/src/app/common/logic/variant_properties.cljc

@@ -18,12 +18,7 @@
   [changes variant-id pos new-name]
   (let [data               (pcb/get-library-data changes)
         objects            (pcb/get-objects changes)
-        related-components (cfv/find-variant-components data objects variant-id)
-
-        props              (-> related-components last :variant-properties)
-        prop-names         (mapv :name props)
-        prop-names         (concat (subvec prop-names 0 pos) (subvec prop-names (inc pos)))
-        new-name           (ctv/update-number-in-repeated-item prop-names new-name)]
+        related-components (cfv/find-variant-components data objects variant-id)]
     (reduce (fn [changes component]
               (pcb/update-component
                changes (:id component)
@@ -65,17 +60,6 @@
         (pcb/update-shapes [main-id] #(assoc % :variant-name name)))))
 
 
-(defn generate-set-variant-error
-  [changes component-id value]
-  (let [data      (pcb/get-library-data changes)
-        component (ctcl/get-component data component-id true)
-        main-id   (:main-instance-id component)]
-    (-> changes
-        (pcb/update-shapes [main-id] (if (str/blank? value)
-                                       #(dissoc % :variant-error)
-                                       #(assoc % :variant-error value))))))
-
-
 (defn generate-add-new-property
   [changes variant-id & {:keys [fill-values? property-name]}]
   (let [data               (pcb/get-library-data changes)
@@ -86,9 +70,6 @@
         next-prop-num      (ctv/next-property-number props)
         property-name      (or property-name (str ctv/property-prefix next-prop-num))
 
-        prop-names         (mapv :name props)
-        property-name      (ctv/update-number-in-repeated-item prop-names property-name)
-
         [_ changes]
         (reduce (fn [[num changes] component]
                   (let [main-id      (:main-instance-id component)

common/src/app/common/logic/variants.cljc

@@ -1,17 +1,28 @@
 (ns app.common.logic.variants
   (:require
-   [app.common.data :as d]
    [app.common.files.changes-builder :as pcb]
    [app.common.files.helpers :as cfh]
    [app.common.files.variant :as cfv]
    [app.common.logic.libraries :as cll]
-   [app.common.logic.shapes :as cls]
    [app.common.logic.variant-properties :as clvp]
-   [app.common.types.component :as ctk]
    [app.common.types.container :as ctn]
    [app.common.types.file :as ctf]
-   [app.common.types.variant :as ctv]
-   [app.common.uuid :as uuid]))
+   [app.common.types.variant :as ctv]))
+
+
+(defn- generate-path
+  [path objects base-id shape]
+  (let [get-type #(case %
+                    :frame :container
+                    :group :container
+                    :rect  :shape
+                    :circle :shape
+                    :bool :shape
+                    :path :shape
+                    %)]
+    (if (= base-id (:id shape))
+      path
+      (generate-path (str path " " (:name shape) (get-type (:type shape))) objects base-id (get objects (:parent-id shape))))))
 
 (defn generate-add-new-variant
   [changes shape variant-id new-component-id new-shape-id prop-num]
@@ -35,173 +46,24 @@
         (clvp/generate-update-property-value new-component-id prop-num value)
         (pcb/change-parent (:parent-id shape) [new-shape] 0))))
 
-(defn- generate-path
-  [path objects base-id shape]
-  (let [get-type #(case %
-                    :frame :container
-                    :group :container
-                    :rect  :shape
-                    :circle :shape
-                    :bool :shape
-                    :path :shape
-                    %)]
-    (if (= base-id (:id shape))
-      path
-      (generate-path (str path " " (:name shape) (get-type (:type shape))) objects base-id (get objects (:parent-id shape))))))
-
-(defn- add-unique-path
-  "Adds a new property :shape-path to the shape, with the path of the shape.
-   Suffixes like -1, -2, etc. are added to ensure uniqueness."
-  [shapes objects base-id]
-  (letfn [(unique-path [shape counts]
-            (let [path (generate-path "" objects base-id shape)
-                  num  (get counts path 1)]
-              [(str path "-" num) (update counts path (fnil inc 1))]))]
-    (first
-     (reduce
-      (fn [[result counts] shape]
-        (let [[shape-path counts'] (unique-path shape counts)]
-          [(conj result (assoc shape :shape-path shape-path)) counts']))
-      [[] {}]
-      shapes))))
-
-
-(defn- keep-swapped-item
-  "As part of the keep-touched process on a switch, given a child on the original
-   copy that was swapped (orig-swapped-child), and its related shape on the new copy
-   (related-shape-in-new), move the orig-swapped-child into the parent of
-   related-shape-in-new, fix its swap-slot if needed, and then delete
-   related-shape-in-new"
-  [changes related-shape-in-new orig-swapped-child ldata page swap-ref-id]
-  (let [;; Before to the swap, temporary move the previous
-        ;; shape to the root panel to avoid problems when
-        ;; the previous parent is deleted.
-        before-changes (-> (pcb/empty-changes)
-                           (pcb/with-page page)
-                           (pcb/with-objects (:objects page))
-                           (pcb/change-parent uuid/zero [orig-swapped-child] 0 {:allow-altering-copies true}))
-
-        objects         (pcb/get-objects changes)
-        prev-swap-slot  (ctk/get-swap-slot orig-swapped-child)
-        current-parent  (get objects (:parent-id related-shape-in-new))
-        pos             (d/index-of (:shapes current-parent) (:id related-shape-in-new))]
-
-
-    (-> (pcb/concat-changes before-changes changes)
-
-        ;; Move the previous shape to the new parent
-        (pcb/change-parent (:parent-id related-shape-in-new) [orig-swapped-child] pos {:allow-altering-copies true})
-
-        ;; We need to update the swap slot only when it pointed
-        ;; to the swap-ref-id. Oterwise this is a swapped item
-        ;; inside a nested copy, so we need to keep it.
-        (cond->
-         (= prev-swap-slot swap-ref-id)
-          (pcb/update-shapes
-           [(:id orig-swapped-child)]
-           #(ctk/set-swap-slot % (:shape-ref related-shape-in-new))))
-
-        ;; Delete new non-swapped item
-        (cls/generate-delete-shapes ldata page objects (d/ordered-set (:id related-shape-in-new)) {:allow-altering-copies true})
-        second)))
-
-(defn- child-of-swapped?
-  "Check if any ancestor of a shape (between base-parent-id and shape) was swapped"
-  [shape objects base-parent-id]
-  (let [ancestors (->> (ctn/get-parent-heads objects shape)
-                        ;; Ignore ancestors ahead of base-parent
-                       (drop-while #(not= base-parent-id (:id %)))
-                       seq)
-        num-ancestors (count ancestors)
-        ;; Ignore first and last (base-parent and shape)
-        ancestors (when (and ancestors (<= 3 num-ancestors))
-                    (subvec (vec ancestors) 1 (dec num-ancestors)))]
-    (some ctk/get-swap-slot ancestors)))
-
-
 (defn generate-keep-touched
-  "This is used as part of the switch process, when you switch from
-   an original-shape to a new-shape. It generate changes to
-   copy the touched attributes on the shapes children of the original-shape
-   into the related children of the new-shape.
-   This relation is tricky. The shapes are related if:
-   * On the main components, both have the same name (the name on the copies are ignored)
-   * Both has the same type of ancestors, on the same order (see generate-path for the
-     translation of the types)"
-  [changes new-shape original-shape original-shapes page libraries ldata]
-  (let [objects            (pcb/get-objects changes)
-        container          (ctn/make-container page :page)
-        page-objects       (:objects page)
+  [changes new-shape original-shape original-shapes page libraries]
+  (let [objects      (pcb/get-objects changes)
+        new-path-map (into {}
+                           (map (fn [shape] {(generate-path "" objects (:id new-shape) shape) shape}))
+                           (cfh/get-children-with-self objects (:id new-shape)))
 
-        ;; Get the touched children of the original-shape
-        ;; Ignore children of swapped items, because
-        ;; they will be moved without change when
-        ;; managing their swapped ancestor
-        orig-touched       (->> (filter (comp seq :touched) original-shapes)
-                                (remove
-                                 #(child-of-swapped? %
-                                                     page-objects
-                                                     (:id original-shape))))
-
-        ;; Adds a :shape-path attribute to the children of the new-shape,
-        ;; that contains the type of its ancestors and its name
-        new-shapes-w-path  (add-unique-path
-                            (reverse (cfh/get-children-with-self objects (:id new-shape)))
-                            objects
-                            (:id new-shape))
-        ;; Creates a map to quickly find a child of the new-shape by its shape-path
-        new-shapes-map     (into {} (map (juxt :shape-path identity)) new-shapes-w-path)
-
-        ;; The original-shape is in a copy. For the relation rules, we need the referenced
-        ;; shape on the main component
-        orig-ref-shape     (ctf/find-ref-shape nil container libraries original-shape)
-
-        orig-ref-objects   (-> (ctf/get-component-container-from-head orig-ref-shape libraries)
-                               :objects)
-
-        ;; Adds a :shape-path attribute to the children of the orig-ref-shape,
-        ;; that contains the type of its ancestors and its name
-        o-ref-shapes-wp    (add-unique-path
-                            (reverse (cfh/get-children-with-self orig-ref-objects (:id orig-ref-shape)))
-                            orig-ref-objects
-                            (:id orig-ref-shape))
-
-        ;; Creates a map to quickly find a child of the orig-ref-shape by its shape-path
-        o-ref-shapes-p-map  (into {} (map (juxt :id :shape-path)) o-ref-shapes-wp)]
-    ;; Process each touched children of the original-shape
+        orig-touched (filter (comp seq :touched) original-shapes)
+        orig-objects (into {} (map (juxt :id identity) original-shapes))
+        container    (ctn/make-container page :page)]
     (reduce
-     (fn [changes orig-child-touched]
-       (let [;; If the orig-child-touched was swapped, get its swap-slot
-             swap-slot      (ctk/get-swap-slot orig-child-touched)
-
-             ;; orig-child-touched is in a copy. Get the referenced shape on the main component
-             ;; If there is a swap slot, we will get the referenced shape in another way
-             orig-ref-shape (when-not swap-slot
-                              ;; TODO Maybe just get it from o-ref-shapes-wp
-                              (ctf/find-ref-shape nil container libraries orig-child-touched))
-
-             orig-ref-id    (if swap-slot
-                              ;; If there is a swap slot, find the referenced shape id
-                              (ctf/find-ref-id-for-swapped orig-child-touched container libraries)
-                              ;; If there is not a swap slot, get the id from the orig-ref-shape
-                              (:id orig-ref-shape))
-
-             ;; Get the shape path of the referenced main
-             shape-path     (get o-ref-shapes-p-map orig-ref-id)
-             ;; Get its related shape in the children of new-shape: the one that
-             ;; has the same shape-path
-             related-shape-in-new  (get new-shapes-map shape-path)]
-         ;; If there is a related shape, keep its data
-         (if related-shape-in-new
-           (if swap-slot
-             ;; If the orig-child-touched was swapped, keep it
-             (keep-swapped-item changes related-shape-in-new orig-child-touched
-                                ldata page orig-ref-id)
-             ;; If the orig-child-touched wasn't swapped, copy
-             ;; the touched attributes into it
-             (cll/update-attrs-on-switch
-              changes related-shape-in-new orig-child-touched
-              new-shape original-shape orig-ref-shape container))
+     (fn [changes touched-shape]
+       (let [path (generate-path "" orig-objects (:id original-shape) touched-shape)
+             related-shape  (get new-path-map path)
+             orig-ref-shape (ctf/find-ref-shape nil container libraries touched-shape)]
+         (if related-shape
+           (cll/update-attrs-on-switch
+            changes related-shape touched-shape new-shape original-shape orig-ref-shape container)
            changes)))
      changes
      orig-touched)))

common/src/app/common/media.cljc

@@ -5,22 +5,15 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.common.media
-  "Media assets helpers (images, fonts, etc)"
   (:require
+   [clojure.spec.alpha :as s]
    [cuerdas.core :as str]))
 
-(def font-types
-  #{"font/ttf"
-    "font/woff"
-    "font/otf"
-    "font/opentype"})
-
-(def image-types
-  #{"image/jpeg"
-    "image/png"
-    "image/webp"
-    "image/gif"
-    "image/svg+xml"})
+;; We have added ".ttf" as string to solve a problem with chrome input selector
+(def valid-font-types #{"font/ttf" ".ttf" "font/woff", "application/font-woff" "woff" "font/otf" ".otf" "font/opentype"})
+(def valid-image-types #{"image/jpeg", "image/png", "image/webp", "image/gif", "image/svg+xml"})
+(def str-image-types (str/join "," valid-image-types))
+(def str-font-types (str/join "," valid-font-types))
 
 (defn format->extension
   [format]
@@ -55,28 +48,38 @@
 (defn mtype->extension [mtype]
   ;; https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types
   (case mtype
-    "image/apng"               ".apng"
-    "image/avif"               ".avif"
-    "image/gif"                ".gif"
-    "image/jpeg"               ".jpg"
-    "image/png"                ".png"
-    "image/svg+xml"            ".svg"
-    "image/webp"               ".webp"
-    "application/zip"          ".zip"
-    "application/penpot"       ".penpot"
-    "application/pdf"          ".pdf"
-    "text/plain"               ".txt"
-    "font/woff"                ".woff"
-    "font/woff2"               ".woff2"
-    "font/ttf"                 ".ttf"
-    "font/otf"                 ".otf"
-    "application/octet-stream" ".bin"
+    "image/apng"         ".apng"
+    "image/avif"         ".avif"
+    "image/gif"          ".gif"
+    "image/jpeg"         ".jpg"
+    "image/png"          ".png"
+    "image/svg+xml"      ".svg"
+    "image/webp"         ".webp"
+    "application/zip"    ".zip"
+    "application/penpot" ".penpot"
+    "application/pdf"    ".pdf"
+    "text/plain"         ".txt"
     nil))
 
-(defn strip-image-extension
-  [filename]
-  (let [image-extensions-re #"(\.png)|(\.jpg)|(\.jpeg)|(\.webp)|(\.gif)|(\.svg)$"]
-    (str/replace filename image-extensions-re "")))
+(s/def ::id uuid?)
+(s/def ::name string?)
+(s/def ::width number?)
+(s/def ::height number?)
+(s/def ::created-at inst?)
+(s/def ::modified-at inst?)
+(s/def ::mtype string?)
+(s/def ::uri string?)
+
+(s/def ::media-object
+  (s/keys :req-un [::id
+                   ::name
+                   ::width
+                   ::height
+                   ::mtype
+                   ::created-at
+                   ::modified-at
+                   ::uri]))
+
 
 (defn parse-font-weight
   [variant]

common/src/app/common/schema.cljc

@@ -5,7 +5,7 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.common.schema
-  (:refer-clojure :exclude [deref merge parse-uuid parse-long parse-double parse-boolean type keys])
+  (:refer-clojure :exclude [deref merge parse-uuid parse-long parse-double parse-boolean type])
   #?(:cljs (:require-macros [app.common.schema :refer [ignoring]]))
   (:require
    [app.common.data :as d]
@@ -118,21 +118,6 @@
   [& transformers]
   (apply mt/transformer transformers))
 
-(defn entries
-  "Get map entires of a map schema"
-  [schema]
-  (m/entries schema default-options))
-
-(def ^:private xf:map-key
-  (map key))
-
-(defn keys
-  "Given a map schema, return all keys as set"
-  [schema]
-  (->> (entries schema)
-       (into #{} xf:map-key)))
-
-
 ;; (defn key-transformer
 ;;   [& {:as opts}]
 ;;   (mt/key-transformer opts))
@@ -226,7 +211,8 @@
 
 (defn lazy-validator
   [s]
-  (let [vfn (delay (validator s))]
+  (let [s   (schema s)
+        vfn (delay (validator s))]
     (fn [v] (@vfn v))))
 
 (defn lazy-explainer
@@ -717,10 +703,7 @@
                  (fn [v]
                    (and (pred v)
                         (>= max v)))
-                 pred)
-
-          gen (or (get props :gen/gen)
-                  (sg/small-int :max max :min min))]
+                 pred)]
 
       {:pred pred
        :type-properties
@@ -728,7 +711,7 @@
         :description "int"
         :error/message "expected to be int/long"
         :error/code "errors.invalid-integer"
-        :gen/gen gen
+        :gen/gen (sg/small-int :max max :min min)
         :decode/string parse-long
         :decode/json parse-long
         ::oapi/type "integer"
@@ -786,11 +769,10 @@
                         (>= max v)))
                  pred)
 
-          gen  (or (get props :gen/gen)
-                   (sg/one-of
-                    (sg/small-int :max max :min min)
-                    (->> (sg/small-double :max max :min min)
-                         (sg/fmap #(mth/precision % 2)))))]
+          gen  (sg/one-of
+                (sg/small-int :max max :min min)
+                (->> (sg/small-double :max max :min min)
+                     (sg/fmap #(mth/precision % 2))))]
 
       {:pred pred
        :type-properties
@@ -805,9 +787,7 @@
 
 (register! ::safe-int [::int {:max max-safe-int :min min-safe-int}])
 (register! ::safe-double [::double {:max max-safe-int :min min-safe-int}])
-(register! ::safe-number [::number {:gen/gen (sg/small-double)
-                                    :max max-safe-int
-                                    :min min-safe-int}])
+(register! ::safe-number [::number {:max max-safe-int :min min-safe-int}])
 
 (defn parse-boolean
   [v]
@@ -1018,8 +998,6 @@
      {:title "agent"
       :description "instance of clojure agent"}}))
 
-(register! ::any (mu/update-properties :any assoc :gen/gen sg/any))
-
 ;; ---- PREDICATES
 
 (def valid-safe-number?

common/src/app/common/schema/desc_js_like.cljc

@@ -7,7 +7,6 @@
 (ns app.common.schema.desc-js-like
   (:require
    [app.common.data :as d]
-   [app.common.schema :as-alias sm]
    [cuerdas.core :as str]
    [malli.core :as m]
    [malli.util :as mu]))
@@ -91,7 +90,7 @@
 (defmethod visit :int [_ schema _ _] (str "integer" (-titled schema) (-min-max-suffix-number schema)))
 (defmethod visit :double [_ schema _ _] (str "double" (-titled schema) (-min-max-suffix-number schema)))
 (defmethod visit :select-keys [_ schema _ options] (describe* (m/deref schema) options))
-(defmethod visit :and [_ s children _] (str (str/join " && " children) (-titled s)))
+(defmethod visit :and [_ s children _] (str (str/join ", and " children) (-titled s)))
 (defmethod visit :enum [_ s children _options] (str "enum" (-titled s) " of " (str/join ", " children)))
 (defmethod visit :maybe [_ _ children _] (str (first children) " nullable"))
 (defmethod visit :tuple [_ _ children _] (str "(" (str/join ", " children) ")"))
@@ -107,8 +106,7 @@
 (defmethod visit :qualified-symbol [_ _ _ _] "qualified symbol")
 (defmethod visit :uuid [_ _ _ _] "uuid")
 (defmethod visit :boolean [_ _ _ _] "boolean")
-(defmethod visit :keyword [_ _ _ _] "string")
-(defmethod visit :fn [_ _ _ _] "FN")
+(defmethod visit :keyword [_ _ _ _] "keyword")
 
 (defmethod visit :vector [_ _ children _]
   (str "[" (last children) "]"))
@@ -125,10 +123,8 @@
 (defmethod visit :repeat [_ schema children _]
   (str "repeat " (-diamond (first children)) (-repeat-suffix schema)))
 
-(defmethod visit :set [_ schema children _]
-  (str "set[" (first children) "]" (minmax-suffix schema)))
 
-(defmethod visit ::sm/set [_ schema children _]
+(defmethod visit :set [_ schema children _]
   (str "set[" (first children) "]" (minmax-suffix schema)))
 
 (defmethod visit ::m/val [_ schema children _]
@@ -156,6 +152,7 @@
     (or (:title props)
         "*")))
 
+
 (defmethod visit :map
   [_ schema children {:keys [::level ::max-level] :as options}]
   (let [props   (m/properties schema)
@@ -175,11 +172,13 @@
                                       ": " s)))
                           (str/join ",\n"))
 
-            header   (cond-> (str "type " title)
+            header   (cond-> (if (zero? level)
+                               (str "type " title)
+                               (str title))
                        closed?       (str "!")
                        (some? title) (str " "))]
 
-        (str (pad header level) "{\n" entries "\n" (pad "}\n" level))))))
+        (str header "{\n" entries "\n" (pad "}" level))))))
 
 (defmethod visit :multi
   [_ s children {:keys [::level ::max-level] :as options}]
@@ -206,18 +205,18 @@
 
 (defmethod visit :merge
   [_ schema children _]
-  (let [entries (str/join ",\n" children)
+  (let [entries (str/join " , " children)
         props   (m/properties schema)
         title   (or (some-> (:title props) str/camel str/capital)
                     "<untitled>")]
-    (str "merge type " title " { \n" entries "\n}\n")))
+    (str "merge object " title " { " entries " }")))
 
-(defmethod visit ::sm/one-of
-  [_ _ children _]
+(defmethod visit :app.common.schema/one-of
+  [_ _  children _]
   (let [elems (last children)]
-    (str "string oneOf (" (->> elems
-                               (map d/name)
-                               (str/join "|")) ")")))
+    (str "OneOf[" (->> elems
+                       (map d/name)
+                       (str/join ",")) "]")))
 
 (defmethod visit :schema [_ schema children options]
   (visit ::m/schema schema children options))

common/src/app/common/schema/generators.cljc

@@ -5,10 +5,9 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.common.schema.generators
-  (:refer-clojure :exclude [set subseq uuid filter map let boolean vector keyword int double])
+  (:refer-clojure :exclude [set subseq uuid filter map let boolean vector])
   #?(:cljs (:require-macros [app.common.schema.generators]))
   (:require
-   [app.common.math :as mth]
    [app.common.schema.registry :as sr]
    [app.common.uri :as u]
    [app.common.uuid :as uuid]
@@ -39,10 +38,13 @@
   ([s opts]
    (mg/generator s (assoc opts :registry sr/default-registry))))
 
+(defn filter
+  [pred gen]
+  (tg/such-that pred gen 100))
+
 (defn small-double
   [& {:keys [min max] :or {min -100 max 100}}]
-  (->> (tg/double* {:min min, :max max, :infinite? false, :NaN? false})
-       (tg/fmap #(mth/precision % 2))))
+  (tg/double* {:min min, :max max, :infinite? false, :NaN? false}))
 
 (defn small-int
   [& {:keys [min max] :or {min -100 max 100}}]
@@ -59,7 +61,7 @@
 (defn word-keyword
   []
   (->> (word-string)
-       (tg/fmap c/keyword)))
+       (tg/fmap keyword)))
 
 (defn email
   []
@@ -98,11 +100,12 @@
                           (c/map second))
                          (c/map list bools elements)))))))
 
-(defn map-of
-  ([kg vg]
-   (tg/map kg vg {:min-elements 1 :max-elements 3}))
-  ([kg vg opts]
-   (tg/map kg vg opts)))
+(def any tg/any)
+(def boolean tg/boolean)
+
+(defn set
+  [g]
+  (tg/set g))
 
 (defn elements
   [s]
@@ -116,10 +119,6 @@
   [f g]
   (tg/fmap f g))
 
-(defn filter
-  [pred gen]
-  (tg/such-that pred gen 100))
-
 (defn mcat
   [f g]
   (tg/bind g f))
@@ -131,18 +130,3 @@
 (defn vector
   [& opts]
   (apply tg/vector opts))
-
-(defn set
-  [g]
-  (tg/set g))
-
-;; Static Generators
-
-(def boolean tg/boolean)
-(def text (word-string))
-(def double (small-double))
-(def int (small-int))
-(def keyword (word-keyword))
-
-(def any
-  (tg/one-of [text boolean double int keyword]))

common/src/app/common/schema/openapi.cljc

@@ -97,8 +97,7 @@
 (defmethod visit :enum [_ _ children options] (merge (some-> (m/-infer children) (transform* options)) {:enum children}))
 (defmethod visit :maybe [_ _ children _] {:oneOf (conj children {:type "null"})})
 (defmethod visit :tuple [_ _ children _] {:type "array", :items children, :additionalItems false})
-(defmethod visit :re [_ schema _ options]
-  {:type "string", :pattern (str (first (m/children schema options)))})
+(defmethod visit :re [_ schema _ options] {:type "string", :pattern (first (m/children schema options))})
 (defmethod visit :nil [_ _ _ _] {:type "null"})
 
 (defmethod visit :string [_ schema _ _]

common/src/app/common/svg.cljc

@@ -6,6 +6,8 @@
 
 (ns app.common.svg
   (:require
+   #?(:clj  [clojure.xml :as xml]
+      :cljs [tubax.core :as tubax])
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.geom.matrix :as gmt]
@@ -13,7 +15,15 @@
    [app.common.geom.shapes :as gsh]
    [app.common.math :as mth]
    [app.common.uuid :as uuid]
-   [cuerdas.core :as str]))
+   [cuerdas.core :as str])
+  #?(:clj
+     (:import
+      clojure.lang.XMLHandler
+      java.io.InputStream
+      javax.xml.XMLConstants
+      javax.xml.parsers.SAXParserFactory
+      org.apache.commons.io.IOUtils)))
+
 
 ;; Regex for XML ids per Spec
 ;; https://www.w3.org/TR/2008/REC-xml-20081126/#sec-common-syn
@@ -1020,3 +1030,24 @@
                          :height (d/parse-integer (:height attrs) 0)})))]
     (reduce-nodes redfn [] svg-data)))
 
+#?(:clj
+   (defn- secure-parser-factory
+     [^InputStream input ^XMLHandler handler]
+     (.. (doto (SAXParserFactory/newInstance)
+           (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
+           (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
+         (newSAXParser)
+         (parse input handler))))
+
+(defn strip-doctype
+  [data]
+  (cond-> data
+    (str/includes? data "<!DOCTYPE")
+    (str/replace #"<\!DOCTYPE[^>]*>" "")))
+
+(defn parse
+  [text]
+  #?(:cljs (tubax/xml->clj text)
+     :clj  (let [text (strip-doctype text)]
+             (dm/with-open [istream (IOUtils/toInputStream text "UTF-8")]
+               (xml/parse istream secure-parser-factory)))))

common/src/app/common/svg/shapes_builder.cljc

@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.common.files.shapes-builder
+(ns app.common.svg.shapes-builder
   "A SVG to Shapes builder."
   (:require
    [app.common.colors :as clr]
@@ -21,7 +21,7 @@
    [app.common.math :as mth]
    [app.common.schema :as sm :refer [max-safe-int min-safe-int]]
    [app.common.svg :as csvg]
-   [app.common.types.path :as path]
+   [app.common.svg.path :as path]
    [app.common.types.path.segment :as path.segm]
    [app.common.types.shape :as cts]
    [app.common.uuid :as uuid]
@@ -219,7 +219,7 @@
 (defn create-path-shape [name frame-id svg-data {:keys [attrs] :as data}]
   (when (and (contains? attrs :d) (seq (:d attrs)))
     (let [transform (csvg/parse-transform (:transform attrs))
-          content   (cond-> (path/from-string (:d attrs))
+          content   (cond-> (path/parse (:d attrs))
                       (some? transform)
                       (path.segm/transform-content transform))
 

common/src/app/common/test_helpers/components.cljc

@@ -156,7 +156,7 @@
 
         [new_shape _ changes]
         (-> (pcb/empty-changes nil (:id page))
-            (cll/generate-component-swap objects shape (:data file) page libraries id-new-component 0 nil keep-props-values false))
+            (cll/generate-component-swap objects shape (:data file) page libraries id-new-component 0 nil keep-props-values))
 
         file' (thf/apply-changes file changes)]
 

common/src/app/common/test_helpers/compositions.cljc

@@ -14,9 +14,7 @@
    [app.common.test-helpers.components :as thc]
    [app.common.test-helpers.files :as thf]
    [app.common.test-helpers.shapes :as ths]
-   [app.common.text :as txt]
-   [app.common.types.container :as ctn]
-   [app.common.types.shape :as cts]))
+   [app.common.types.container :as ctn]))
 
 ;; ----- File building
 
@@ -29,14 +27,6 @@
                                 :name "Rect1"}
                                params)))
 
-(defn add-text
-  [file text-label content & {:keys [text-params] :as text}]
-  (let [shape (-> (cts/setup-shape {:type :text :x 0 :y 0})
-                  (txt/change-text content))]
-    (ths/add-sample-shape file text-label
-                          (merge shape
-                                 text-params))))
-
 (defn add-frame
   [file frame-label & {:keys [] :as params}]
   ;; Generated shape tree:
@@ -68,18 +58,6 @@
                                     :parent-label frame-label}
                                    child-params))))
 
-(defn add-frame-with-text
-  [file frame-label child-label text & {:keys [frame-params child-params]}]
-  (let [shape (-> (cts/setup-shape {:type :text :x 0 :y 0 :grow-type :auto-width})
-                  (txt/change-text text)
-                  (assoc :position-data nil
-                         :parent-label frame-label))]
-    (-> file
-        (add-frame frame-label frame-params)
-        (ths/add-sample-shape child-label
-                              (merge shape
-                                     child-params)))))
-
 (defn add-minimal-component
   [file component-label root-label
    & {:keys [component-params root-params]}]
@@ -291,8 +269,7 @@
                                           :id)
                                      0
                                      nil
-                                     {}
-                                     false)
+                                     {})
 
         file' (thf/apply-changes file changes)]
     (if propagate-fn

common/src/app/common/test_helpers/shapes.cljc

@@ -7,12 +7,11 @@
 (ns app.common.test-helpers.shapes
   (:require
    [app.common.colors :as clr]
-   [app.common.data :as d]
    [app.common.files.helpers :as cfh]
    [app.common.test-helpers.files :as thf]
    [app.common.test-helpers.ids-map :as thi]
-   [app.common.text :as txt]
    [app.common.types.color :as ctc]
+   [app.common.types.colors-list :as ctcl]
    [app.common.types.container :as ctn]
    [app.common.types.pages-list :as ctpl]
    [app.common.types.shape :as cts]
@@ -82,31 +81,9 @@
                                 (:id page)
                                 #(ctst/set-shape % (ctn/set-shape-attr shape attr val)))))))
 
-(defn update-shape-text
-  [file shape-label attr val & {:keys [page-label]}]
-  (let [page (if page-label
-               (thf/get-page file page-label)
-               (thf/current-page file))
-        shape (ctst/get-shape page (thi/id shape-label))]
-    (update file :data
-            (fn [file-data]
-              (ctpl/update-page file-data
-                                (:id page)
-                                #(ctst/set-shape % (txt/update-text-content shape
-                                                                            txt/is-content-node?
-                                                                            d/txt-merge
-                                                                            {attr val})))))))
-
-(defn sample-library-color
-  [label & {:keys [name path color opacity gradient image]}]
-  (-> {:id (thi/new-id! label)
-       :name (or name color "Black")
-       :path path
-       :color (or color "#000000")
-       :opacity (or opacity 1)
-       :gradient gradient
-       :image image}
-      (d/without-nils)))
+(defn sample-color
+  [label & {:keys [] :as params}]
+  (ctc/make-color (assoc params :id (thi/new-id! label))))
 
 (defn sample-fill-color
   [& {:keys [fill-color fill-opacity] :as params}]
@@ -124,8 +101,8 @@
 
 (defn add-sample-library-color
   [file label & {:keys [] :as params}]
-  (let [color (sample-library-color label params)]
-    (update file :data ctc/add-color color)))
+  (let [color (sample-color label params)]
+    (update file :data ctcl/add-color color)))
 
 (defn sample-typography
   [label & {:keys [] :as params}]
@@ -149,4 +126,4 @@
             (fn [file-data]
               (ctpl/update-page file-data
                                 (:id page)
-                                #(ctst/set-shape % (assoc origin :interactions interactions)))))))
+                                #(ctst/set-shape % (assoc origin :interactions interactions)))))))

common/src/app/common/test_helpers/tokens.cljc

@@ -36,9 +36,9 @@
           (ctob/get-token token-name)))))
 
 (defn token-data-eq?
-  "Compare token data without comparing unstable fields."
+  "Compare token data without comparing modified timestamp"
   [t1 t2]
-  (= (dissoc t1 :id :modified-at) (dissoc t2 :id :modified-at)))
+  (= (dissoc t1 :modified-at) (dissoc t2 :modified-at)))
 
 (defn- set-stroke-width
   [shape stroke-width]

common/src/app/common/text.cljc

@@ -121,6 +121,30 @@
    {:name "Source Sans Pro Regular"}
    (select-keys default-text-attrs typography-fields)))
 
+(defn transform-nodes
+  ([transform root]
+   (transform-nodes identity transform root))
+  ([pred transform root]
+   (walk/postwalk
+    (fn [item]
+      (if (and (map? item) (pred item))
+        (transform item)
+        item))
+    root)))
+
+(defn xform-nodes
+  "The same as transform but instead of receiving a funcion, receives
+  a transducer."
+  [xf root]
+  (let [rf (fn [_ v] v)]
+    (walk/postwalk
+     (fn [item]
+       (let [rf (xf rf)]
+         (if (map? item)
+           (d/nilv (rf nil item) item)
+           item)))
+     root)))
+
 (defn node-seq
   ([root] (node-seq identity root))
   ([match? root]
@@ -130,12 +154,8 @@
 
 (defn is-text-node?
   [node]
-  (and (nil? (:type node))
-       (string? (:text node))))
-
-(defn is-paragraph-set-node?
-  [node]
-  (= "paragraph-set" (:type node)))
+  (and (string? (:text node))
+       (not= (:text node) "")))
 
 (defn is-paragraph-node?
   [node]
@@ -145,38 +165,6 @@
   [node]
   (= "root" (:type node)))
 
-(defn is-node?
-  [node]
-  (or ^boolean (is-text-node? node)
-      ^boolean (is-paragraph-node? node)
-      ^boolean (is-paragraph-set-node? node)
-      ^boolean (is-root-node? node)))
-
-(defn is-content-node?
-  "Only matches content nodes, ignoring the paragraph-set nodes."
-  [node]
-  (or ^boolean (is-text-node? node)
-      ^boolean (is-paragraph-node? node)
-      ^boolean (is-root-node? node)))
-
-(defn transform-nodes
-  ([transform root]
-   (transform-nodes identity transform root))
-  ([pred transform root]
-   (walk/postwalk
-    (fn [item]
-      (if (and (is-node? item) (pred item))
-        (transform item)
-        item))
-    root)))
-
-(defn update-text-content
-  [shape pred-fn update-fn attrs]
-  (let [update-attrs-fn #(update-fn % attrs)
-        transform   #(transform-nodes pred-fn update-attrs-fn %)]
-    (-> shape
-        (update :content transform))))
-
 (defn generate-shape-name
   [text]
   (subs text 0 (min 280 (count text))))

common/src/app/common/transit.cljc

@@ -208,13 +208,9 @@
   ([data] (encode-str data nil))
   ([data opts]
    #?(:cljs
-      (let [type   (:type opts :json)
-            params {:handlers @write-handler-map}
-            params (if (:with-meta opts)
-                     (assoc params :transform t/write-meta)
-                     params)
-            writer (t/writer type params)]
-        (t/write writer data))
+      (let [t (:type opts :json)
+            w (t/writer t {:handlers @write-handler-map})]
+        (t/write w data))
       :clj
       (->> (encode data opts)
            (bytes->str)))))
@@ -223,10 +219,9 @@
   ([data] (decode-str data nil))
   ([data opts]
    #?(:cljs
-      (let [type   (:type opts :json)
-            params {:handlers @read-handler-map}
-            reader (t/reader type params)]
-        (t/read reader data))
+      (let [t (:type opts :json)
+            r (t/reader t {:handlers @read-handler-map})]
+        (t/read r data))
       :clj
       (-> (str->bytes data)
           (decode opts)))))

common/src/app/common/types/color.cljc

@@ -8,36 +8,23 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
-   [app.common.media :as cm]
    [app.common.schema :as sm]
    [app.common.schema.generators :as sg]
    [app.common.schema.openapi :as-alias oapi]
    [app.common.text :as txt]
-   [app.common.time :as dt]
    [app.common.types.plugins :as ctpg]
-   [clojure.set :as set]
+   [app.common.uuid :as uuid]
    [cuerdas.core :as str]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMAS & TYPES
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private required-color-attrs
-  "A set used for proper check if color should contain only one of the
-  attrs listed in this set."
-  #{:image :gradient :color})
-
-(defn has-valid-color-attrs?
-  "Check if color has correct color attrs"
-  [color]
-  (let [attrs (set (keys color))
-        result (set/intersection attrs required-color-attrs)]
-    (= 1 (count result))))
-
-(def ^:private hex-color-rx
+(def rgb-color-re
   #"^#(?:[0-9a-fA-F]{3}){1,2}$")
 
-(def ^:private hex-color-generator
+(defn- generate-rgb-color
+  []
   (sg/fmap (fn [_]
              #?(:clj (format "#%06x" (rand-int 16rFFFFFF))
                 :cljs
@@ -48,50 +35,40 @@
                        (.. r (toString 16) (padStart 2 "0"))
                        (.. g (toString 16) (padStart 2 "0"))
                        (.. b (toString 16) (padStart 2 "0"))))))
-           sg/int))
+           sg/any))
 
-(defn hex-color-string?
+(defn rgb-color-string?
   [o]
-  (and (string? o) (some? (re-matches hex-color-rx o))))
+  (and (string? o) (some? (re-matches rgb-color-re o))))
 
-(def schema:hex-color
+(def schema:rgb-color
   (sm/register!
-   {:type ::hex-color
-    :pred hex-color-string?
+   {:type ::rgb-color
+    :pred rgb-color-string?
     :type-properties
-    {:title "hex-color"
-     :description "HEX Color String"
-     :error/message "expected a valid HEX color"
-     :error/code "errors.invalid-hex-color"
-     :gen/gen hex-color-generator
+    {:title "rgb-color"
+     :description "RGB Color String"
+     :error/message "expected a valid RGB color"
+     :error/code "errors.invalid-rgb-color"
+     :gen/gen (generate-rgb-color)
      ::oapi/type "integer"
      ::oapi/format "int64"}}))
 
-(def schema:plain-color
-  [:map [:color schema:hex-color]])
-
-(def schema:image
-  [:map {:title "ImageColor" :closed true}
-   [:width [::sm/int {:min 0 :gen/gen sg/int}]]
-   [:height [::sm/int {:min 0 :gen/gen sg/int}]]
-   [:mtype {:gen/gen (sg/elements cm/image-types)} ::sm/text]
-   [:id ::sm/uuid]
-   [:name {:optional true} ::sm/text]
-   [:keep-aspect-ratio {:optional true} :boolean]])
-
-(def image-attrs
-  "A set of attrs that corresponds to image data type"
-  (sm/keys schema:image))
-
 (def schema:image-color
-  [:map [:image schema:image]])
+  [:map {:title "ImageColor"}
+   [:name {:optional true} :string]
+   [:width ::sm/int]
+   [:height ::sm/int]
+   [:mtype {:optional true} [:maybe :string]]
+   [:id ::sm/uuid]
+   [:keep-aspect-ratio {:optional true} :boolean]])
 
 (def gradient-types
   #{:linear :radial})
 
 (def schema:gradient
-  [:map {:title "Gradient" :closed true}
-   [:type [::sm/one-of gradient-types]]
+  [:map {:title "Gradient"}
+   [:type [::sm/one-of #{:linear :radial}]]
    [:start-x ::sm/safe-number]
    [:start-y ::sm/safe-number]
    [:end-x ::sm/safe-number]
@@ -100,90 +77,85 @@
    [:stops
     [:vector {:min 1 :gen/max 2}
      [:map {:title "GradientStop"}
-      [:color schema:hex-color]
-      [:opacity {:optional true} [::sm/number {:min 0 :max 1}]]
-      [:offset [::sm/number {:min 0 :max 1}]]]]]])
-
-(def gradient-attrs
-  "A set of attrs that corresponds to gradient data type"
-  (sm/keys schema:gradient))
-
-(def schema:gradient-color
-  [:map [:gradient schema:gradient]])
+      [:color schema:rgb-color]
+      [:opacity {:optional true} [:maybe ::sm/safe-number]]
+      [:offset ::sm/safe-number]]]]])
 
 (def schema:color-attrs
-  [:map {:title "ColorAttrs" :closed true}
-   [:opacity {:optional true} [::sm/number {:min 0 :max 1}]]
-   [:ref-id {:optional true} ::sm/uuid]
-   [:ref-file {:optional true} ::sm/uuid]])
-
-;; This schema represent an "applied color"
-(def schema:color
-  [:and
-   [:merge {:title "Color"}
-    schema:color-attrs
-    (sm/optional-keys schema:plain-color)
-    (sm/optional-keys schema:gradient-color)
-    (sm/optional-keys schema:image-color)]
-   [:fn has-valid-color-attrs?]])
-
-(def color-attrs
-  (into required-color-attrs (sm/keys schema:color-attrs)))
-
-(def schema:library-color-attrs
-  [:map {:title "ColorAttrs" :closed true}
-   [:id ::sm/uuid]
-   [:name ::sm/text]
-   [:path {:optional true} :string]
-   [:opacity {:optional true} [::sm/number {:min 0 :max 1}]]
+  [:map {:title "ColorAttrs"}
+   [:id {:optional true} ::sm/uuid]
+   [:name {:optional true} :string]
+   [:path {:optional true} [:maybe :string]]
+   [:value {:optional true} [:maybe :string]]
+   [:color {:optional true} [:maybe schema:rgb-color]]
+   [:opacity {:optional true} [:maybe ::sm/safe-number]]
    [:modified-at {:optional true} ::sm/inst]
+   [:ref-id {:optional true} ::sm/uuid]
+   [:ref-file {:optional true} ::sm/uuid]
+   [:gradient {:optional true} [:maybe schema:gradient]]
+   [:image {:optional true} [:maybe schema:image-color]]
    [:plugin-data {:optional true} ::ctpg/plugin-data]])
 
-(def schema:library-color
-  "Used for in-transit representation of a color (per example when user
-  clicks a color on assets sidebar, the color should be properly identified with
-  the file-id where it belongs)"
-  [:and
-   [:merge
-    schema:library-color-attrs
-    (sm/optional-keys schema:plain-color)
-    (sm/optional-keys schema:gradient-color)
-    (sm/optional-keys schema:image-color)]
-   [:fn has-valid-color-attrs?]])
+(def schema:color
+  [:and schema:color-attrs
+   [::sm/contains-any {:strict true} [:color :gradient :image]]])
 
-(def library-color-attrs
-  (into required-color-attrs (sm/keys schema:library-color-attrs)))
+(def schema:recent-color
+  [:and
+   [:map {:title "RecentColor"}
+    [:opacity {:optional true} [:maybe ::sm/safe-number]]
+    [:color {:optional true} [:maybe schema:rgb-color]]
+    [:gradient {:optional true} [:maybe schema:gradient]]
+    [:image {:optional true} [:maybe schema:image-color]]]
+   [::sm/contains-any {:strict true} [:color :gradient :image]]])
+
+;; Same as color but with :id prop required
+(def schema:library-color
+  [:and
+   (sm/required-keys schema:color-attrs [:id])
+   [::sm/contains-any {:strict true} [:color :gradient :image]]])
+
+(sm/register! ::color schema:color)
+(sm/register! ::gradient schema:gradient)
+(sm/register! ::image-color schema:image-color)
+(sm/register! ::recent-color schema:recent-color)
+(sm/register! ::color-attrs schema:color-attrs)
 
 (def valid-color?
   (sm/lazy-validator schema:color))
 
-(def valid-library-color?
-  (sm/lazy-validator schema:library-color))
-
 (def check-color
   (sm/check-fn schema:color :hint "expected valid color"))
 
 (def check-library-color
-  (sm/check-fn schema:library-color :hint "expected valid color"))
+  (sm/check-fn schema:library-color :hint "expected valid library color"))
+
+(def check-recent-color
+  (sm/check-fn schema:recent-color :hint "expected valid recent color"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn library-color->color
-  "Converts a library color data structure to a plain color data structure"
-  [lcolor file-id]
-  (-> lcolor
-      (select-keys [:image :gradient :color :opacity])
-      (assoc :ref-id (get lcolor :id))
-      (assoc :ref-file file-id)
-      (vary-meta assoc
-                 :path (get lcolor :path)
-                 :name (get lcolor :name))))
+;; --- factory
+
+(defn make-color
+  [{:keys [id name path value color opacity ref-id ref-file gradient image]}]
+  (-> {:id (or id (uuid/next))
+       :name (or name color "Black")
+       :path path
+       :value value
+       :color (or color "#000000")
+       :opacity (or opacity 1)
+       :ref-id ref-id
+       :ref-file ref-file
+       :gradient gradient
+       :image image}
+      (d/without-nils)))
 
 ;; --- fill
 
-(defn fill->color
+(defn fill->shape-color
   [fill]
   (d/without-nils
    {:color (:fill-color fill)
@@ -205,130 +177,126 @@
 
 (defn attach-fill-color
   [shape position ref-id ref-file]
-  (d/update-in-when shape [:fills position]
-                    (fn [fill]
-                      (-> fill
-                          (assoc :fill-color-ref-file ref-file)
-                          (assoc :fill-color-ref-id ref-id)))))
+  (-> shape
+      (assoc-in [:fills position :fill-color-ref-id] ref-id)
+      (assoc-in [:fills position :fill-color-ref-file] ref-file)))
 
 (defn detach-fill-color
   [shape position]
-  (d/update-in-when shape [:fills position] dissoc :fill-color-ref-id :fill-color-ref-file))
+  (-> shape
+      (d/dissoc-in [:fills position :fill-color-ref-id])
+      (d/dissoc-in [:fills position :fill-color-ref-file])))
 
 ;; stroke
 
-(defn stroke->color
+(defn stroke->shape-color
   [stroke]
-  (d/without-nils
-   {:color (str/lower (:stroke-color stroke))
-    :opacity (:stroke-opacity stroke)
-    :gradient (:stroke-color-gradient stroke)
-    :image (:stroke-image stroke)
-    :ref-id (:stroke-color-ref-id stroke)
-    :ref-file (:stroke-color-ref-file stroke)}))
+  (d/without-nils {:color (:stroke-color stroke)
+                   :opacity (:stroke-opacity stroke)
+                   :gradient (:stroke-color-gradient stroke)
+                   :image (:stroke-image stroke)
+                   :ref-id (:stroke-color-ref-id stroke)
+                   :ref-file (:stroke-color-ref-file stroke)}))
 
 (defn set-stroke-color
   [shape position color opacity gradient image]
-  (d/update-in-when shape [:strokes position]
-                    (fn [stroke]
-                      (-> stroke
-                          (assoc :stroke-color color)
-                          (assoc :stroke-opacity opacity)
-                          (assoc :stroke-color-gradient gradient)
-                          (assoc :stroke-image image)
-                          (d/without-nils)))))
+  (update-in shape [:strokes position]
+             (fn [stroke]
+               (d/without-nils (assoc stroke
+                                      :stroke-color color
+                                      :stroke-opacity opacity
+                                      :stroke-color-gradient gradient
+                                      :stroke-image image)))))
 
 (defn attach-stroke-color
   [shape position ref-id ref-file]
-  (d/update-in-when shape [:strokes position]
-                    (fn [stroke]
-                      (-> stroke
-                          (assoc :stroke-color-ref-id ref-id)
-                          (assoc :stroke-color-ref-file ref-file)))))
+  (-> shape
+      (assoc-in [:strokes position :stroke-color-ref-id] ref-id)
+      (assoc-in [:strokes position :stroke-color-ref-file] ref-file)))
 
 (defn detach-stroke-color
   [shape position]
-  (d/update-in-when shape [:strokes position] dissoc :stroke-color-ref-id :stroke-color-ref-file))
+  (-> shape
+      (d/dissoc-in [:strokes position :stroke-color-ref-id])
+      (d/dissoc-in [:strokes position :stroke-color-ref-file])))
 
 ;; shadow
 
-(defn shadow->color
+(defn shadow->shape-color
   [shadow]
-  (:color shadow))
+  (d/without-nils {:color (-> shadow :color :color)
+                   :opacity (-> shadow :color :opacity)
+                   :gradient (-> shadow :color :gradient)
+                   :ref-id (-> shadow :color :id)
+                   :ref-file (-> shadow :color :file-id)}))
 
 (defn set-shadow-color
   [shape position color opacity gradient]
-  (d/update-in-when shape [:shadow position :color]
-                    (fn [shadow-color]
-                      (-> shadow-color
-                          (assoc :color color)
-                          (assoc :opacity opacity)
-                          (assoc :gradient gradient)
-                          (d/without-nils)))))
+  (update-in shape [:shadow position :color]
+             (fn [shadow-color]
+               (d/without-nils (assoc shadow-color
+                                      :color color
+                                      :opacity opacity
+                                      :gradient gradient)))))
 
 (defn attach-shadow-color
   [shape position ref-id ref-file]
-  (d/update-in-when shape [:shadow position :color]
-                    (fn [color]
-                      (-> color
-                          (assoc :ref-id ref-id)
-                          (assoc :ref-file ref-file)))))
+  (-> shape
+      (assoc-in [:shadow position :color :id] ref-id)
+      (assoc-in [:shadow position :color :file-id] ref-file)))
 
 (defn detach-shadow-color
   [shape position]
-  (d/update-in-when shape [:shadow position :color] dissoc :ref-id :ref-file))
+  (-> shape
+      (d/dissoc-in [:shadow position :color :id])
+      (d/dissoc-in [:shadow position :color :file-id])))
 
 ;; grid
 
-;: FIXME: revisit colors...... WTF
-(defn grid->color
+(defn grid->shape-color
   [grid]
-  (let [color (-> grid :params :color)]
-    (d/without-nils
-     {:color (-> color :color)
-      :opacity (-> color :opacity)
-      :gradient (-> color :gradient)
-      :ref-id (-> color :id)
-      :ref-file (-> color :file-id)})))
+  (d/without-nils {:color (-> grid :params :color :color)
+                   :opacity (-> grid :params :color :opacity)
+                   :gradient (-> grid :params :color :gradient)
+                   :ref-id (-> grid :params :color :id)
+                   :ref-file (-> grid :params :color :file-id)}))
 
 (defn set-grid-color
   [shape position color opacity gradient]
-  (d/update-in-when shape [:grids position :params :color]
-                    (fn [grid-color]
-                      (-> grid-color
-                          (assoc :color color)
-                          (assoc :opacity opacity)
-                          (assoc :gradient gradient)
-                          (d/without-nils)))))
-
+  (update-in shape [:grids position :params :color]
+             (fn [grid-color]
+               (d/without-nils (assoc grid-color
+                                      :color color
+                                      :opacity opacity
+                                      :gradient gradient)))))
 (defn attach-grid-color
   [shape position ref-id ref-file]
-  (d/update-in-when shape [:grids position :params :color]
-                    (fn [color]
-                      (-> color
-                          (assoc :ref-id ref-id)
-                          (assoc :ref-file ref-file)))))
+  (-> shape
+      (assoc-in [:grids position :params :color :id] ref-id)
+      (assoc-in [:grids position :params :color :file-id] ref-file)))
 
 (defn detach-grid-color
   [shape position]
-  (d/update-in-when shape [:grids position :params :color] dissoc :ref-id :ref-file))
+  (-> shape
+      (d/dissoc-in [:grids position :params :color :id])
+      (d/dissoc-in [:grids position :params :color :file-id])))
 
 ;; --- Helpers for all colors in a shape
 
 (defn get-text-node-colors
   "Get all colors used by a node of a text shape"
   [node]
-  (concat (map fill->color (:fills node))
-          (map stroke->color (:strokes node))))
+  (concat (map fill->shape-color (:fills node))
+          (map stroke->shape-color (:strokes node))))
 
 (defn get-all-colors
   "Get all colors used by a shape, in any section."
   [shape]
-  (concat (map fill->color (:fills shape))
-          (map stroke->color (:strokes shape))
-          (map shadow->color (:shadow shape))
+  (concat (map fill->shape-color (:fills shape))
+          (map stroke->shape-color (:strokes shape))
+          (map shadow->shape-color (:shadow shape))
           (when (= (:type shape) :frame)
-            (map grid->color (:grids shape)))
+            (map grid->shape-color (:grids shape)))
           (when (= (:type shape) :text)
             (reduce (fn [colors node]
                       (concat colors (get-text-node-colors node)))
@@ -357,7 +325,7 @@
   (let [process-fill (fn [shape [position fill]]
                        (process-fn shape
                                    position
-                                   (fill->color fill)
+                                   (fill->shape-color fill)
                                    set-fill-color
                                    attach-fill-color
                                    detach-fill-color))
@@ -365,7 +333,7 @@
         process-stroke (fn [shape [position stroke]]
                          (process-fn shape
                                      position
-                                     (stroke->color stroke)
+                                     (stroke->shape-color stroke)
                                      set-stroke-color
                                      attach-stroke-color
                                      detach-stroke-color))
@@ -373,7 +341,7 @@
         process-shadow (fn [shape [position shadow]]
                          (process-fn shape
                                      position
-                                     (shadow->color shadow)
+                                     (shadow->shape-color shadow)
                                      set-shadow-color
                                      attach-shadow-color
                                      detach-shadow-color))
@@ -381,7 +349,7 @@
         process-grid (fn [shape [position grid]]
                        (process-fn shape
                                    position
-                                   (grid->color grid)
+                                   (grid->shape-color grid)
                                    set-grid-color
                                    attach-grid-color
                                    detach-grid-color))
@@ -438,76 +406,114 @@
 
     (process-shape-colors shape sync-color)))
 
-(defn- stroke->color-att
-  [stroke file-id libraries]
-  (let [ref-file      (:stroke-color-ref-file stroke)
-        ref-id        (:stroke-color-ref-id stroke)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        has-color?    (or (:stroke-color stroke)
-                          (:stroke-color-gradient stroke))
-        attrs         (cond-> (stroke->color stroke)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-id :ref-file))]
+(defn- eq-recent-color?
+  [c1 c2]
+  (or (= c1 c2)
+      (and (some? (:color c1))
+           (some? (:color c2))
+           (= (:color c1) (:color c2)))))
+
+(defn add-recent-color
+  "Moves the color to the top of the list and then truncates up to 15"
+  [state file-id color]
+  (update state file-id (fn [colors]
+                          (let [colors (d/removev (partial eq-recent-color? color) colors)
+                                colors (conj colors color)]
+                            (cond-> colors
+                              (> (count colors) 15)
+                              (subvec 1))))))
+
+(defn stroke->color-att
+  [stroke file-id shared-libs]
+  (let [color-file-id      (:stroke-color-ref-file stroke)
+        color-id           (:stroke-color-ref-id stroke)
+        shared-libs-colors (dm/get-in shared-libs [color-file-id :data :colors])
+        is-shared?         (contains? shared-libs-colors color-id)
+        has-color?         (or (not (nil? (:stroke-color stroke))) (not (nil? (:stroke-color-gradient stroke))))
+        attrs              (if (or is-shared? (= color-file-id file-id))
+                             (d/without-nils {:color    (str/lower (:stroke-color stroke))
+                                              :opacity  (:stroke-opacity stroke)
+                                              :id       color-id
+                                              :file-id  color-file-id
+                                              :gradient (:stroke-color-gradient stroke)})
+                             (d/without-nils {:color    (str/lower (:stroke-color stroke))
+                                              :opacity  (:stroke-opacity stroke)
+                                              :gradient (:stroke-color-gradient stroke)}))]
     (when has-color?
       {:attrs attrs
        :prop :stroke
        :shape-id (:shape-id stroke)
        :index (:index stroke)})))
 
-(defn- shadow->color-att
-  [shadow file-id libraries]
-  (let [color         (get shadow :color)
-        ref-file      (get color :ref-file)
-        ref-id        (get color :ref-id)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        attrs         (cond-> (shadow->color shadow)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
+(defn shadow->color-att
+  [shadow file-id shared-libs]
+  (let [color-file-id      (dm/get-in shadow [:color :file-id])
+        color-id           (dm/get-in shadow [:color :id])
+        shared-libs-colors (dm/get-in shared-libs [color-file-id :data :colors])
+        is-shared?         (contains? shared-libs-colors color-id)
+        attrs              (if (or is-shared? (= color-file-id file-id))
+                             (d/without-nils {:color    (str/lower (dm/get-in shadow [:color :color]))
+                                              :opacity  (dm/get-in shadow [:color :opacity])
+                                              :id       color-id
+                                              :file-id  (dm/get-in shadow [:color :file-id])
+                                              :gradient (dm/get-in shadow [:color :gradient])})
+                             (d/without-nils {:color    (str/lower (dm/get-in shadow [:color :color]))
+                                              :opacity  (dm/get-in shadow [:color :opacity])
+                                              :gradient (dm/get-in shadow [:color :gradient])}))]
+
+
     {:attrs attrs
      :prop :shadow
      :shape-id (:shape-id shadow)
      :index (:index shadow)}))
 
-(defn- text->color-att
-  [fill file-id libraries]
-  (let [ref-file      (:fill-color-ref-file fill)
-        ref-id        (:fill-color-ref-id fill)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        attrs         (cond-> (fill->color fill)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
-
+(defn text->color-att
+  [fill file-id shared-libs]
+  (let [color-file-id      (:fill-color-ref-file fill)
+        color-id           (:fill-color-ref-id fill)
+        shared-libs-colors (dm/get-in shared-libs [color-file-id :data :colors])
+        is-shared?         (contains? shared-libs-colors color-id)
+        attrs              (if (or is-shared? (= color-file-id file-id))
+                             (d/without-nils {:color    (str/lower (:fill-color fill))
+                                              :opacity  (:fill-opacity fill)
+                                              :id       color-id
+                                              :file-id  color-file-id
+                                              :gradient (:fill-color-gradient fill)})
+                             (d/without-nils {:color    (str/lower (:fill-color fill))
+                                              :opacity  (:fill-opacity fill)
+                                              :gradient (:fill-color-gradient fill)}))]
     {:attrs attrs
      :prop :content
      :shape-id (:shape-id fill)
      :index (:index fill)}))
 
-(defn- treat-node
+(defn treat-node
   [node shape-id]
   (map-indexed #(assoc %2 :shape-id shape-id :index %1) node))
 
-(defn- extract-text-colors
-  [text file-id libraries]
-  (->> (txt/node-seq txt/is-text-node? (:content text))
-       (map :fills)
-       (mapcat #(treat-node % (:id text)))
-       (map #(text->color-att % file-id libraries))))
-
-(defn- fill->color-att
-  [fill file-id libraries]
-  (let [ref-file      (:fill-color-ref-file fill)
-        ref-id        (:fill-color-ref-id fill)
-        shared-colors (dm/get-in libraries [ref-file :data :colors])
-        is-shared?    (contains? shared-colors ref-id)
-        has-color?    (or (:fill-color fill)
-                          (:fill-color-gradient fill))
-        attrs         (cond-> (fill->color fill)
-                        (not (or is-shared? (= ref-file file-id)))
-                        (dissoc :ref-file :ref-id))]
+(defn extract-text-colors
+  [text file-id shared-libs]
+  (let [content (txt/node-seq txt/is-text-node? (:content text))
+        content-filtered (map :fills content)
+        indexed (mapcat #(treat-node % (:id text)) content-filtered)]
+    (map #(text->color-att % file-id shared-libs) indexed)))
 
+(defn fill->color-att
+  [fill file-id shared-libs]
+  (let [color-file-id      (:fill-color-ref-file fill)
+        color-id           (:fill-color-ref-id fill)
+        shared-libs-colors (dm/get-in shared-libs [color-file-id :data :colors])
+        is-shared?         (contains? shared-libs-colors color-id)
+        has-color?         (or (not (nil? (:fill-color fill))) (not (nil? (:fill-color-gradient fill))))
+        attrs              (if (or is-shared? (= color-file-id file-id))
+                             (d/without-nils {:color    (str/lower (:fill-color fill))
+                                              :opacity  (:fill-opacity fill)
+                                              :id       color-id
+                                              :file-id  color-file-id
+                                              :gradient (:fill-color-gradient fill)})
+                             (d/without-nils {:color    (str/lower (:fill-color fill))
+                                              :opacity  (:fill-opacity fill)
+                                              :gradient (:fill-color-gradient fill)}))]
     (when has-color?
       {:attrs attrs
        :prop :fill
@@ -515,67 +521,21 @@
        :index (:index fill)})))
 
 (defn extract-all-colors
-  [shapes file-id libraries]
+  [shapes file-id shared-libs]
   (reduce
-   (fn [result shape]
+   (fn [list shape]
      (let [fill-obj   (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:fills shape))
            stroke-obj (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:strokes shape))
            shadow-obj (map-indexed #(assoc %2 :shape-id (:id shape) :index %1) (:shadow shape))]
        (if (= :text (:type shape))
-         (-> result
-             (into (map #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)
-             (into (extract-text-colors shape file-id libraries)))
+         (-> list
+             (into (map #(stroke->color-att % file-id shared-libs)) stroke-obj)
+             (into (map #(shadow->color-att % file-id shared-libs)) shadow-obj)
+             (into (extract-text-colors shape file-id shared-libs)))
 
-         (-> result
-             (into (map #(fill->color-att % file-id libraries)) fill-obj)
-             (into (map #(stroke->color-att % file-id libraries)) stroke-obj)
-             (into (map #(shadow->color-att % file-id libraries)) shadow-obj)))))
+         (-> list
+             (into (map #(fill->color-att % file-id shared-libs))  fill-obj)
+             (into (map #(stroke->color-att % file-id shared-libs)) stroke-obj)
+             (into (map #(shadow->color-att % file-id shared-libs)) shadow-obj)))))
    []
    shapes))
-
-(defn colors-seq
-  [file-data]
-  (vals (:colors file-data)))
-
-(defn- touch
-  [color]
-  (assoc color :modified-at (dt/now)))
-
-(defn add-color
-  [file-data color]
-  (update file-data :colors assoc (:id color) (touch color)))
-
-(defn get-color
-  [file-data color-id]
-  (get-in file-data [:colors color-id]))
-
-(defn get-ref-color
-  [library-data color]
-  (when (= (:ref-file color) (:id library-data))
-    (get-color library-data (:ref-id color))))
-
-(defn set-color
-  [file-data color]
-  (d/assoc-in-when file-data [:colors (:id color)] (touch color)))
-
-(defn update-color
-  [file-data color-id f & args]
-  (d/update-in-when file-data [:colors color-id] #(-> (apply f % args)
-                                                      (touch))))
-
-(defn delete-color
-  [file-data color-id]
-  (update file-data :colors dissoc color-id))
-
-(defn used-colors-changed-since
-  "Find all usages of any color in the library by the given shape, of colors
-   that have ben modified after the date."
-  [shape library since-date]
-  (->> (get-all-colors shape)
-       (keep #(get-ref-color (:data library) %))
-       (remove #(< (:modified-at %) since-date))  ;; Note that :modified-at may be nil
-       (map (fn [color] {:shape-id (:id shape)
-                         :asset-id (:id color)
-                         :asset-type :color}))))
-

common/src/app/common/types/colors_list.cljc

@@ -0,0 +1,56 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.common.types.colors-list
+  (:require
+   [app.common.data :as d]
+   [app.common.time :as dt]
+   [app.common.types.color :as ctc]))
+
+(defn colors-seq
+  [file-data]
+  (vals (:colors file-data)))
+
+(defn- touch
+  [color]
+  (assoc color :modified-at (dt/now)))
+
+(defn add-color
+  [file-data color]
+  (update file-data :colors assoc (:id color) (touch color)))
+
+(defn get-color
+  [file-data color-id]
+  (get-in file-data [:colors color-id]))
+
+(defn get-ref-color
+  [library-data color]
+  (when (= (:ref-file color) (:id library-data))
+    (get-color library-data (:ref-id color))))
+
+(defn set-color
+  [file-data color]
+  (d/assoc-in-when file-data [:colors (:id color)] (touch color)))
+
+(defn update-color
+  [file-data color-id f & args]
+  (d/update-in-when file-data [:colors color-id] #(-> (apply f % args)
+                                                      (touch))))
+
+(defn delete-color
+  [file-data color-id]
+  (update file-data :colors dissoc color-id))
+
+(defn used-colors-changed-since
+  "Find all usages of any color in the library by the given shape, of colors
+   that have ben modified after the date."
+  [shape library since-date]
+  (->> (ctc/get-all-colors shape)
+       (keep #(get-ref-color (:data library) %))
+       (remove #(< (:modified-at %) since-date))  ;; Note that :modified-at may be nil
+       (map (fn [color] {:shape-id (:id shape)
+                         :asset-id (:id color)
+                         :asset-type :color}))))

common/src/app/common/types/container.cljc

@@ -18,10 +18,8 @@
    [app.common.types.plugins :as ctpg]
    [app.common.types.shape-tree :as ctst]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as cttx]
    [app.common.types.token :as ctt]
-   [app.common.uuid :as uuid]
-   [clojure.set :as set]))
+   [app.common.uuid :as uuid]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMA
@@ -536,6 +534,8 @@
   indicating if shape is touched or not."
   [shape attr val & {:keys [ignore-touched ignore-geometry]}]
   (let [group        (get ctk/sync-attrs attr)
+        token-groups (when (= attr :applied-tokens)
+                       (get-token-groups shape val))
         shape-val    (get shape attr)
 
         ignore?
@@ -566,33 +566,22 @@
           (gsh/close-attrs? attr val shape-val))
 
         touched?
-        (and group
-             (not equal?)
-             (not (and ignore-geometry is-geometry?)))
+        (and group (not equal?) (not (and ignore-geometry is-geometry?)))]
 
-        content-diff-type (when (and (= (:type shape) :text) (= attr :content))
-                            (cttx/get-diff-type (:content shape) val))
-
-        token-groups (if (= attr :applied-tokens)
-                       (get-token-groups shape val)
-                       #{})
-
-        groups (cond-> token-groups
-                 (and group (not equal?))
-                 (set/union #{group} content-diff-type))]
     (cond-> shape
       ;; Depending on the origin of the attribute change, we need or not to
       ;; set the "touched" flag for the group the attribute belongs to.
       ;; In some cases we need to ignore touched only if the attribute is
       ;; geometric (position, width or transformation).
       (and in-copy?
-           (not-empty groups)
-           (not ignore?)
-           (not (and ignore-geometry is-geometry?)))
+           (or (and group (not equal?)) (seq token-groups))
+           (not ignore?) (not (and ignore-geometry is-geometry?)))
       (-> (update :touched (fn [touched]
                              (reduce #(ctk/set-touched-group %1 %2)
                                      touched
-                                     groups)))
+                                     (if group
+                                       (cons group token-groups)
+                                       token-groups))))
           (dissoc :remote-synced))
 
       (nil? val)

common/src/app/common/types/file.cljc

@@ -18,6 +18,7 @@
    [app.common.schema :as sm]
    [app.common.text :as ct]
    [app.common.types.color :as ctc]
+   [app.common.types.colors-list :as ctcl]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
@@ -31,34 +32,27 @@
    [app.common.uuid :as uuid]
    [cuerdas.core :as str]))
 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; CONSTANTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defonce BASE-FONT-SIZE "16px")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMA
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def schema:media
   "A schema that represents the file media object"
-  [:map {:title "FileMedia"}
+  [:map {:title "FileMediaObject"}
    [:id ::sm/uuid]
-   [:created-at {:optional true} ::sm/inst]
+   [:created-at ::sm/inst]
    [:deleted-at {:optional true} ::sm/inst]
    [:name :string]
    [:width ::sm/safe-int]
    [:height ::sm/safe-int]
    [:mtype :string]
-   [:media-id ::sm/uuid]
    [:file-id {:optional true} ::sm/uuid]
+   [:media-id ::sm/uuid]
    [:thumbnail-id {:optional true} ::sm/uuid]
-   [:is-local {:optional true} :boolean]])
+   [:is-local :boolean]])
 
 (def schema:colors
-  [:map-of {:gen/max 5} ::sm/uuid ctc/schema:library-color])
+  [:map-of {:gen/max 5} ::sm/uuid ::ctc/color])
 
 (def schema:components
   [:map-of {:gen/max 5} ::sm/uuid ::ctn/container])
@@ -71,8 +65,7 @@
 
 (def schema:options
   [:map {:title "FileOptions"}
-   [:components-v2 {:optional true} ::sm/boolean]
-   [:base-font-size {:optional true} :string]])
+   [:components-v2 {:optional true} ::sm/boolean]])
 
 (def schema:data
   [:map {:title "FileData"}
@@ -109,6 +102,7 @@
 (sm/register! ::media schema:media)
 (sm/register! ::colors schema:colors)
 (sm/register! ::typographies schema:typographies)
+(sm/register! ::media-object schema:media)
 
 (def check-file
   (sm/check-fn schema:file :hint "check error on validating file"))
@@ -116,7 +110,7 @@
 (def check-file-data
   (sm/check-fn schema:data))
 
-(def check-file-media
+(def check-media-object
   (sm/check-fn schema:media))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -140,8 +134,7 @@
        (ctpl/add-page page)
 
        :always
-       (update :options merge {:components-v2 true
-                               :base-font-size BASE-FONT-SIZE})))))
+       (update :options assoc :components-v2 true)))))
 
 (defn make-file
   [{:keys [id project-id name revn is-shared features migrations
@@ -242,13 +235,6 @@
       (cfh/make-container component-page :page))
     (cfh/make-container component :component)))
 
-(defn get-component-container-from-head
-  [instance-head libraries & {:keys [include-deleted?] :or {include-deleted? true}}]
-  (let [library-data   (-> (get-component-library libraries instance-head)
-                           :data)
-        component (ctkl/get-component library-data (:component-id instance-head) include-deleted?)]
-    (get-component-container library-data component)))
-
 (defn get-component-root
   "Retrieve the root shape of the component."
   [file-data component]
@@ -305,6 +291,7 @@
                                  (ctkl/get-component (:data component-file) (:component-id head-shape) include-deleted?))]
             (when (some? component)
               (get-ref-shape (:data component-file) component shape :with-context? with-context?))))]
+
     (some find-ref-shape-in-head (ctn/get-parent-heads (:objects container) shape))))
 
 (defn advance-shape-ref
@@ -397,47 +384,6 @@
       (or (= slot-main slot-inst)
           (= (:id shape-main) slot-inst)))))
 
-(defn- find-next-related-swap-shape-id
-  "Go up from the chain of references shapes that will eventually lead to the shape
-   with swap-slot-id as id. Returns the next shape on the chain"
-  [parent swap-slot-id libraries]
-  (let [container         (get-component-container-from-head parent libraries)
-        objects           (:objects container)
-
-        children          (cfh/get-children objects (:id parent))
-        original-shape-id (->> children
-                               (filter #(= swap-slot-id (:id %)))
-                               first
-                               :id)]
-    (if original-shape-id
-      ;; Return the children which id is the swap-slot-id
-      original-shape-id
-      ;; No children with swap-slot-id as id, go up
-      (let [referenced-shape (find-ref-shape nil container libraries parent)
-            ;; Recursive call that will get the id of the next shape on
-            ;; the chain that ends on a shape with swap-slot-id as id
-            next-shape-id    (when referenced-shape
-                               (find-next-related-swap-shape-id referenced-shape swap-slot-id libraries))]
-        ;; Return the children which shape-ref points to the next-shape-id
-        (->> children
-             (filter #(= next-shape-id (:shape-ref %)))
-             first
-             :id)))))
-
-(defn find-ref-id-for-swapped
-  "When a shape has been swapped, find the original ref-id that the shape had
-   before the swap"
-  [shape container libraries]
-  (let [swap-slot   (ctk/get-swap-slot shape)
-        objects     (:objects container)
-
-        parent      (get objects (:parent-id shape))
-        parent-head (ctn/get-head-shape objects parent)
-        parent-ref  (find-ref-shape nil container libraries parent-head)]
-
-    (when (and swap-slot parent-ref)
-      (find-next-related-swap-shape-id parent-ref swap-slot libraries))))
-
 (defn get-component-shapes
   "Retrieve all shapes of the component"
   [file-data component]
@@ -535,7 +481,7 @@
   [file-data library-data asset-type]
   (let [assets-seq (case asset-type
                      :component  (ctkl/components-seq library-data)
-                     :color      (ctc/colors-seq library-data)
+                     :color      (ctcl/colors-seq library-data)
                      :typography (ctyl/typographies-seq library-data))
 
         find-usages-in-container
@@ -574,7 +520,7 @@
   (letfn [(used-assets-shape [shape]
             (concat
              (ctkl/used-components-changed-since shape library since-date)
-             (ctc/used-colors-changed-since shape library since-date)
+             (ctcl/used-colors-changed-since shape library since-date)
              (ctyl/used-typographies-changed-since shape library since-date)))
 
           (used-assets-container [container]
@@ -710,7 +656,7 @@
                                              %
                                              shapes)))]
             (as-> file-data $
-              (ctc/add-color $ color)
+              (ctcl/add-color $ color)
               (reduce remap-shapes $ usages))))]
 
     (reduce absorb-color
@@ -1083,14 +1029,3 @@
 
     (-> file
         (update-in [:data :pages-index] detach-pages))))
-
-;; Base font size
-
-(defn get-base-font-size
-  "Retrieve the base font size value or token reference."
-  [file-data]
-  (get-in file-data [:options :base-font-size] BASE-FONT-SIZE))
-
-(defn set-base-font-size
-  [file-data base-font-size]
-  (assoc-in file-data [:options :base-font-size] base-font-size))

common/src/app/common/types/fill.cljc

@@ -1,68 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.types.fill
-  (:require
-   [app.common.schema :as sm]
-   [app.common.types.color :as types.color]
-   [app.common.types.fill.impl :as impl]
-   [clojure.set :as set]))
-
-(def ^:const MAX-GRADIENT-STOPS impl/MAX-GRADIENT-STOPS)
-(def ^:const MAX-FILLS impl/MAX-FILLS)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SCHEMAS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def schema:fill-attrs
-  [:map {:title "FillAttrs" :closed true}
-   [:fill-color-ref-file {:optional true} ::sm/uuid]
-   [:fill-color-ref-id {:optional true} ::sm/uuid]
-   [:fill-opacity {:optional true} [::sm/number {:min 0 :max 1}]]
-   [:fill-color {:optional true} types.color/schema:hex-color]
-   [:fill-color-gradient {:optional true} types.color/schema:gradient]
-   [:fill-image {:optional true} types.color/schema:image]])
-
-(def fill-attrs
-  "A set of attrs that corresponds to fill data type"
-  (sm/keys schema:fill-attrs))
-
-(def valid-fill-attrs
-  "A set used for proper check if color should contain only one of the
-  attrs listed in this set."
-  #{:fill-image :fill-color :fill-color-gradient})
-
-(defn has-valid-fill-attrs?
-  "Check if color has correct color attrs"
-  [color]
-  (let [attrs  (set (keys color))
-        result (set/intersection attrs valid-fill-attrs)]
-    (= 1 (count result))))
-
-(def schema:fill
-  [:and schema:fill-attrs
-   [:fn has-valid-fill-attrs?]])
-
-(def check-fill
-  (sm/check-fn schema:fill))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; HELPERS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; CONSTRUCTORS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn from-plain
-  [o]
-  (assert (every? check-fill o) "expected valid fills vector")
-  (impl/from-plain o))
-
-(defn fills?
-  [o]
-  (impl/fills? o))

common/src/app/common/types/fill/impl.cljc

@@ -1,404 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) KALEIDOS INC
-
-(ns app.common.types.fill.impl
-  (:require
-   #?(:clj [clojure.data.json :as json])
-   #?(:cljs [app.common.weak-map :as weak-map])
-   [app.common.buffer :as buf]
-   [app.common.data :as d]
-   [app.common.data.macros :as dm]
-   [app.common.math :as mth]
-   [app.common.transit :as t]))
-
-;; FIXME: Get these from the wasm module, and tweak the values
-;; (we'd probably want 12 stops at most)
-(def ^:const MAX-GRADIENT-STOPS 16)
-(def ^:const MAX-FILLS 8)
-
-(def ^:const GRADIENT-STOP-SIZE 8)
-(def ^:const GRADIENT-BYTE-SIZE 156)
-(def ^:const SOLID-BYTE-SIZE 4)
-(def ^:const IMAGE-BYTE-SIZE 28)
-(def ^:const METADATA-BYTE-SIZE 36)
-(def ^:const FILL-BYTE-SIZE
-  (+ 4 (mth/max GRADIENT-BYTE-SIZE
-                IMAGE-BYTE-SIZE
-                SOLID-BYTE-SIZE)))
-
-(def ^:private xf:take-stops
-  (take MAX-GRADIENT-STOPS))
-
-(def ^:private xf:take-fills
-  (take MAX-FILLS))
-
-(defn- hex->rgb
-  "Encode an hex string as rgb (int32)"
-  [hex]
-  (let [hex (subs hex 1)]
-    #?(:clj (Integer/parseInt hex 16)
-       :cljs (js/parseInt hex 16))))
-
-(defn- rgb->rgba
-  "Use the first 2 bytes of in32 for encode the alpha channel"
-  [n alpha]
-  (let [result (mth/floor (* alpha 0xff))
-        result (unchecked-int result)
-        result (bit-shift-left result 24)
-        result (bit-or result n)]
-    result))
-
-(defn- get-color-hex
-  [n]
-  (let [n (bit-and n 0x00ffffff)
-        n #?(:clj n :cljs (.toString n 16))]
-    (dm/str "#" #?(:clj (String/format "%06x" (into-array Object [n]))
-                   :cljs (.padStart n 6 "0")))))
-
-(defn- get-color-alpha
-  [rgb]
-  (let [n (bit-and rgb 0xff000000)
-        n (unsigned-bit-shift-right n 24)]
-    (mth/precision (/ (float n) 0xff) 2)))
-
-(defn- write-solid-fill
-  [offset buffer color alpha]
-  (buf/write-byte buffer (+ offset 0) 0x00)
-  (buf/write-int  buffer (+ offset 4)
-                  (-> (hex->rgb color)
-                      (rgb->rgba alpha)))
-  (+ offset FILL-BYTE-SIZE))
-
-(defn- write-gradient-fill
-  [offset buffer gradient opacity]
-  (let [start-x (:start-x gradient)
-        start-y (:start-y gradient)
-        end-x   (:end-x gradient)
-        end-y   (:end-y gradient)
-        width   (:width gradient 0)
-        stops   (into [] xf:take-stops (:stops gradient))
-        type    (if (= (:type gradient) :linear)
-                  0x01
-                  0x02)]
-
-    (buf/write-byte  buffer (+ offset 0)  type)
-    (buf/write-float buffer (+ offset 4)  start-x)
-    (buf/write-float buffer (+ offset 8)  start-y)
-    (buf/write-float buffer (+ offset 12) end-x)
-    (buf/write-float buffer (+ offset 16) end-y)
-    (buf/write-float buffer (+ offset 20) opacity)
-    (buf/write-float buffer (+ offset 24) width)
-    (buf/write-byte  buffer (+ offset 28) (count stops))
-
-    (loop [stops   (seq stops)
-           offset' (+ offset 32)]
-      (if-let [stop (first stops)]
-        (let [color (-> (hex->rgb (:color stop))
-                        (rgb->rgba (:opacity stop 1)))]
-          ;; NOTE: we write the color as signed integer but on rust
-          ;; side it will be read as unsigned, on the end the binary
-          ;; repr of the data is the same independently on how it is
-          ;; interpreted
-          (buf/write-int   buffer (+ offset' 0) color)
-          (buf/write-float buffer (+ offset' 4) (:offset stop))
-          (recur (rest stops)
-                 (+ offset' GRADIENT-STOP-SIZE)))
-        (+ offset FILL-BYTE-SIZE)))))
-
-(defn- write-image-fill
-  [offset buffer opacity image]
-  (let [image-id (get image :id)
-        image-width (get image :width)
-        image-height (get image :height)]
-    (buf/write-byte  buffer (+ offset  0) 0x03)
-    (buf/write-uuid  buffer (+ offset  4) image-id)
-    (buf/write-float buffer (+ offset 20) opacity)
-    (buf/write-int   buffer (+ offset 24) image-width)
-    (buf/write-int   buffer (+ offset 28) image-height)
-    (+ offset FILL-BYTE-SIZE)))
-
-(defn- write-metadata
-  [offset buffer fill]
-  (let [ref-id   (:fill-color-ref-id fill)
-        ref-file (:fill-color-ref-file fill)
-        mtype    (dm/get-in fill [:fill-image :mtype])]
-
-    (when mtype
-      (let [val (case mtype
-                  "image/jpeg" 0x01
-                  "image/png"  0x02
-                  "image/gif"  0x03
-                  "image/webp"  0x04
-                  "image/svg+xml" 0x05)]
-        (buf/write-short buffer (+ offset 2) val)))
-
-    (if (and (some? ref-file)
-             (some? ref-id))
-      (do
-        (buf/write-byte buffer (+ offset 0) 0x01)
-        (buf/write-uuid buffer (+ offset 4) ref-file)
-        (buf/write-uuid buffer (+ offset 20) ref-id))
-      (do
-        (buf/write-byte buffer (+ offset 0) 0x00)))))
-
-(defn- read-stop
-  [buffer offset]
-  (let [rgba (buf/read-int buffer (+ offset 0))
-        soff (buf/read-float buffer (+ offset 4))]
-    {:color (get-color-hex rgba)
-     :opacity (get-color-alpha rgba)
-     :offset (mth/precision soff 2)}))
-
-(defn- read-fill
-  "Read segment from binary buffer at specified index"
-  [dbuffer mbuffer index]
-  (let [doffset (+ 4 (* index FILL-BYTE-SIZE))
-        moffset (* index METADATA-BYTE-SIZE)
-        type    (buf/read-byte dbuffer doffset)
-        refs?   (buf/read-bool mbuffer (+ moffset 0))
-        fill    (case type
-                  0
-                  (let [rgba (buf/read-int dbuffer (+ doffset 4))]
-                    {:fill-color (get-color-hex rgba)
-                     :fill-opacity (get-color-alpha rgba)})
-
-                  (1 2)
-                  (let [start-x (buf/read-float dbuffer (+ doffset 4))
-                        start-y (buf/read-float dbuffer (+ doffset 8))
-                        end-x   (buf/read-float dbuffer (+ doffset 12))
-                        end-y   (buf/read-float dbuffer (+ doffset 16))
-                        alpha   (buf/read-float dbuffer (+ doffset 20))
-                        width   (buf/read-float dbuffer (+ doffset 24))
-                        stops   (buf/read-byte  dbuffer (+ doffset 28))
-                        type    (if (= type 1)
-                                  :linear
-                                  :radial)
-                        stops   (loop [index  0
-                                       result []]
-                                  (if (< index stops)
-                                    (recur (inc index)
-                                           (conj result (read-stop dbuffer (+ doffset 32 (* GRADIENT-STOP-SIZE index)))))
-                                    result))]
-
-                    {:fill-opacity alpha
-                     :fill-color-gradient {:start-x start-x
-                                           :start-y start-y
-                                           :end-x end-x
-                                           :end-y end-y
-                                           :width width
-                                           :stops stops
-                                           :type type}})
-
-                  3
-                  (let [id     (buf/read-uuid  dbuffer (+ doffset 4))
-                        alpha  (buf/read-float dbuffer (+ doffset 20))
-                        width  (buf/read-int   dbuffer (+ doffset 24))
-                        height (buf/read-int   dbuffer (+ doffset 28))
-                        mtype  (buf/read-short mbuffer (+ moffset 2))
-                        mtype  (case mtype
-                                 0x01 "image/jpeg"
-                                 0x02 "image/png"
-                                 0x03 "image/gif"
-                                 0x04 "image/webp"
-                                 0x05 "image/svg+xml")]
-                    {:fill-opacity alpha
-                     :fill-image {:id id
-                                  :width width
-                                  :height height
-                                  :mtype mtype
-                                  ;; FIXME: we are not encodign the name, looks useless
-                                  :name "sample"}}))]
-
-    (if refs?
-      (let [ref-file (buf/read-uuid mbuffer (+ moffset 4))
-            ref-id   (buf/read-uuid mbuffer (+ moffset 20))]
-        (-> fill
-            (assoc :fill-color-ref-id ref-id)
-            (assoc :fill-color-ref-file ref-file)))
-      fill)))
-
-(declare from-plain)
-
-#?(:clj
-   (deftype Fills [size dbuffer mbuffer ^:unsynchronized-mutable hash]
-     Object
-     (equals [_ other]
-       (if (instance? Fills other)
-         (and (buf/equals? dbuffer (.-dbuffer ^Fills other))
-              (buf/equals? mbuffer (.-mbuffer ^Fills other)))
-         false))
-
-     json/JSONWriter
-     (-write [this writter options]
-       (json/-write (vec this) writter options))
-
-     clojure.lang.IHashEq
-     (hasheq [this]
-       (when-not hash
-         (set! hash (clojure.lang.Murmur3/hashOrdered (seq this))))
-       hash)
-
-     clojure.lang.Sequential
-     clojure.lang.Seqable
-     (seq [_]
-       (when (pos? size)
-         ((fn next-seq [i]
-            (when (< i size)
-              (cons (read-fill dbuffer mbuffer i)
-                    (lazy-seq (next-seq (inc i))))))
-          0)))
-
-     clojure.lang.IReduceInit
-     (reduce [_ f start]
-       (loop [index  0
-              result start]
-         (if (< index size)
-           (let [result (f result (read-fill dbuffer mbuffer index))]
-             (if (reduced? result)
-               @result
-               (recur (inc index) result)))
-           result)))
-
-     clojure.lang.Indexed
-     (nth [_ i]
-       (if (d/in-range? size i)
-         (read-fill dbuffer mbuffer i)
-         nil))
-
-     (nth [_ i default]
-       (if (d/in-range? size i)
-         (read-fill dbuffer mbuffer i)
-         default))
-
-     clojure.lang.Counted
-     (count [_] size))
-
-   :cljs
-   #_:clj-kondo/ignore
-   (deftype Fills [size dbuffer mbuffer cache ^:mutable __hash]
-     cljs.core/ISequential
-     cljs.core/IEquiv
-     (-equiv [this other]
-       (if (instance? Fills other)
-         (and ^boolean (buf/equals? (.-dbuffer ^Fills other) dbuffer)
-              ^boolean (buf/equals? (.-mbuffer ^Fills other) mbuffer))
-         false))
-
-     cljs.core/IEncodeJS
-     (-clj->js [this]
-       (clj->js (vec this)))
-
-     ;; cljs.core/APersistentVector
-     cljs.core/IAssociative
-     (-assoc [coll k v]
-       (if (number? k)
-         (-> (vec coll)
-             (assoc k v)
-             (from-plain))
-         (throw (js/Error. "Vector's key for assoc must be a number."))))
-
-     (-contains-key? [coll k]
-       (if (integer? k)
-         (and (<= 0 k) (< k size))
-         false))
-
-     cljs.core/IReduce
-     (-reduce [_ f]
-       (loop [index  1
-              result (if (pos? size)
-                       (read-fill dbuffer mbuffer 0)
-                       nil)]
-         (if (< index size)
-           (let [result (f result (read-fill dbuffer mbuffer index))]
-             (if (reduced? result)
-               @result
-               (recur (inc index) result)))
-           result)))
-
-     (-reduce [_ f start]
-       (loop [index  0
-              result start]
-         (if (< index size)
-           (let [result (f result (read-fill dbuffer mbuffer index))]
-             (if (reduced? result)
-               @result
-               (recur (inc index) result)))
-           result)))
-
-     cljs.core/IHash
-     (-hash [coll]
-       (caching-hash coll hash-ordered-coll __hash))
-
-     cljs.core/ICounted
-     (-count [_] size)
-
-     cljs.core/IIndexed
-     (-nth [_ i]
-       (if (d/in-range? size i)
-         (read-fill dbuffer mbuffer i)
-         nil))
-
-     (-nth [_ i default]
-       (if (d/in-range? i size)
-         (read-fill dbuffer mbuffer i)
-         default))
-
-     cljs.core/ISeqable
-     (-seq [this]
-       (when (pos? size)
-         ((fn next-seq [i]
-            (when (< i size)
-              (cons (read-fill dbuffer mbuffer i)
-                    (lazy-seq (next-seq (inc i))))))
-          0)))))
-
-(defn from-plain
-  [fills]
-  (let [fills   (into [] xf:take-fills fills)
-        total   (count fills)
-        dbuffer (buf/allocate (+ 4 (* MAX-FILLS FILL-BYTE-SIZE)))
-        mbuffer (buf/allocate (* total METADATA-BYTE-SIZE))]
-
-    (buf/write-byte dbuffer 0 total)
-
-    (loop [index 0]
-      (when (< index total)
-        (let [fill     (nth fills index)
-              doffset  (+ 4 (* index FILL-BYTE-SIZE))
-              moffset  (* index METADATA-BYTE-SIZE)
-              opacity  (get fill :fill-opacity 1)]
-
-          (if-let [color (get fill :fill-color)]
-            (do
-              (write-solid-fill doffset dbuffer color opacity)
-              (write-metadata moffset mbuffer fill)
-              (recur (inc index)))
-            (if-let [gradient (get fill :fill-color-gradient)]
-              (do
-                (write-gradient-fill doffset dbuffer gradient opacity)
-                (write-metadata moffset mbuffer fill)
-                (recur (inc index)))
-              (if-let [image (get fill :fill-image)]
-                (do
-                  (write-image-fill doffset dbuffer opacity image)
-                  (write-metadata moffset mbuffer fill)
-                  (recur (inc index)))
-                (recur (inc index))))))))
-
-    #?(:cljs (Fills. total dbuffer mbuffer (weak-map/create) nil)
-       :clj  (Fills. total dbuffer mbuffer nil))))
-
-(defn fills?
-  [o]
-  (instance? Fills o))
-
-(t/add-handlers!
- {:id "penpot/fills"
-  :class Fills
-  :wfn (fn [^Fills fills]
-         (vec fills))
-  :rfn #?(:cljs from-plain
-          :clj identity)})

common/src/app/common/types/grid.cljc

@@ -8,7 +8,7 @@
   (:require
    [app.common.colors :as clr]
    [app.common.schema :as sm]
-   [app.common.types.color :refer [schema:hex-color]]))
+   [app.common.types.color :as ctc]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SCHEMA
@@ -16,7 +16,7 @@
 
 (def schema:grid-color
   [:map {:title "PageGridColor"}
-   [:color schema:hex-color]
+   [:color ::ctc/rgb-color]
    [:opacity ::sm/safe-number]])
 
 (def schema:column-params

common/src/app/common/types/page.cljc

@@ -10,7 +10,7 @@
    [app.common.data :as d]
    [app.common.geom.point :as-alias gpt]
    [app.common.schema :as sm]
-   [app.common.types.color :as ctc]
+   [app.common.types.color :as-alias ctc]
    [app.common.types.grid :as ctg]
    [app.common.types.plugins :as ctpg]
    [app.common.types.shape :as cts]
@@ -57,7 +57,7 @@
    [:flows {:optional true} schema:flows]
    [:guides {:optional true} schema:guides]
    [:plugin-data {:optional true} ::ctpg/plugin-data]
-   [:background {:optional true} ctc/schema:hex-color]
+   [:background {:optional true} ::ctc/rgb-color]
 
    [:comment-thread-positions {:optional true}
     [:map-of ::sm/uuid schema:comment-thread-position]]])