dazscript-framework 1.0.36 → 1.0.38

package/package.json

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

package/src/helpers/custom-action-installer-bulk.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest'
+import { SETUP_BULK_ACTIONS, applySetupBulkSelection } from './custom-action-installer-bulk'
+
+describe('setup bulk actions', () => {
+    it('uses concise install and uninstall labels', () => {
+        expect(SETUP_BULK_ACTIONS.installAll.label).toBe('Install All')
+        expect(SETUP_BULK_ACTIONS.uninstallAll.label).toBe('Uninstall All')
+    })
+
+    it('selects every installer entry for install all', () => {
+        const entries = [
+            { selected: false },
+            { selected: true },
+            { selected: false }
+        ]
+
+        applySetupBulkSelection(entries, true)
+
+        expect(entries.map(entry => entry.selected)).toEqual([true, true, true])
+    })
+
+    it('deselects every installer entry for uninstall all', () => {
+        const entries = [
+            { selected: true },
+            { selected: false },
+            { selected: true }
+        ]
+
+        applySetupBulkSelection(entries, false)
+
+        expect(entries.map(entry => entry.selected)).toEqual([false, false, false])
+    })
+})

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

@@ -0,0 +1,22 @@
+type BulkSelectableEntry = {
+    selected: boolean
+}
+
+export const SETUP_BULK_ACTIONS = {
+    installAll: {
+        label: 'Install All',
+        toolTip: 'Install every setup entry, ignoring the current search filter and checkbox state.',
+        whatsThis: 'Installs every script action in this setup dialog. This does not depend on which rows are checked or currently visible.'
+    },
+    uninstallAll: {
+        label: 'Uninstall All',
+        toolTip: 'Uninstall every setup entry, ignoring the current search filter and checkbox state.',
+        whatsThis: 'Removes every script action in this setup dialog from its menu and toolbar targets. This does not depend on which rows are checked or currently visible.'
+    }
+}
+
+export const applySetupBulkSelection = <TEntry extends BulkSelectableEntry>(entries: TEntry[], selected: boolean): void => {
+    entries.forEach((entry) => {
+        entry.selected = selected
+    })
+}

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

@@ -12,6 +12,7 @@ import { TreeNode } from '@dsf/lib/tree-node'
 import { promptKeyboardShortcut } from '@dsf/shared/set-keyboard-shortcut'
 import { readFromFile, saveToFile } from './file-helper'
 import { getCanonicalInstallerEntry, toActionKey } from './custom-action-installer-entries'
+import { SETUP_BULK_ACTIONS, applySetupBulkSelection } from './custom-action-installer-bulk'
 import { canResetSetupShortcut, getDisplayedSetupShortcut, resetSetupShortcut, resetSetupShortcuts, setSetupShortcut, updateShortcutOverrideState } from './custom-action-installer-shortcuts'
 import { getScriptPath } from './script-helper'
 
