dazscript-framework 0.3.2 → 1.0.2

package/dist/scripts/install-generator.js

@@ -21,14 +21,19 @@ function stringOrDefault(str, defaultValue) {
   return str !== undefined && str !== null && str !== '' ? str : defaultValue;
 }
 
-function generateInstallerTemplate(data, settingsPath, bundleName) {
+function generateInstallerTemplate(data, options) {
   return `
 import { showSetupCustomActionsDialog as setup } from '@dsf/helpers/custom-action-installer-helper';
 
-setup(${data}, ${JSON.stringify({
-    settingsPath,
-    bundleName,
-  })});
+setup(${data}, ${JSON.stringify(options)});
+`;
+}
+
+function generateUninstallTemplate(options) {
+  return `
+import { restoreSetupKeyboardShortcuts as restoreShortcuts } from '@dsf/helpers/custom-action-installer-helper';
+
+restoreShortcuts(${JSON.stringify(options)});
 `;
 }
 
@@ -151,7 +156,7 @@ function findActionEntryFiles(workdir, options) {
   });
 }
 
-function processScript(filePath, container, defaultMenuPath, settingsPath, bundleName) {
+function processScript(filePath, container, defaultMenuPath, setupOptions) {
   const fileInfo = path.parse(filePath);
   const content = fs.readFileSync(filePath, 'utf-8').toString();
   const actionCall = findTopLevelActionCall(content, filePath);
@@ -213,8 +218,7 @@ function processScript(filePath, container, defaultMenuPath, settingsPath, bundl
 
     let bundleScriptContent = generateInstallerTemplate(
       JSON.stringify(container.scripts, null, 4),
-      settingsPath,
-      bundleName
+      setupOptions
     );
     let bundleScriptFilePath = path.join(
       path.parse(filePath).dir,
@@ -224,13 +228,66 @@ function processScript(filePath, container, defaultMenuPath, settingsPath, bundl
   }
 }
 
-function processScripts(paths, container, defaultMenuPath, settingsPath, bundleName) {
+function processScripts(paths, container, defaultMenuPath, setupOptions) {
   paths.forEach((filePath) => {
     console.log(`Processing ${filePath}`);
-    processScript(filePath, container, defaultMenuPath, settingsPath, bundleName);
+    processScript(filePath, container, defaultMenuPath, setupOptions);
   });
 }
 
+function toPosix(filePath) {
+  return filePath.replace(/\\/g, '/');
+}
+
+function resolveShortcutFile(workdir, config) {
+  const configuredPath =
+    config.keyboardShortcutsPath ||
+    config.shortcutsPath ||
+    config.actionAcceleratorsPath;
+
+  const candidates = [];
+  if (configuredPath) {
+    candidates.push(path.resolve(workdir, configuredPath));
+  }
+
+  candidates.push(
+    path.join(workdir, 'src', 'keyboard-shortcuts.json'),
+    path.join(workdir, 'src', 'action-accelerators.json'),
+    path.join(workdir, 'keyboard-shortcuts.json'),
+    path.join(workdir, 'action-accelerators.json')
+  );
+
+  return candidates.find((candidate) => fs.existsSync(candidate)) || null;
+}
+
+function normalizeShortcutData(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) return raw;
+  if (Array.isArray(raw.actions)) return raw.actions;
+  if (Array.isArray(raw.shortcuts)) return raw.shortcuts;
+  if (Array.isArray(raw.accelerators)) return raw.accelerators;
+  return [];
+}
+
+function loadShortcutData(workdir, config) {
+  const shortcutFile = resolveShortcutFile(workdir, config);
+  if (!shortcutFile) {
+    return { shortcuts: undefined, sourcePath: undefined };
+  }
+
+  const raw = JSON.parse(fs.readFileSync(shortcutFile, 'utf8'));
+  const shortcuts = normalizeShortcutData(raw);
+
+  if (shortcuts.length === 0) {
+    console.warn(`[dazscript] Keyboard shortcut file has no shortcut entries: ${shortcutFile}`);
+  }
+
+  return {
+    shortcuts,
+    sourcePath: toPosix(path.relative(workdir, shortcutFile)),
+  };
+}
+
 function generateInstallerFiles(workdir, options) {
   const defaultMenuPath = options.defaultMenuPath.endsWith('/')
     ? options.defaultMenuPath
@@ -241,10 +298,20 @@ function generateInstallerFiles(workdir, options) {
   const bundleName = typeof config.bundleName === 'string' && config.bundleName.trim()
     ? config.bundleName.trim()
     : undefined;
+  const shortcutData = loadShortcutData(workdir, config);
+  const setupOptions = {
+    settingsPath,
+    bundleName,
+    shortcutBackupPath: `${appDataPath}/Installer/keyboard-shortcuts-backup.json`,
+  };
+  if (shortcutData.shortcuts && shortcutData.shortcuts.length > 0) {
+    setupOptions.shortcuts = shortcutData.shortcuts;
+    setupOptions.shortcutsSourcePath = shortcutData.sourcePath;
+  }
   const container = { scripts: [] };
   const matches = findActionEntryFiles(workdir, options);
 
-  processScripts(matches, container, defaultMenuPath, settingsPath, bundleName);
+  processScripts(matches, container, defaultMenuPath, setupOptions);
 
   container.scripts = container.scripts.sort((a, b) => {
     const aKey = a.menuPath + a.filePath;
@@ -254,15 +321,19 @@ function generateInstallerFiles(workdir, options) {
 
   const installerScriptContent = generateInstallerTemplate(
     JSON.stringify(container.scripts, null, 4),
-    settingsPath,
-    bundleName
+    setupOptions
   );
   fs.writeFileSync(path.join(workdir, 'src', 'Setup.dsa.ts'), installerScriptContent);
 
   const installPath = path.join(workdir, 'src', 'Install.dsa.ts');
   const uninstallPath = path.join(workdir, 'src', 'Uninstall.dsa.ts');
   if (fs.existsSync(installPath)) fs.unlinkSync(installPath);
-  if (fs.existsSync(uninstallPath)) fs.unlinkSync(uninstallPath);
+
+  if (shortcutData.shortcuts && shortcutData.shortcuts.length > 0) {
+    fs.writeFileSync(path.join(workdir, 'src', 'Uninstall.dsa.ts'), generateUninstallTemplate(setupOptions));
+  } else if (fs.existsSync(uninstallPath)) {
+    fs.unlinkSync(uninstallPath);
+  }
 }
 
 if (require.main === module) {

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "dazscript-framework",
-  "version": "0.3.2",
+  "version": "1.0.2",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",
   "scripts": {
     "prepare": "node ./scripts/install-git-hooks.js",
-    "prebuild": "node ./dist/scripts/cli.js installer --scripts-path ./src/samples --menu-path /DazScriptFramework",
+    "prebuild": "node ./dist/scripts/cli.js installer --scripts-path ./src/examples --menu-path /DazScriptFramework",
     "build": "node ./dist/scripts/cli.js build --out-dir ./out",
     "postbuild": "node ./dist/scripts/cli.js icons --out-dir ./out",
     "watch": "node ./dist/scripts/cli.js watch --out-dir ./out",
     "icons": "node ./dist/scripts/cli.js icons --out-dir ./out",
-    "installer": "node ./dist/scripts/cli.js installer --scripts-path ./src/samples --menu-path /DazScriptFramework"
+    "installer": "node ./dist/scripts/cli.js installer --scripts-path ./src/examples --menu-path /DazScriptFramework",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "bin": {
     "dazscript": "./dist/scripts/cli.js"
@@ -69,6 +71,7 @@
     "@types/node": "^22.10.5",
     "dazscript-types": "^1.0.1",
     "eslint": "^9.17.0",
-    "typescript": "^5.7.3"
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.0"
   }
 }

package/src/Setup.dsa.ts

@@ -4,16 +4,44 @@ import { showSetupCustomActionsDialog as setup } from '@dsf/helpers/custom-actio
 setup([
     {
         "name": null,
-        "text": "Hello World",
-        "filePath": "samples/hello-world.dsa",
-        "menuPath": "/DazScriptFramework/samples",
-        "description": "hello-world"
+        "text": "01 Hello World",
+        "filePath": "examples/01-hello-world.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "01-hello-world"
     },
     {
         "name": null,
-        "text": "Sample Dialog",
-        "filePath": "samples/sample-dialog.dsa",
-        "menuPath": "/DazScriptFramework/samples",
-        "description": "sample-dialog"
+        "text": "02 Persistence Dialog",
+        "filePath": "examples/02-persistence-dialog.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "02-persistence-dialog"
+    },
+    {
+        "name": null,
+        "text": "03 Simple Dialog",
+        "filePath": "examples/03-simple-dialog.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "03-simple-dialog"
+    },
+    {
+        "name": null,
+        "text": "04 Settings Dialog",
+        "filePath": "examples/04-settings-dialog.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "04-settings-dialog"
+    },
+    {
+        "name": null,
+        "text": "05 List Dialog",
+        "filePath": "examples/05-list-dialog.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "05-list-dialog"
+    },
+    {
+        "name": null,
+        "text": "06 Showcase Dialog",
+        "filePath": "examples/06-showcase-dialog.dsa",
+        "menuPath": "/DazScriptFramework/examples",
+        "description": "06-showcase-dialog"
     }
-], {"settingsPath":"DazScriptFramework/samples/Installer","bundleName":"Samples"});
+], {"settingsPath":"DazScriptFramework/examples/Installer","bundleName":"Examples","shortcutBackupPath":"DazScriptFramework/examples/Installer/keyboard-shortcuts-backup.json"});

package/src/dialog/builders/list-view-builder.ts

@@ -193,6 +193,11 @@ class ListViewBindBuilder<TItem, TData> {
         return this
     }
 
+    contextMenu(fn: (listView: DzListView, item: DzListViewItem, pos: Point) => DzPopupMenu): this {
+        this.context.contextMenu = fn
+        return this
+    }
+
     build(then?: (listView: DzListView) => void): DzListView {
         let listView = build(this.context)
         then?.(listView)

package/src/examples/01-hello-world.dsa.ts

@@ -0,0 +1,8 @@
+import { debug } from '@dsf/common/log'
+import { action } from '@dsf/core/action'
+import { info } from '@dsf/helpers/message-box-helper'
+
+action({ text: '01 Hello World' }, () => {
+    debug('Hello World!')
+    info('Hello World!')
+})

package/src/examples/02-persistence-dialog.dsa.ts

@@ -0,0 +1,21 @@
+import { debug } from '@dsf/common/log'
+import { action } from '@dsf/core/action'
+import { PersistenceDialog, PersistenceDialogModel } from './02-persistence-dialog'
+
+action({ text: '02 Persistence Dialog' }, () => {
+    let model = new PersistenceDialogModel()
+    let dialog = new PersistenceDialog(model)
+
+    if (!dialog.run()) {
+        debug('Persistence dialog cancelled')
+        return
+    }
+
+    const lines = [
+        `DzAppSettings checkbox : ${model.registryEnabled$.value}`,
+        `App data JSON checkbox : ${model.fileEnabled$.value}`,
+        `App data JSON file     : ${model.filePath}`,
+    ]
+
+    debug(lines.join('\n'))
+})

package/src/examples/02-persistence-dialog.ts

@@ -0,0 +1,68 @@
+import { BasicDialog } from '@dsf/dialog/basic-dialog'
+import { readFromFile, saveToFile } from '@dsf/helpers/file-helper'
+import { AppSettings } from '@dsf/lib/settings'
+import { Observable } from '@dsf/lib/observable'
+import { config } from './config'
+
+type FilePersistenceState = {
+    enabled: boolean
+}
+
+export class PersistenceSettings extends AppSettings {
+    constructor() {
+        super(`${config.author}/02-PersistenceDialog`)
+    }
+
+    registryEnabled$ = this.bindBoolean('registryEnabled$', false)
+}
+
+export class PersistenceDialogModel {
+    readonly settings = new PersistenceSettings()
+    readonly registryEnabled$ = this.settings.registryEnabled$
+    readonly filePath = `${this.settings.appDataPath}/persistence-dialog.json`
+    readonly fileEnabled$ = new Observable(this.readFileState().enabled, () => this.writeFileState())
+
+    private readFileState(): FilePersistenceState {
+        return readFromFile<FilePersistenceState>(this.filePath) ?? { enabled: false }
+    }
+
+    private writeFileState(): void {
+        saveToFile(this.filePath, JSON.stringify({ enabled: this.fileEnabled$.value }, null, 2))
+    }
+}
+
+export class PersistenceDialog extends BasicDialog {
+    constructor(private readonly model: PersistenceDialogModel) {
+        super('02 Persistence Dialog')
+    }
+
+    protected build(): void {
+        let add = this.add
+        let model = this.model
+
+        this.builder.options({ resizable: true, width: 620, height: 360 })
+        this.dialog.setAcceptButtonText('Close')
+
+        add.label([
+            'Toggle either checkbox, close this dialog, then run the example again.',
+            'The checkbox values should reopen with the last saved state.',
+        ].join('\n')).wordWrap().build()
+
+        add.group('DzAppSettings').build(() => {
+            add.label([
+                'Persists through DAZ Studio DzAppSettings.',
+                'On Windows this uses the registry-backed application settings store.',
+                'On macOS this uses the platform preferences store.',
+            ].join('\n')).wordWrap().build()
+            add.checkbox('Stored in DzAppSettings').value(model.registryEnabled$)
+        })
+
+        add.group('App Data JSON File').build(() => {
+            add.label([
+                'Persists to a JSON file under DAZ Studio app data.',
+                `File: ${model.filePath}`,
+            ].join('\n')).wordWrap().build()
+            add.checkbox('Stored in app data JSON').value(model.fileEnabled$)
+        })
+    }
+}

package/src/examples/03-simple-dialog.dsa.ts

@@ -0,0 +1,23 @@
+import { debug } from '@dsf/common/log'
+import { action } from '@dsf/core/action'
+import { info } from '@dsf/helpers/message-box-helper'
+import { SimpleDialog, SimpleDialogModel } from './03-simple-dialog'
+
+action({ text: '03 Simple Dialog' }, () => {
+    let model  = new SimpleDialogModel()
+    let dialog = new SimpleDialog(model)
+
+    if (!dialog.run()) {
+        debug('Dialog cancelled')
+        return
+    }
+
+    const lines = [
+        `Name    : ${model.name$.value}`,
+        `Enabled : ${model.enabled$.value}`,
+        `Notes   : ${model.notes$.value || '(none)'}`,
+    ]
+
+    debug(lines.join('\n'))
+    info(lines.join('\n'))
+})

package/src/examples/03-simple-dialog.ts

@@ -0,0 +1,47 @@
+import { BasicDialog } from '@dsf/dialog/basic-dialog'
+import { Observable } from '@dsf/lib/observable'
+
+// Model
+
+export class SimpleDialogModel {
+    name$    = new Observable('My Object')
+    enabled$ = new Observable(true)
+    notes$   = new Observable('')
+}
+
+// Dialog
+
+export class SimpleDialog extends BasicDialog {
+    constructor(private readonly model: SimpleDialogModel) {
+        super('03 Simple Dialog')
+    }
+
+    protected build(): void {
+        let add   = this.add
+        let model = this.model
+
+        this.builder.options({ resizable: true, width: 420, height: 240 })
+
+        add.group('Object').build(() => {
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Name:').minWidth(45)
+                add.edit().value(model.name$).placeholder('Enter a name...')
+            })
+
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Notes:').minWidth(45)
+                add.edit().value(model.notes$).placeholder('Optional notes...')
+            })
+
+            add.checkbox('Enabled').value(model.enabled$)
+        })
+
+        add.button('Reset').clicked(() => {
+            model.name$.value    = 'My Object'
+            model.enabled$.value = true
+            model.notes$.value   = ''
+        })
+    }
+}

package/src/examples/04-settings-dialog.dsa.ts

@@ -0,0 +1,29 @@
+import { debug } from '@dsf/common/log'
+import { action } from '@dsf/core/action'
+import { info } from '@dsf/helpers/message-box-helper'
+import { RenderSettings, SettingsDialog } from './04-settings-dialog'
+
+action({ text: '04 Settings Dialog' }, () => {
+    // Settings are loaded from DzAppSettings on construction and
+    // auto-saved on every change - values persist between script runs.
+    let settings = new RenderSettings()
+    let dialog   = new SettingsDialog(settings)
+
+    if (!dialog.run()) {
+        debug('Settings cancelled')
+        return
+    }
+
+    const lines = [
+        `Quality    : ${settings.quality$.value}`,
+        `Samples    : ${settings.samples$.value}`,
+        `Scale      : ${settings.scale$.value}`,
+        `Output     : ${settings.outputPath$.value || '(default)'}`,
+        `Format     : ${settings.format$.value}`,
+        `Use GPU    : ${settings.useGpu$.value}`,
+        `Verbose    : ${settings.verbose$.value}`,
+    ]
+
+    debug(lines.join('\n'))
+    info(lines.join('\n'))
+})

package/src/examples/04-settings-dialog.ts

@@ -0,0 +1,83 @@
+import { BasicDialog } from '@dsf/dialog/basic-dialog'
+import { AppSettings } from '@dsf/lib/settings'
+import { config } from './config'
+
+// Settings (persisted across runs via DzAppSettings)
+
+export class RenderSettings extends AppSettings {
+    constructor() {
+        super(`${config.author}/04-SettingsDialog`)
+    }
+
+    quality$       = this.bindString('quality$', 'Medium')
+    samples$       = this.bindInt('samples$', 64)
+    scale$         = this.bindFloat('scale$', 1.0)
+    outputPath$    = this.bindString('outputPath$', '')
+    useGpu$        = this.bindBoolean('useGpu$', true)
+    verbose$       = this.bindBoolean('verbose$', false)
+    format$        = this.bindString('format$', 'PNG')
+}
+
+// Dialog
+
+export class SettingsDialog extends BasicDialog {
+    constructor(private readonly settings: RenderSettings) {
+        super('04 Settings Dialog')
+    }
+
+    protected build(): void {
+        let add      = this.add
+        let settings = this.settings
+
+        this.builder.options({ resizable: true, width: 520, height: 420 })
+
+        add.group('Render').build(() => {
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Quality:').minWidth(60)
+                add.combo()
+                    .items(['Low', 'Medium', 'High', 'Ultra'])
+                    .selected(settings.quality$)
+            })
+
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Samples:').minWidth(60)
+                add.slider('integer').value(settings.samples$).min(1).max(512).build()
+            })
+
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Scale:').minWidth(60)
+                add.slider('float').value(settings.scale$).min(0.1).max(10.0).build()
+            })
+        })
+
+        add.group('Output').build(() => {
+            add.horizontal((layout) => {
+                layout.spacing = 5
+                add.label('Path:').minWidth(60)
+                add.edit()
+                    .value(settings.outputPath$)
+                    .placeholder('Leave empty for default output path...')
+            })
+
+            add.group('Format').horizontal().style({ flat: true }).build(() => {
+                add.radio('PNG')
+                    .value(settings.format$.value === 'PNG')
+                    .toggled(v => { if (v) settings.format$.value = 'PNG' })
+                add.radio('JPEG')
+                    .value(settings.format$.value === 'JPEG')
+                    .toggled(v => { if (v) settings.format$.value = 'JPEG' })
+                add.radio('EXR')
+                    .value(settings.format$.value === 'EXR')
+                    .toggled(v => { if (v) settings.format$.value = 'EXR' })
+            })
+        })
+
+        add.group('Options').horizontal().build(() => {
+            add.checkbox('Use GPU').value(settings.useGpu$)
+            add.checkbox('Verbose').value(settings.verbose$)
+        })
+    }
+}

