dazscript-framework 1.0.39 → 1.0.41

package/README.md

@@ -480,6 +480,20 @@ action({ text: 'My Dialog Script' }, () => {
 });
 ```
 
+#### 4. Prepare without opening modally
+
+`prepare()` builds the dialog and returns its native `DzBasicDialog` without entering the modal event loop. Use it when code must inspect or configure the completed native dialog before showing it.
+
+```typescript
+const dialog = new MyDialog(new MyModel());
+const nativeDialog = dialog.prepare();
+
+nativeDialog.minWidth = 600;
+const accepted = nativeDialog.exec();
+```
+
+Each call builds the dialog. After `prepare()`, execute the returned native dialog directly instead of calling `run()` or `ok()`, which would build it again.
+
 ---
 
 ### Observables
@@ -629,37 +643,7 @@ The `test/unit/` files are generated only when you run `dazscript init --unit-te
 
 ### Development & Publishing
 
-This package uses **semantic-release** for automatic versioning and npm publishing.
-
-#### Commit message conventions
-
-| Prefix | Effect |
-|---|---|
-| `fix: ...` | Patch bump (`1.0.0` → `1.0.1`) |
-| `feat: ...` | Minor bump (`1.0.0` → `1.1.0`) |
-| `BREAKING CHANGE: ...` in commit body | Major bump (`1.0.0` → `2.0.0`) |
-| No prefix | No version bump |
-
-Examples:
-```
-fix: resolve layout overflow in group builder
-feat: add tree view builder
-feat: refactor action entrypoint
-
-BREAKING CHANGE: action() now requires an explicit menuPath
-```
-
-#### Publishing
-
-Every push to `master` automatically:
-
-1. Analyzes commit messages since the last release
-2. Updates the version in `package.json`
-3. Builds the project
-4. Creates a GitHub release with changelog
-5. Publishes to npm
-
-No manual steps required.
+Every eligible push to `main` runs the npm publishing workflow. It installs from the lockfile, builds the package, increments the patch version, commits the version update with an annotated tag, and publishes the package to npm. Bot commits and commits containing `[skip ci]` do not start another release.
 
 ---
 

package/babel.config.js

@@ -18,7 +18,6 @@ module.exports = {
     [require.resolve('@babel/plugin-proposal-decorators'), { version: 'legacy' }],
     [require.resolve('@babel/plugin-transform-arrow-functions')],
     require.resolve('@babel/plugin-transform-block-scoping'),
-    require.resolve('@babel/plugin-proposal-class-properties'),
     require.resolve('@babel/plugin-transform-private-property-in-object'),
     require.resolve('@babel/plugin-transform-private-methods'),
   ],

