dazscript-framework 1.0.2 → 1.0.3

package/README.md

@@ -254,7 +254,7 @@ Applying the dialog:
 - Affected toolbars are rebuilt; empty framework-created toolbars are removed
 - Selected keyboard shortcut rows are applied after actions are installed
 
-This replaces the older `Install.dsa.ts` / `Uninstall.dsa.ts` pattern. The installer generator removes those legacy files if they exist, except when shortcut restoration is needed.
+This replaces the older `Install.dsa.ts` / `Uninstall.dsa.ts` pattern. The installer generator removes those legacy files if they exist.
 
 ### Setup Keyboard Shortcuts
 
@@ -288,7 +288,7 @@ Before changing a non-custom Daz Studio action shortcut, setup writes the origin
 App.getAppDataPath()/<appDataPath>/Installer/keyboard-shortcuts-backup.json
 ```
 
-When shortcut JSON exists, the generator also writes `src/Uninstall.dsa.ts`. Running that uninstall script restores backed-up non-custom shortcuts. Custom action shortcuts are not backed up because uninstalling the custom action removes the shortcut with the action.
+Shortcut setup is part of the generated setup dialog. The generator does not create a separate shortcut-only uninstall script.
 
 ---
 

package/dist/scripts/install-generator.js

@@ -29,14 +29,6 @@ setup(${data}, ${JSON.stringify(options)});
 `;
 }
 
-function generateUninstallTemplate(options) {
-  return `
-import { restoreSetupKeyboardShortcuts as restoreShortcuts } from '@dsf/helpers/custom-action-installer-helper';
-
-restoreShortcuts(${JSON.stringify(options)});
-`;
-}
-
 function literalValue(node) {
   if (!node) {
     return undefined;
@@ -329,9 +321,7 @@ function generateInstallerFiles(workdir, options) {
   const uninstallPath = path.join(workdir, 'src', 'Uninstall.dsa.ts');
   if (fs.existsSync(installPath)) fs.unlinkSync(installPath);
 
-  if (shortcutData.shortcuts && shortcutData.shortcuts.length > 0) {
-    fs.writeFileSync(path.join(workdir, 'src', 'Uninstall.dsa.ts'), generateUninstallTemplate(setupOptions));
-  } else if (fs.existsSync(uninstallPath)) {
+  if (fs.existsSync(uninstallPath)) {
     fs.unlinkSync(uninstallPath);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

package/src/helpers/custom-action-helper.ts

@@ -78,6 +78,10 @@ export type CustomActionTargets = {
     toolbar: boolean
 }
 
+type ApplyCustomActionOptions = {
+    deferToolbar?: boolean
+}
+
 type CustomActionCandidate = {
     name: string
     text: string
@@ -377,13 +381,18 @@ export const getInstalledCustomActionState = (action: CustomAction, scriptsPath:
     }
 }
 
-export const applyCustomActionTargets = (action: CustomAction, targets: CustomActionTargets, scriptsPath: string = getScriptPath()) => {
+export const applyCustomActionTargets = (
+    action: CustomAction,
+    targets: CustomActionTargets,
+    scriptsPath: string = getScriptPath(),
+    options: ApplyCustomActionOptions = {}
+): CustomAction | null => {
     const resolvedAction = resolveActionPaths(action, scriptsPath)
     const shouldInstall = targets.menu || targets.toolbar
 
     if (!shouldInstall) {
         removeCustomActionTargets(action, { menu: true, toolbar: true }, scriptsPath)
-        return
+        return null
     }
 
     const customAction = createOrUpdateCustomAction(action, resolvedAction)
@@ -392,9 +401,11 @@ export const applyCustomActionTargets = (action: CustomAction, targets: CustomAc
         addToMenu(customAction)
     }
 
-    if (targets.toolbar && action.toolbar) {
+    if (targets.toolbar && action.toolbar && !options.deferToolbar) {
         addToToolbar(customAction)
     }
+
+    return customAction
 }
 
 export const removeCustomActionTargets = (action: CustomAction, targets: CustomActionTargets, scriptsPath: string = getScriptPath()) => {

package/src/helpers/custom-action-installer-helper.ts

@@ -561,24 +561,31 @@ export const showSetupCustomActionsDialog = (actions: CustomAction[], options: s
 
     debug(`[Setup] applying ${selections.actions.filter(selection => selection.selected).length}/${selections.actions.length} selected actions`)
 
-    const removedToolbarNames = new CustomSet<string>()
+    const touchedToolbarNames = new CustomSet<string>()
+    const selectedToolbarActions: CustomAction[] = []
 
     progress('Setting Up Scripts', selections.actions, (selection) => {
         debug(`[Setup] ${selection.selected ? 'install' : 'remove'} "${selection.action.text}"`)
 
+        if (selection.supportsToolbar && selection.action.toolbar) {
+            touchedToolbarNames.add(selection.action.toolbar)
+        }
+
         if (selection.selected) {
-            applyCustomActionTargets({
+            const customAction = applyCustomActionTargets({
                 ...selection.action,
                 shortcut: selection.effectiveShortcut
             }, {
                 menu: selection.supportsMenu,
                 toolbar: selection.supportsToolbar
+            }, undefined, {
+                deferToolbar: true
             })
-            return
-        }
 
-        if (selection.supportsToolbar && selection.action.toolbar) {
-            removedToolbarNames.add(selection.action.toolbar)
+            if (customAction && selection.supportsToolbar && selection.action.toolbar) {
+                selectedToolbarActions.push(customAction)
+            }
+            return
         }
 
         removeCustomActionTargets(selection.action, {
@@ -587,14 +594,11 @@ export const showSetupCustomActionsDialog = (actions: CustomAction[], options: s
         })
     })
 
-    removedToolbarNames.forEach((toolbarName) => {
+    touchedToolbarNames.forEach((toolbarName) => {
         clearToolbar(toolbarName)
 
-        const stillSelected = selections.actions.filter(s => s.selected && s.supportsToolbar && s.action.toolbar === toolbarName)
-        stillSelected.forEach((s) => addToToolbar({
-            ...s.action,
-            shortcut: s.effectiveShortcut
-        }))
+        const stillSelected = selectedToolbarActions.filter(action => action.toolbar === toolbarName)
+        stillSelected.forEach((action) => addToToolbar(action))
         debug(`[Setup] Toolbar ${toolbarName} rebuilt with ${stillSelected.length} remaining actions`)
 
         if (stillSelected.length === 0) {