package/src/examples/05-list-dialog.dsa.ts

@@ -0,0 +1,53 @@
+import { debug } from '@dsf/common/log'
+import { action } from '@dsf/core/action'
+import { info } from '@dsf/helpers/message-box-helper'
+import { TreeNode } from '@dsf/lib/tree-node'
+import { FileItem, ListDialog, ListDialogModel } from './05-list-dialog'
+
+// Sample data
+
+function buildFileTree(): TreeNode<FileItem>[] {
+    const folder = (name: string, children: TreeNode<FileItem>[] = []) =>
+        new TreeNode<FileItem>(name, name, { name, type: 'folder', size: 0 }, children)
+
+    const file = (name: string, size: number) =>
+        new TreeNode<FileItem>(name, name, { name, type: 'file', size })
+
+    return [
+        folder('Characters', [
+            file('Victoria.duf',  1_200_000),
+            file('Michael.duf',   980_000),
+        ]),
+        folder('Props', [
+            file('Chair.obj',     45_000),
+            file('Table.obj',     62_000),
+            folder('Lights', [
+                file('Studio.duf', 12_000),
+            ]),
+        ]),
+        file('Scene.duf', 3_400_000),
+    ]
+}
+
+// Action
+
+action({ text: '05 List Dialog' }, () => {
+    let model  = new ListDialogModel()
+    model.files$.value       = buildFileTree()
+    model.recentFiles$.value = ['Victoria.duf', 'Chair.obj', 'Scene.duf']
+
+    let dialog = new ListDialog(model)
+
+    if (!dialog.run()) {
+        debug('List dialog cancelled')
+        return
+    }
+
+    let sel = model.selected$.value
+    const lines = sel
+        ? [`Selected : ${sel.name}`, `Type     : ${sel.type}`, `Size     : ${sel.size} bytes`]
+        : ['No item selected']
+
+    debug(lines.join('\n'))
+    info(lines.join('\n'))
+})