🔧 Fixes to the API documentation deployer

.github/workflows/plugins-deploy-api-doc.yml

@@ -0,0 +1,101 @@
+name: Plugins/api-doc deployer
+
+on:
+  push:
+    branches:
+      - develop
+      - staging
+      - main
+    paths:
+      - "plugins/libs/plugin-types/index.d.ts"
+      - "plugins/libs/plugin-types/REAME.md"
+      - "plugins/tools/typedoc.css"
+      - "plugins/CHANGELOG.md"
+      - "plugins/wrangle-penpot-plugins-api-doc.toml"
+  workflow_dispatch:
+    inputs:
+      gh_ref:
+        description: 'Name of the branch'
+        type: choice
+        required: true
+        default: 'develop'
+        options:
+          - develop
+          - staging
+          - main
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract some useful variables
+        id: vars
+        run: |
+          echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ steps.vars.outputs.gh_ref }}
+
+      # START: Setup Node and PNPM enabling cache
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - name: Enable PNPM
+        working-directory: ./plugins
+        shell: bash
+        run: |
+          corepack enable;
+          corepack install;
+
+      - name: Get pnpm store path
+        id: pnpm-store
+        working-directory: ./plugins
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.pnpm-store.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('plugins/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
+      # END: Setup Node and PNPM enabling cache
+
+      - name: Install deps
+        working-directory: ./plugins
+        shell: bash
+        run: |
+          pnpm install --no-frozen-lockfile;
+          pnpm add -D -w wrangler@latest;
+
+      - name: Build docs
+        working-directory: plugins
+        shell: bash
+        run: pnpm run build:doc
+
+      - name: Select Worker name
+        run: |
+          REF="${{ steps.vars.outputs.gh_ref }}"
+          case "$REF" in
+            main) echo "WORKER_NAME=penpot-plugins-api-doc-pro" >> $GITHUB_ENV ;;
+            staging) echo "WORKER_NAME=penpot-plugins-api-doc-pre" >> $GITHUB_ENV ;;
+            develop) echo "WORKER_NAME=penpot-plugins-api-doc-hourly" >> $GITHUB_ENV ;;
+            *) echo "Unsupported branch ${REF}" && exit 1 ;;
+          esac
+
+      - name: Deploy to Cloudflare Workers
+        uses: cloudflare/wrangler-action@v3
+        with:
+          workingDirectory: plugins
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --config wrangle-penpot-plugins-api-doc.toml --name ${{ env.WORKER_NAME }}

backend/src/app/email.clj