@@ -192,6 +193,7 @@ class InstallerSelectionDialog extends BasicDialog {
     private readonly refreshListEvent$ = new Observable<void>()
     private listView: DzListView | null = null
     private shortcutListView: DzListView | null = null
+    private bulkSelectionApplied = false
 
     constructor(
         private readonly entries: InstallerEntry[],
@@ -207,6 +209,7 @@ class InstallerSelectionDialog extends BasicDialog {
         this.builder.options({ resizable: true, width: 1100, height: 700 })
         this.dialog.setAcceptButtonText('Apply')
         this.dialog.setCancelButtonText('Cancel')
+        this.addBulkActionButtons()
 
         if (this.shortcutEntries.length > 0) {
             const add = this.add
@@ -219,7 +222,9 @@ class InstallerSelectionDialog extends BasicDialog {
     }
 
     getSelections(): SetupSelection {
-        this.syncSelectionsFromListView()
+        if (!this.bulkSelectionApplied) {
+            this.syncSelectionsFromListView()
+        }
         this.syncShortcutSelectionsFromListView()
         return {
             actions: this.entries,
@@ -227,6 +232,10 @@ class InstallerSelectionDialog extends BasicDialog {
         }
     }
 
+    hasBulkSelectionApplied(): boolean {
+        return this.bulkSelectionApplied
+    }
+
     private buildScriptsTab(): void {
         const add = this.add
 
@@ -430,6 +439,34 @@ class InstallerSelectionDialog extends BasicDialog {
         })
     }
 
+    private addBulkActionButtons(): void {
+        if (this.entries.length === 0) return
+
+        const installAllButton = this.createBulkActionButton(
+            SETUP_BULK_ACTIONS.installAll.label,
+            SETUP_BULK_ACTIONS.installAll.toolTip,
+            SETUP_BULK_ACTIONS.installAll.whatsThis
+        )
+        installAllButton.clicked.scriptConnect(() => this.applyBulkSelection(true))
+        this.dialog.addButton(installAllButton, 0)
+
+        const uninstallAllButton = this.createBulkActionButton(
+            SETUP_BULK_ACTIONS.uninstallAll.label,
+            SETUP_BULK_ACTIONS.uninstallAll.toolTip,
+            SETUP_BULK_ACTIONS.uninstallAll.whatsThis
+        )
+        uninstallAllButton.clicked.scriptConnect(() => this.confirmAndApplyBulkUninstall())
+        this.dialog.addButton(uninstallAllButton, 1)
+    }
+
+    private createBulkActionButton(label: string, toolTip: string, whatsThis: string): DzPushButton {
+        const button = new DzPushButton(this.dialog)
+        button.text = label
+        button.toolTip = toolTip
+        button.whatsThis = whatsThis
+        return button
+    }
+
     private getContextListItem(listView: DzListView, listItem: any): DzListViewItem | null {
         if (this.isListViewItem(listItem)) return listItem
 
@@ -535,6 +572,24 @@ class InstallerSelectionDialog extends BasicDialog {
         this.checkVisible(this.listView, onOff)
     }
 
+    private applyBulkSelection(selected: boolean): void {
+        applySetupBulkSelection(this.entries, selected)
+        this.bulkSelectionApplied = true
+        this.dialog.close()
+    }
+
+    private confirmAndApplyBulkUninstall(): void {
+        const response = MessageBox.question(
+            'Uninstall all scripts from menu and toolbar targets?',
+            'Uninstall All',
+            'Uninstall All',
+            'Cancel'
+        )
+        if (response !== 0) return
+
+        this.applyBulkSelection(false)
+    }
+
     private syncSelectionsFromListView() {
         if (!this.listView) return
 
@@ -609,7 +664,10 @@ const runDialog = (actions: CustomAction[], options: SetupDialogOptions): SetupS
     const entries = buildEntries(actions)
     const shortcutEntries = buildShortcutEntries(options.shortcuts)
     const dialog = new InstallerSelectionDialog(entries, shortcutEntries, options)
-    return dialog.ok() ? dialog.getSelections() : null
+    const accepted = dialog.ok()
+    return accepted || dialog.hasBulkSelectionApplied()
+        ? dialog.getSelections()
+        : null
 }
 
 const readShortcutBackup = (backupPath: string): ShortcutBackupFile => {

package/src/helpers/node-helper.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, it, vi } from 'vitest'
+import { isHairType } from './node-helper'
+
+const getTypeForNode = vi.fn()
+const isHairTypeAsset = vi.fn()
+
+vi.mock('@dsf/core/global', () => ({
+    app: {
+        getAssetMgr: () => ({
+            getTypeForNode,
+            isHairType: isHairTypeAsset
+        })
+    },
+    sceneHelper: {}
+}))
+
+describe('node helper hair classification', () => {
+    it('treats eyelash content types as hair regardless of case', () => {
+        getTypeForNode.mockReturnValue('Follower/Attachment/Head/Face/Eyelashes')
+        isHairTypeAsset.mockReturnValue(false)
+
+        const node = {
+            iskindof: (type: string) => type === 'DzSkeleton',
+            getSkeleton: () => node
+        }
+
+        expect(isHairType(node as unknown as DzNode)).toBe(true)
+    })
+})

package/src/helpers/node-helper.ts

@@ -120,7 +120,7 @@ export const isHairType = (node: DzNode): boolean => {
     const figure = getFigure(node)!
     const assetMgr = app.getAssetMgr()
     const type = assetMgr.getTypeForNode(figure)
-    return assetMgr.isHairType(type) || contains(type.valueOf(), 'Hair')
+    return assetMgr.isHairType(type) || contains(type.valueOf(), ['Hair', 'Eyelashes'], true)
 }
 
 export const isGeoShell = (node: DzNode): boolean => {

package/src/helpers/string-helper.test.ts

@@ -0,0 +1,12 @@
+import { describe, expect, it } from 'vitest'
+import { contains } from './string-helper'
+
+describe('string contains helper', () => {
+    it('matches any requested token case-insensitively when requested', () => {
+        expect(contains('Follower/Attachment/Head/Face/Eyelashes', ['hair', 'eyelashes'], true)).toBe(true)
+    })
+
+    it('keeps matching case-sensitive by default', () => {
+        expect(contains('Follower/Attachment/Head/Face/Eyelashes', 'eyelashes')).toBe(false)
+    })
+})

package/src/helpers/string-helper.ts

@@ -4,7 +4,17 @@ export const isNumeric = (value: string | number): boolean => {
         !isNaN(Number(value.toString())))
 }
 
-export const contains = (source: string, search: string | string[]): boolean => {
+export const contains = (source: string, search: string | string[], caseInsensitive: boolean = false): boolean => {
+    if (caseInsensitive) {
+        source = source.toLowerCase()
+        if (Array.isArray(search)) {
+            search = search.map(s => s.toLowerCase())
+        }
+        else {
+            search = search.toLowerCase()
+        }
+    }
+
     if (Array.isArray(search)) {
         for (const s of search) {
             if (source.indexOf(s) >= 0) return true