package/dist/scripts/icons.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const glob = require('glob');
+const { globSync } = require('glob');
 
 function copyFile(sourcePath, targetPath) {
   fs.mkdirSync(path.dirname(targetPath), { recursive: true });
@@ -14,7 +14,7 @@ function copyIcons(workdir, options) {
   const sourceRoot = path.resolve(workdir, 'src');
   const outDir = path.resolve(workdir, options.outDir || './out');
   const pattern = path.join(sourceRoot, '**/*.png').replace(/\\/g, '/');
-  const files = glob.sync(pattern);
+  const files = globSync(pattern);
 
   files.forEach((filePath) => {
     const relativePath = path.relative(sourceRoot, filePath);

package/dist/scripts/install-generator.js

@@ -1,7 +1,7 @@
 const ts = require('typescript');
 const fs = require('fs');
 const path = require('path');
-const glob = require('glob');
+const { globSync } = require('glob');
 const { loadConfig } = require('./config-loader');
 const { validateAppDataPath } = require('./app-data-path');
 
@@ -187,7 +187,11 @@ function findActionEntryFiles(workdir, options) {
   const scriptsPath = options.scriptsPath.endsWith('/')
     ? options.scriptsPath
     : `${options.scriptsPath}/`;
-  const matches = glob.sync(`${scriptsPath}/**/*.dsa.ts`, { cwd: workdir });
+  const matches = globSync(`${scriptsPath}/**/*.dsa.ts`, { cwd: workdir })
+    .map((filePath) => {
+      const normalized = toPosix(filePath).replace(/^\.\//, '');
+      return `./${normalized}`;
+    });
 
   return matches.filter((filePath) => {
     const absolutePath = path.join(workdir, filePath);

package/dist/scripts/integration.js

@@ -197,7 +197,6 @@ function writeFile(filePath, content) {
 
 const fixtureBuildDependencies = [
   '@babel/core',
-  '@babel/plugin-proposal-class-properties',
   '@babel/plugin-proposal-decorators',
   '@babel/plugin-transform-arrow-functions',
   '@babel/plugin-transform-block-scoping',
@@ -206,9 +205,7 @@ const fixtureBuildDependencies = [
   '@babel/plugin-transform-private-property-in-object',
   '@babel/preset-env',
   '@babel/preset-typescript',
-  'babel-core',
   'babel-loader',
-  'babel-plugin-transform-class-properties',
   'babel-plugin-transform-typescript-metadata',
   'glob',
   'ts-loader',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",
@@ -14,6 +14,7 @@
     "installer": "node ./dist/scripts/cli.js installer --scripts-path ./src/examples --menu-path /DazScriptFramework",
     "test": "vitest run",
     "test:integration": "node ./dist/scripts/cli.js integration --fixture ./test/integration/fixtures/framework-integration.dsa.ts --require-content",
+    "test:integration:smoke": "node ./dist/scripts/cli.js integration --fixture ./test/integration/fixtures/framework-smoke.dsa.ts",
     "test:watch": "vitest"
   },
   "bin": {
@@ -47,32 +48,29 @@
     "dazscript-types": "^1.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.23.2",
-    "@babel/plugin-transform-arrow-functions": "^7.22.5",
-    "@babel/plugin-transform-block-scoping": "^7.23.0",
-    "@babel/plugin-transform-class-properties": "^7.25.9",
-    "@babel/plugin-transform-private-methods": "^7.27.1",
-    "@babel/plugin-transform-private-property-in-object": "^7.27.1",
-    "@babel/preset-env": "^7.23.2",
-    "@babel/preset-typescript": "^7.23.2",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-transform-class-properties": "^6.24.1",
+    "@babel/core": "^7.29.7",
+    "@babel/plugin-proposal-decorators": "^7.29.7",
+    "@babel/plugin-transform-arrow-functions": "^7.29.7",
+    "@babel/plugin-transform-block-scoping": "^7.29.7",
+    "@babel/plugin-transform-class-properties": "^7.29.7",
+    "@babel/plugin-transform-private-methods": "^7.29.7",
+    "@babel/plugin-transform-private-property-in-object": "^7.29.7",
+    "@babel/preset-env": "^7.29.7",
+    "@babel/preset-typescript": "^7.29.7",
+    "babel-loader": "^10.1.1",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "glob": "^7.2.0",
+    "glob": "^13.0.6",
     "ts-file-parser": "^0.0.21",
-    "ts-loader": "^9.5.0",
+    "ts-loader": "^9.6.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "typescript": "^5.2.2",
-    "webpack": "^5.88.2"
+    "webpack": "^5.107.2"
   },
   "devDependencies": {
     "@types/node": "^22.10.5",
     "dazscript-types": "^1.0.1",
     "eslint": "^9.17.0",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.0"
+    "vitest": "^4.1.8"
   }
 }

package/src/dialog/basic-dialog.test.ts

@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const dialog = vi.hoisted(() => ({ exec: vi.fn(() => true), close: vi.fn() }))
+const restoreObjectName = vi.hoisted(() => vi.fn())
+
+vi.mock('./builders/dialog-builder', () => ({
+    DialogBuilder: class {
+        context = { dialog }
+
+        build(setup: () => void) {
+            setup()
+            return dialog
+        }
+
+        restoreObjectName() {
+            restoreObjectName()
+        }
+    }
+}))
+
+import { BasicDialog } from './basic-dialog'
+
+class TestDialog extends BasicDialog {
+    builds = 0
+
+    constructor() {
+        super('Test')
+    }
+
+    protected build(): void {
+        this.builds++
+    }
+}
+
+describe('BasicDialog.prepare', () => {
+    beforeEach(() => vi.clearAllMocks())
+
+    it('builds and returns the dialog without entering its modal event loop', () => {
+        const subject = new TestDialog()
+
+        const prepared = subject.prepare()
+
+        expect(prepared).toBe(dialog)
+        expect(subject.builds).toBe(1)
+        expect(dialog.exec).not.toHaveBeenCalled()
+        expect(restoreObjectName).toHaveBeenCalledOnce()
+    })
+})

package/src/dialog/basic-dialog.ts

@@ -21,10 +21,14 @@ export abstract class BasicDialog {
         })
     }
 
-    run(): boolean {
+    prepare(): DzBasicDialog {
         this.init()
         this.builder.restoreObjectName()
-        return this.dialog.exec()
+        return this.dialog
+    }
+
+    run(): boolean {
+        return this.prepare().exec()
     }
 
     ok(): boolean {

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

@@ -0,0 +1,78 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { Observable } from '@dsf/lib/observable'
+import { TreeNode } from '@dsf/lib/tree-node'
+
+const listView = vi.hoisted(() => ({
+    items: [] as any[],
+    addColumn: vi.fn(),
+    clear: vi.fn(function (this: any) { this.items = [] }),
+    columnWidth: vi.fn(() => 100),
+    setColumnWidth: vi.fn(),
+    getItems: vi.fn(function (this: any) { return this.items.slice() }),
+    deleteItem: vi.fn(function (this: any, item: any) {
+        this.items = this.items.filter((candidate: any) => candidate !== item)
+    }),
+    setSorting: vi.fn(),
+    hide: vi.fn(),
+    show: vi.fn(),
+    selectedItem: vi.fn(() => null),
+    doubleClicked: { scriptConnect: vi.fn() },
+    contextMenuRequested: { scriptConnect: vi.fn() }
+}))
+
+vi.mock('./widget-builder', () => ({
+    createWidget: () => ({ build: () => listView })
+}))
+
+vi.mock('@dsf/helpers/list-view-helper', () => ({
+    clearColumns: vi.fn(),
+    filter: vi.fn(),
+    getDataItem: (item: any) => item?.data,
+    setDataItem: (item: any, data: any) => item.data = data
+}))
+
+class FakeListViewItem {
+    data: any
+    open = false
+    selectable = true
+    textByColumn: Record<number, string> = {}
+
+    constructor(parent: any, public id: number) {
+        parent.items.push(this)
+    }
+
+    setText(column: number, text: string) {
+        this.textByColumn[column] = text
+    }
+}
+
+vi.stubGlobal('DzListView', { All: 0, Extended: 1 })
+vi.stubGlobal('DzListViewItem', FakeListViewItem)
+
+import { ListViewBuilder } from './list-view-builder'
+
+describe('ListViewBuilder item updates', () => {
+    beforeEach(() => {
+        listView.items = []
+        vi.clearAllMocks()
+    })
+
+    it('keeps unchanged rows when data has no explicit id', () => {
+        const items = new Observable([
+            new TreeNode('Action A', '', { name: 'ActionA' }),
+            new TreeNode('Action B', '', { name: 'ActionB' })
+        ])
+        const builder = new ListViewBuilder<any, any>({ dialog: {}, layout: null } as any)
+
+        builder
+            .items(items)
+            .columns(['Name'])
+            .text(item => [item.name])
+            .data(item => item.value)
+            .build()
+
+        items.value = [new TreeNode('Action B', '', { name: 'ActionB' })]
+
+        expect(listView.items.map(item => item.textByColumn[0])).toEqual(['Action B'])
+    })
+})

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

@@ -0,0 +1,28 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const actionPixmap = vi.hoisted(() => vi.fn())
+
+vi.mock('@dsf/common/log', () => ({ debug: vi.fn(), warn: vi.fn() }))
+vi.mock('@dsf/core/global', () => ({
+    mainWindow: { getActionMgr: () => ({}) }
+}))
+
+import { getActionPixmap } from './action-helper'
+
+describe('getActionPixmap', () => {
+    beforeEach(() => {
+        actionPixmap.mockReset()
+        vi.stubGlobal('App', {
+            getStyle: () => ({ actionPixmap })
+        })
+    })
+
+    it('rejects a null pixmap even when DAZ reports nonzero height', () => {
+        actionPixmap.mockReturnValue({
+            height: 16,
+            isNull: () => true
+        })
+
+        expect(getActionPixmap('DzTestAction', '')).toBeNull()
+    })
+})

package/src/helpers/action-helper.ts

@@ -166,12 +166,12 @@ export const getActionPixmap = (action: string, icon: string, maxSize?: number):
                 } else {
                     pixmap = new Pixmap(image.getFilename())
                 }
-                return pixmap
+                return isEmptyPixmap(pixmap) ? null : pixmap
             }
         }
         else if (!isCustom) {
             let pixmap = App.getStyle().actionPixmap(action, 0, 0)
-            return pixmap?.height === 0 ? null : pixmap
+            return isEmptyPixmap(pixmap) ? null : pixmap
         }
     } catch (error) {
         warn(`Error while trying to get icon pixmap: ${error}`)
@@ -179,4 +179,9 @@ export const getActionPixmap = (action: string, icon: string, maxSize?: number):
     return null
 }
 
+const isEmptyPixmap = (pixmap: Pixmap | null | undefined): boolean =>
+    !pixmap
+    || (typeof (pixmap as any).isNull === 'function' && (pixmap as any).isNull())
+    || pixmap.height === 0
+
 

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

@@ -0,0 +1,74 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const open = vi.hoisted(() => vi.fn(() => false))
+const write = vi.hoisted(() => vi.fn(() => 0))
+const close = vi.hoisted(() => vi.fn())
+
+vi.mock('@dsf/common/log', () => ({ error: vi.fn() }))
+
+class FakeFile {
+    static WriteOnly = 2
+
+    open = open
+    write = write
+    close = close
+    deleteLater = vi.fn()
+}
+
+class FakeFileInfo {
+    absolutePath() {
+        return 'C:/temp'
+    }
+
+    deleteLater() { }
+}
+
+class FakeDir {
+    mkpath() {
+        return true
+    }
+}
+
+vi.stubGlobal('DzFile', FakeFile)
+vi.stubGlobal('DzFileInfo', FakeFileInfo)
+vi.stubGlobal('DzDir', FakeDir)
+
+import { saveToFile } from './file-helper'
+
+describe('saveToFile', () => {
+    beforeEach(() => {
+        vi.clearAllMocks()
+        open.mockReturnValue(false)
+        write.mockReturnValue(-1)
+    })
+
+    it('fails without writing when the file cannot be opened', () => {
+        expect(saveToFile('C:/temp/settings.json', '{}')).toBe(false)
+        expect(open).toHaveBeenCalledWith(FakeFile.WriteOnly)
+        expect(write).not.toHaveBeenCalled()
+    })
+
+    it('fails when writing reports an error', () => {
+        open.mockReturnValue(true)
+
+        expect(saveToFile('C:/temp/settings.json', '{}')).toBe(false)
+        expect(write).toHaveBeenCalledWith('{}')
+        expect(close).toHaveBeenCalledOnce()
+    })
+
+    it('fails when writing stores no bytes', () => {
+        open.mockReturnValue(true)
+        write.mockReturnValue(0)
+
+        expect(saveToFile('C:/temp/settings.json', '{}')).toBe(false)
+        expect(close).toHaveBeenCalledOnce()
+    })
+
+    it('succeeds when the file opens and writes', () => {
+        open.mockReturnValue(true)
+        write.mockReturnValue(2)
+
+        expect(saveToFile('C:/temp/settings.json', '{}')).toBe(true)
+        expect(close).toHaveBeenCalledOnce()
+    })
+})

package/src/helpers/file-helper.ts

@@ -32,22 +32,26 @@ export const readFromFile = <T>(filePath: string, cache: boolean = false): T | n
  * @returns
  */
 export const saveToFile = (filePath: string, content: string): boolean => {
+    let fileInfo: DzFileInfo | null = null
+    let file: DzFile | null = null
+    let opened = false
     try {
         if (!filePath || !content) return false
-        let fileInfo = new DzFileInfo(filePath)
+        fileInfo = new DzFileInfo(filePath)
         let path = fileInfo.absolutePath()
         var dzDir = new DzDir(path)
         dzDir.mkpath(path)
-        var file = new DzFile(`${filePath}`)
-        file.open(DzFile.WriteOnly)
-        file.write(content)
-        file.close()
-        fileInfo.deleteLater()
-        file.deleteLater()
-        return true
+        file = new DzFile(`${filePath}`)
+        opened = file.open(DzFile.WriteOnly)
+        if (!opened) return false
+        return file.write(content) > 0
     } catch (error) {
         log.error(`Error while saving file ${filePath}`)
         return false
+    } finally {
+        if (opened) file?.close()
+        fileInfo?.deleteLater()
+        file?.deleteLater()
     }
 }
 

package/src/scripts/integration.test.ts

@@ -105,6 +105,15 @@ describe('probe option resolution', () => {
 })
 
 describe('integration command resolution', () => {
+    it('exposes a no-content smoke integration command', () => {
+        const packageJson = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../package.json'), 'utf8'))
+        const script = packageJson.scripts['test:integration:smoke']
+
+        expect(script).toContain('integration')
+        expect(script).toContain('./test/integration/fixtures/framework-smoke.dsa.ts')
+        expect(script).not.toContain('--require-content')
+    })
+
     it('uses node plus npm-cli on Windows so child_process can spawn without a shell', () => {
         const invocation = getNpmInvocation(['--version'], 'win32')
 

package/webpack.config.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const glob = require('glob');
+const { globSync } = require('glob');
 const webpack = require('webpack');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const { createActionLaunchers } = require('./dist/scripts/launchers');
@@ -41,8 +41,7 @@ module.exports = (env, argv) => {
   const isFileSpecified = env && env.file;
   const entryFiles = isFileSpecified
     ? [path.resolve(sourceRoot, `${env.file}.dsa.ts`)]
-    : glob
-        .sync(path.join(sourceRoot, '**/*.dsa.ts').replace(/\\/g, '/'))
+    : globSync(path.join(sourceRoot, '**/*.dsa.ts').replace(/\\/g, '/'))
         .map((filePath) => path.resolve(filePath));
 
   const outputPath =