@@ -124,6 +124,8 @@
       (throw (IllegalArgumentException. "invalid email body provided")))
 
     (doseq [[name content] attachments]
+
+      (prn "attachment" name)
       (let [attachment-part (MimeBodyPart.)]
         (.setFileName attachment-part ^String name)
         (.setContent attachment-part ^String content (str "text/plain; charset=" charset))

frontend/src/app/main/data/style_dictionary.cljs

@@ -126,7 +126,7 @@
   If the `value` is not parseable and/or has missing references returns a map with `:errors`.
   If the `value` is parseable but is out of range returns a map with `warnings`."
   [value]
-  (let [missing-references? (seq (cto/find-token-value-references value))
+  (let [missing-references? (seq (seq (cto/find-token-value-references value)))
         parsed-value (cft/parse-token-value value)
         out-of-scope (not (<= 0 (:value parsed-value) 1))
         references (seq (cto/find-token-value-references value))]
@@ -152,14 +152,15 @@
   [value]
   (let [missing-references? (seq (cto/find-token-value-references value))
         parsed-value (cft/parse-token-value value)
-        out-of-scope (< (:value parsed-value) 0)]
+        out-of-scope (< (:value parsed-value) 0)
+        references (seq (cto/find-token-value-references value))]
     (cond
       (and parsed-value (not out-of-scope))
       parsed-value
 
-      missing-references?
-      {:errors [(wte/error-with-value :error.style-dictionary/missing-reference missing-references?)]
-       :references missing-references?}
+      references
+      {:errors [(wte/error-with-value :error.style-dictionary/missing-reference references)]
+       :references references}
 
       (and (not missing-references?) out-of-scope)
       {:errors [(wte/error-with-value :error.style-dictionary/invalid-token-value-stroke-width value)]}

frontend/src/app/main/ui/dashboard/file_menu.cljs

@@ -202,6 +202,7 @@
 
         on-restore-immediately
         (fn []
+          (prn files)
           (st/emit!
            (modal/show {:type :confirm
                         :title (tr "dashboard-restore-file-confirmation.title")

frontend/src/app/main/ui/workspace/tokens/management/forms/controls/color_input.cljs

@@ -53,12 +53,10 @@
 
 
 (defn- resolve-value
-  [tokens prev-token token-name value]
+  [tokens prev-token value]
   (let [token
         {:value value
-         :name (if (str/blank? token-name)
-                 "__PENPOT__TOKEN__NAME__PLACEHOLDER__"
-                 token-name)}
+         :name "__PENPOT__TOKEN__NAME__PLACEHOLDER__"}
 
         tokens
         (-> tokens
@@ -133,7 +131,6 @@
 
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
 
 
         touched?
@@ -263,10 +260,10 @@
           :else
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name token-name]
+    (mf/with-effect [resolve-stream tokens token input-name]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]
@@ -312,7 +309,7 @@
 
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
+
         error
         (get-in @form [:errors :value value-subfield index input-name])
 
@@ -425,10 +422,10 @@
                                   :hint-message (:message error)})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name index value-subfield token-name]
+    (mf/with-effect [resolve-stream tokens token input-name index value-subfield]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]

frontend/src/app/main/ui/workspace/tokens/management/forms/controls/fonts_combobox.cljs

@@ -49,12 +49,10 @@
 ;; validate data within the form state.
 
 (defn- resolve-value
-  [tokens prev-token token-name value]
+  [tokens prev-token value]
   (let [token
         {:value (cto/split-font-family value)
-         :name (if (str/blank? token-name)
-                 "__PENPOT__TOKEN__NAME__PLACEHOLDER__"
-                 token-name)}
+         :name "__PENPOT__TOKEN__NAME__PLACEHOLDER__"}
 
         tokens
         (-> tokens
@@ -75,7 +73,6 @@
   [{:keys [token tokens name] :rest props}]
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
 
         touched?
         (and (contains? (:data @form) input-name)
@@ -155,10 +152,10 @@
                                   :hint-message (:message error)})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name touched? token-name]
+    (mf/with-effect [resolve-stream tokens token input-name touched?]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]
@@ -203,7 +200,7 @@
   [{:keys [token tokens name] :rest props}]
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
+
         error
         (get-in @form [:errors :value input-name])
 
@@ -279,10 +276,10 @@
                                   :hint-message (:message error)})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name token-name]
+    (mf/with-effect [resolve-stream tokens token input-name]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]

frontend/src/app/main/ui/workspace/tokens/management/forms/controls/input.cljs

@@ -139,12 +139,10 @@
 
 
 (defn- resolve-value
-  [tokens prev-token token-name value]
+  [tokens prev-token value]
   (let [token
         {:value value
-         :name (if (str/blank? token-name)
-                 "__PENPOT__TOKEN__NAME__PLACEHOLDER__"
-                 token-name)}
+         :name "__PENPOT__TOKEN__NAME__PLACEHOLDER__"}
         tokens
         (-> tokens
             ;; Remove previous token when renaming a token
@@ -165,7 +163,6 @@
 
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
 
         touched?
         (and (contains? (:data @form) input-name)
@@ -209,11 +206,11 @@
                                   :hint-message (:message error)})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name token-name]
+    (mf/with-effect [resolve-stream tokens token input-name]
 
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]
@@ -255,7 +252,6 @@
 
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
 
         error
         (get-in @form [:errors :value input-name])
@@ -302,10 +298,10 @@
                 (mf/spread-props props {:hint-formated true})
                 props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name name token-name]
+    (mf/with-effect [resolve-stream tokens token input-name name]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]
@@ -369,7 +365,7 @@
 
   (let [form       (mf/use-ctx fc/context)
         input-name name
-        token-name (get-in @form [:data :name] nil)
+
 
         error
         (get-in @form [:errors :value value-subfield index input-name])
@@ -414,10 +410,10 @@
           (mf/spread-props props {:hint-formated true})
           props)]
 
-    (mf/with-effect [resolve-stream tokens token input-name index value-subfield token-name]
+    (mf/with-effect [resolve-stream tokens token input-name index value-subfield]
       (let [subs (->> resolve-stream
                       (rx/debounce 300)
-                      (rx/mapcat (partial resolve-value tokens token token-name))
+                      (rx/mapcat (partial resolve-value tokens token))
                       (rx/map (fn [result]
                                 (d/update-when result :error
                                                (fn [error]

frontend/src/app/main/ui/workspace/tokens/management/forms/form_container.cljs

@@ -23,20 +23,19 @@
   (let [token-type
         (or (:type token) token-type)
 
-        tokens-in-selected-set
-        (mf/deref refs/workspace-all-tokens-in-selected-set)
-
         token-path
         (mf/with-memo [token]
           (cft/token-name->path (:name token)))
 
-        tokens-tree-in-selected-set
-        (mf/with-memo [token-path tokens-in-selected-set]
-          (-> (ctob/tokens-tree tokens-in-selected-set)
+        all-tokens (mf/deref refs/workspace-all-tokens-map)
+
+        all-tokens
+        (mf/with-memo [token-path all-tokens]
+          (-> (ctob/tokens-tree all-tokens)
               (d/dissoc-in token-path)))
         props
         (mf/spread-props props {:token-type token-type
-                                :tokens-tree-in-selected-set tokens-tree-in-selected-set
+                                :all-token-tree all-tokens
                                 :token token})
         text-case-props (mf/spread-props props {:input-value-placeholder (tr "workspace.tokens.text-case-value-enter")})
         text-decoration-props (mf/spread-props props {:input-value-placeholder (tr "workspace.tokens.text-decoration-value-enter")})

frontend/src/app/main/ui/workspace/tokens/management/forms/generic_form.cljs

@@ -86,7 +86,7 @@
            action
            is-create
            selected-token-set-id
-           tokens-tree-in-selected-set
+           all-token-tree
            token-type
            make-schema
            input-component
@@ -111,7 +111,8 @@
 
         token-title (str/lower (:title token-properties))
 
-        tokens (mf/deref refs/workspace-all-tokens-map)
+        tokens
+        (mf/deref refs/workspace-active-theme-sets-tokens)
 
         tokens
         (mf/with-memo [tokens token]
@@ -123,8 +124,8 @@
             (assoc (:name token) token)))
 
         schema
-        (mf/with-memo [tokens-tree-in-selected-set active-tab]
-          (make-schema tokens-tree-in-selected-set active-tab))
+        (mf/with-memo [all-token-tree active-tab]
+          (make-schema all-token-tree active-tab))
 
         initial
         (mf/with-memo [token]
@@ -207,11 +208,11 @@
                                             :value (:value valid-token)
                                             :description description}))
                       (dwtp/propagate-workspace-tokens)
-                      (modal/hide)))
-                   (fn [{:keys [errors]}]
-                     (let [error-messages (wte/humanize-errors errors)
-                           error-message (first error-messages)]
-                       (swap! form assoc-in [:extra-errors :value] {:message error-message}))))))))]
+                      (modal/hide)))))
+             (fn [{:keys [errors]}]
+               (let [error-messages (wte/humanize-errors errors)
+                     error-message (first error-messages)]
+                 (swap! form assoc-in [:extra-errors :value] {:message error-message}))))))]
 
     [:> fc/form* {:class (stl/css :form-wrapper)
                   :form form

plugins/wrangle-penpot-plugins-api-doc.toml

@@ -0,0 +1,4 @@
+name = "penpot-plugins-api-doc"
+compatibility_date = "2025-01-01"
+
+assets = { directory = "dist/doc" }