dazscript-framework 0.1.15 → 0.1.16

package/src/lib/settings.ts

@@ -1,104 +1,112 @@
-import { Observable } from './observable';
-
-export class AppSettings {
-    private appSettings: DzAppSettings
-    private _settingsPath: string
-    private _appDataPath: string
-    get appDataPath(): string {
-        return this._appDataPath
-    }
-
-    constructor(settingsPath: string, appDataPath?: string) {
-        this._settingsPath = settingsPath
-        this.setPaths({ settingsPath: settingsPath, appDataPath: appDataPath ?? settingsPath })
-    }
-
-    setPaths(paths: { settingsPath?: string, appDataPath?: string }) {
-        if (!paths.settingsPath && !paths.appDataPath) return
-        if (paths.settingsPath) {
-            this._settingsPath = paths.settingsPath
-            this.appSettings = new DzAppSettings(paths.settingsPath)
-        }
-        if (paths.appDataPath) {
-            this._appDataPath = `${App.getAppDataPath()}/${paths.appDataPath}`
-        }
-    }
-
-    forPath(path: string, ...paths: string[]): DzAppSettings {
-        let target = [this._settingsPath, path, ...paths].join('/')
-        return new DzAppSettings(target)
-    }
-
-    protected getInt(name: keyof this, value: number): number {
-        return this.appSettings.getIntValue(String(name), value);
-    }
-
-    protected setInt(name: keyof this, value: number) {
-        this.appSettings.setIntValue(String(name), value)
-    }
-
-    protected getFloat(name: keyof this, value: number): number {
-        return this.appSettings.getFloatValue(String(name), value);
-    }
-
-    protected setFloat(name: keyof this, value: number) {
-        this.appSettings.setFloatValue(String(name), value)
-    }
-
-    protected getBool(name: keyof this, defaultValue: boolean): boolean {
-        return this.appSettings.getBoolValue(String(name), defaultValue);
-    }
-
-    protected setBool(name: keyof this, value: boolean): void {
-        this.appSettings.setBoolValue(String(name), value)
-    }
-
-    protected getString(name: keyof this, defaultValue: string): string {
-        return this.appSettings.getStringValue(String(name), defaultValue)
-    }
-
-    protected setString(name: keyof this, value: string): void {
-        this.appSettings.setStringValue(String(name), value)
-    }
-
-    protected getArray(name: keyof this, defaultValue: string[]): string[] {
-        return this.appSettings.getStringValue(String(name), defaultValue.join(',')).split(',')
-    }
-
-    // protected setArray(name: keyof this, value: string[]): void {
-    //     this.appSettings.setStringValue(String(name), value.join(','))
-    // }
-
-    // protected getJson<T>(name: keyof this, defaultValue: T): T {
-    //     return JSON.parse(this.getString(name, JSON.stringify(defaultValue)))
-    // }
-
-    // protected setJson<T>(name: keyof this, value: T): void {
-    //     this.setString(name, JSON.stringify(value))
-    // }
-
-
-    bindBoolean(name: keyof this, defaultValue: boolean = false): Observable<boolean> {
-        return new Observable(this.getBool(name, defaultValue), (value) => this.setBool(name, value))
-    }
-
-    bindString(name: keyof this, defaultValue: string = ''): Observable<string> {
-        return new Observable(this.getString(name, defaultValue), (value) => this.setString(name, value))
-    }
-
-    bindInt(name: keyof this, defaultValue: number): Observable<number> {
-        return new Observable(this.getInt(name, defaultValue), (value) => this.setInt(name, value))
-    }
-
-    bindFloat(name: keyof this, defaultValue: number): Observable<number> {
-        return new Observable(this.getFloat(name, defaultValue), (value) => this.setFloat(name, value))
-    }
-
-    // bindArray(name: keyof this, defaultValue: string[] = []): Observable<string[]> {
-    //     return new Observable(this.getArray(name, defaultValue), (value) => this.setArray(name, value))
-    // }
-
-    // bindJson<T>(name: keyof this, defaultValue: T): Observable<T> {
-    //     return new Observable(this.getJson(name, defaultValue), (value) => this.setJson(name, value))
-    // }
-}
+import { Observable } from './observable';
+
+export class AppSettings {
+    private appSettings: DzAppSettings
+    private _settingsPath: string
+    private _appDataPath: string
+    get appDataPath(): string {
+        return this._appDataPath
+    }
+
+    constructor(settingsPath: string, appDataPath?: string) {
+        this._settingsPath = settingsPath
+        this.setPaths({ settingsPath: settingsPath, appDataPath: appDataPath ?? settingsPath })
+    }
+
+    setPaths(paths: { settingsPath?: string, appDataPath?: string }) {
+        if (!paths.settingsPath && !paths.appDataPath) return
+        if (paths.settingsPath) {
+            this._settingsPath = paths.settingsPath
+            this.appSettings = new DzAppSettings(paths.settingsPath)
+        }
+        if (paths.appDataPath) {
+            this._appDataPath = `${App.getAppDataPath()}/${paths.appDataPath}`
+        }
+    }
+
+    forPath(path: string, ...paths: string[]): DzAppSettings {
+        let target = [this._settingsPath, path, ...paths].join('/')
+        return new DzAppSettings(target)
+    }
+
+    protected getInt(name: keyof this, value: number): number {
+        return this.appSettings.getIntValue(String(name), value);
+    }
+
+    protected setInt(name: keyof this, value: number) {
+        this.appSettings.setIntValue(String(name), value)
+    }
+
+    protected getFloat(name: keyof this, value: number): number {
+        return this.appSettings.getFloatValue(String(name), value);
+    }
+
+    protected setFloat(name: keyof this, value: number) {
+        this.appSettings.setFloatValue(String(name), value)
+    }
+
+    protected getBool(name: keyof this, defaultValue: boolean): boolean {
+        return this.appSettings.getBoolValue(String(name), defaultValue);
+    }
+
+    protected setBool(name: keyof this, value: boolean): void {
+        this.appSettings.setBoolValue(String(name), value)
+    }
+
+    protected getString(name: keyof this, defaultValue: string): string {
+        return this.appSettings.getStringValue(String(name), defaultValue)
+    }
+
+    protected setString(name: keyof this, value: string): void {
+        this.appSettings.setStringValue(String(name), value)
+    }
+
+    protected getArray(name: keyof this, defaultValue: string[]): string[] {
+        const value = this.appSettings.getStringValue(String(name), defaultValue.join(','))
+        if (!value) return []
+        return value.split(',').filter(Boolean)
+    }
+
+    protected setArray(name: keyof this, value: string[]): void {
+        this.appSettings.setStringValue(String(name), value.join(','))
+    }
+
+    protected getJson<T>(name: keyof this, defaultValue: T): T {
+        const raw = this.getString(name, JSON.stringify(defaultValue))
+        if (!raw) return defaultValue
+        try {
+            return JSON.parse(raw) as T
+        } catch (_error) {
+            return defaultValue
+        }
+    }
+
+    protected setJson<T>(name: keyof this, value: T): void {
+        this.setString(name, JSON.stringify(value))
+    }
+
+
+    bindBoolean(name: keyof this, defaultValue: boolean = false): Observable<boolean> {
+        return new Observable(this.getBool(name, defaultValue), (value) => this.setBool(name, value))
+    }
+
+    bindString(name: keyof this, defaultValue: string = ''): Observable<string> {
+        return new Observable(this.getString(name, defaultValue), (value) => this.setString(name, value))
+    }
+
+    bindInt(name: keyof this, defaultValue: number): Observable<number> {
+        return new Observable(this.getInt(name, defaultValue), (value) => this.setInt(name, value))
+    }
+
+    bindFloat(name: keyof this, defaultValue: number): Observable<number> {
+        return new Observable(this.getFloat(name, defaultValue), (value) => this.setFloat(name, value))
+    }
+
+    bindArray(name: keyof this, defaultValue: string[] = []): Observable<string[]> {
+        return new Observable(this.getArray(name, defaultValue), (value) => this.setArray(name, value))
+    }
+
+    bindJson<T>(name: keyof this, defaultValue: T): Observable<T> {
+        return new Observable(this.getJson(name, defaultValue), (value) => this.setJson(name, value))
+    }
+}

package/src/lib/tree-node.ts

@@ -1,145 +1,149 @@
-export class TreeNode<T = null> {
-    name: string;
-    value: T | null;
-    path: string = '';
-    parent: TreeNode<T> | null = null;
-    private _children: TreeNode<T>[] = [];
-
-    constructor(name: string, path: string, value: T | null = null, children: TreeNode<T>[] = []) {
-        this.name = name;
-        this.path = path;
-        this.value = value;
-        this.addChild(...children)
-    }
-
-    addChild(...children: TreeNode<T>[]) {
-        children.forEach(child => child.parent = this)
-        this._children.push(...children)
-    }
-
-    get children(): TreeNode<T>[] {
-        return this._children
-    }
-
-    get isRoot(): boolean {
-        return !this.parent;
-    }
-
-    get isLeaf(): boolean {
-        return this._children.length === 0;
-    }
-
-    first(fn: (node: TreeNode<T>) => boolean): TreeNode<T> | null {
-        if (fn(this)) {
-            return this;
-        }
-
-        for (const child of this._children) {
-            const result = child.first(fn);
-            if (result !== null) {
-                return result;
-            }
-        }
-
-        return null;
-    }
-
-    forEach(fn: (node: TreeNode<T>) => void) {
-        fn(this)
-        for (const child of this._children) {
-            child.forEach(fn)
-        }
-    }
-
-    values(): (T | null)[] {
-        let result: (T | null)[] = [];
-
-        // Add the current node's value to the result
-        result.push(this.value);
-
-        // Recursively add values from children
-        for (const child of this.children) {
-            result = result.concat(child.values());
-        }
-
-        return result.filter(value => value !== null) as (T | null)[];
-    }
-
-    toJSON(): object {
-        return {
-            name: this.name,
-            path: this.path,
-            value: this.value,
-            isLeaf: this.isLeaf,
-            children: this._children
-        };
-    }
-
-    static fromJSON<T>(data: TreeNode<T>): TreeNode<T> {
-        const { name, path, value, children } = data;
-        const node = new TreeNode<T>(name, path, value);
-        if (children && children.length > 0) {
-            const parsedChildren = children.map((childData) => TreeNode.fromJSON<T>(childData));
-            node.addChild(...parsedChildren);
-        }
-        return node;
-    }
-}
-
-// getPaths(): string[] {
-//     let paths: string[] = [];
-
-//     const traverse = (node: TreeNode<T>) => {
-//         if (node.isLeaf) {
-//             paths.push(node.path);
-//         } else {
-//             for (let child of node.children) {
-//                 traverse(child);
-//             }
-//         }
-//     };
-
-//     traverse(this);
-//     return paths;
-// }
-
-// getPartialPaths(keyProperty?: keyof TreeNode<T>): string[] {
-//     let key = String(keyProperty ?? "name");
-//     let paths: string[] = [];
-
-//     const traverse = (node: TreeNode<T>, path: string) => {
-//         path += "/" + node[key];
-//         if (node.isLeaf) {
-//             paths.push(path);
-//         } else {
-//             for (let child of node.children) {
-//                 traverse(child, path);
-//             }
-//         }
-//     };
-
-//     traverse(this, '');
-//     return paths;
-// }
-
-// find(path: string): TreeNode<T> | null {
-//     // Start with this node
-//     let stack: TreeNode<T>[] = [this];
-
-//     // While there are nodes left to check
-//     while (stack.length > 0) {
-//         let node = stack.pop();
-
-//         // If this node's path matches the path, return it
-//         if (node.path === path) {
-//             return node;
-//         }
-
-//         // Add this node's children to the stack to be checked
-//         stack.push(...node.children);
-//     }
-
-//     // If no node was found with a matching path, return null
-//     return null;
-// }
-
+export class TreeNode<T = null> {
+    name: string;
+    value: T | null;
+    path: string = '';
+    parent: TreeNode<T> | null = null;
+    private _children: TreeNode<T>[] = [];
+
+    constructor(name: string, path: string, value: T | null = null, children: TreeNode<T>[] = []) {
+        this.name = name;
+        this.path = path;
+        this.value = value;
+        this.addChild(...children)
+    }
+
+    addChild(...children: TreeNode<T>[]) {
+        children.forEach(child => child.parent = this)
+        this._children.push(...children)
+    }
+
+    get children(): TreeNode<T>[] {
+        return this._children
+    }
+
+    get isRoot(): boolean {
+        return !this.parent;
+    }
+
+    get isLeaf(): boolean {
+        return this._children.length === 0;
+    }
+
+    first(fn: (node: TreeNode<T>) => boolean): TreeNode<T> | null {
+        if (fn(this)) {
+            return this;
+        }
+
+        for (const child of this._children) {
+            const result = child.first(fn);
+            if (result !== null) {
+                return result;
+            }
+        }
+
+        return null;
+    }
+
+    forEach(fn: (node: TreeNode<T>) => void) {
+        fn(this)
+        for (const child of this._children) {
+            child.forEach(fn)
+        }
+    }
+
+    values(): T[] {
+        let result: T[] = [];
+
+        const collect = (node: TreeNode<T>) => {
+            if (node.value !== null) {
+                result.push(node.value);
+            }
+
+            for (const child of node.children) {
+                collect(child);
+            }
+        }
+
+        collect(this)
+
+        return result;
+    }
+
+    toJSON(): object {
+        return {
+            name: this.name,
+            path: this.path,
+            value: this.value,
+            isLeaf: this.isLeaf,
+            children: this._children
+        };
+    }
+
+    static fromJSON<T>(data: TreeNode<T>): TreeNode<T> {
+        const { name, path, value, children } = data;
+        const node = new TreeNode<T>(name, path, value);
+        if (children && children.length > 0) {
+            const parsedChildren = children.map((childData) => TreeNode.fromJSON<T>(childData));
+            node.addChild(...parsedChildren);
+        }
+        return node;
+    }
+}
+
+// getPaths(): string[] {
+//     let paths: string[] = [];
+
+//     const traverse = (node: TreeNode<T>) => {
+//         if (node.isLeaf) {
+//             paths.push(node.path);
+//         } else {
+//             for (let child of node.children) {
+//                 traverse(child);
+//             }
+//         }
+//     };
+
+//     traverse(this);
+//     return paths;
+// }
+
+// getPartialPaths(keyProperty?: keyof TreeNode<T>): string[] {
+//     let key = String(keyProperty ?? "name");
+//     let paths: string[] = [];
+
+//     const traverse = (node: TreeNode<T>, path: string) => {
+//         path += "/" + node[key];
+//         if (node.isLeaf) {
+//             paths.push(path);
+//         } else {
+//             for (let child of node.children) {
+//                 traverse(child, path);
+//             }
+//         }
+//     };
+
+//     traverse(this, '');
+//     return paths;
+// }
+
+// find(path: string): TreeNode<T> | null {
+//     // Start with this node
+//     let stack: TreeNode<T>[] = [this];
+
+//     // While there are nodes left to check
+//     while (stack.length > 0) {
+//         let node = stack.pop();
+
+//         // If this node's path matches the path, return it
+//         if (node.path === path) {
+//             return node;
+//         }
+
+//         // Add this node's children to the stack to be checked
+//         stack.push(...node.children);
+//     }
+
+//     // If no node was found with a matching path, return null
+//     return null;
+// }
+

package/src/samples/config.ts

@@ -1,3 +1,3 @@
-export const config = {
-    author: 'DazScriptFramework'
+export const config = {
+    author: 'DazScriptFramework'
 }

package/src/samples/hello-world.dsa.ts

@@ -1,13 +1,13 @@
-import { debug } from '@dsf/common/log';
-import { action } from '@dsf/core/action-decorator';
-import { BaseScript } from '@dsf/core/base-script';
-import { info } from '@dsf/helpers/message-box-helper';
-
-@action({ text: 'Hello World' })
-class HelloWorldScript extends BaseScript {
-    protected run(): void {
-        debug('Hello World!');
-        info('Hello World!');
-    }
-}
+import { debug } from '@dsf/common/log';
+import { action } from '@dsf/core/action-decorator';
+import { BaseScript } from '@dsf/core/base-script';
+import { info } from '@dsf/helpers/message-box-helper';
+
+@action({ text: 'Hello World' })
+class HelloWorldScript extends BaseScript {
+    protected run(): void {
+        debug('Hello World!');
+        info('Hello World!');
+    }
+}
 new HelloWorldScript().exec();

package/src/samples/sample-dialog.dsa.ts

@@ -1,52 +1,52 @@
-import { debug, dump } from '@dsf/common/log';
-import { action } from '@dsf/core/action-decorator';
-import { BaseScript } from '@dsf/core/base-script';
-import { error } from '@dsf/helpers/message-box-helper';
-import { getNodes, getSelectedNode } from '@dsf/helpers/scene-helper';
-import { SampleDialog, SampleDialogModel } from './sample-dialog';
-
-@action({ text: 'Sample Dialog' })
-class SampleDialogScript extends BaseScript {
-    protected run(): void {
-        let sceneNodes = getNodes()
-        let selectedNode = getSelectedNode()
-        if (!selectedNode) {
-            error('Please select a node.')
-            return
-        }
-
-        let model = new SampleDialogModel()
-        model.nodes$.value = sceneNodes
-
-        model.nodeLabel$.connect((label) => {
-            if (label === model.selectedNode$.value.getLabel()) return
-            model.selectedNode$.value.setLabel(label)
-            model.nodes$.value = getNodes()
-        })
-
-        let dialog = new SampleDialog(model)
-
-        model.selectedNode$.connect((node) => {
-            if (!node) return
-            debug(`Selected Node: ${node.getLabel()}`)
-            node.select(true)
-            model.nodeLabel$.value = node.getLabel()
-            model.showNode$.value = node.isVisible()
-            model.hideNode$.value = !node.isVisible()
-        })
-        dialog.onNodeVisibilityChanged = (node, visible) => {
-            node.setVisible(visible)
-        }
-
-        model.selectedNode$.value = selectedNode
-
-        if (!dialog.run()) {
-            debug(`Dialog Cancelled`)
-            return
-        }
-
-        debug(`Dialog Closed`)
-        dump(model)
-    }
-}
+import { debug, dump } from '@dsf/common/log';
+import { action } from '@dsf/core/action-decorator';
+import { BaseScript } from '@dsf/core/base-script';
+import { error } from '@dsf/helpers/message-box-helper';
+import { getNodes, getSelectedNode } from '@dsf/helpers/scene-helper';
+import { SampleDialog, SampleDialogModel } from './sample-dialog';
+
+@action({ text: 'Sample Dialog' })
+class SampleDialogScript extends BaseScript {
+    protected run(): void {
+        let sceneNodes = getNodes()
+        let selectedNode = getSelectedNode()
+        if (!selectedNode) {
+            error('Please select a node.')
+            return
+        }
+
+        let model = new SampleDialogModel()
+        model.nodes$.value = sceneNodes
+
+        model.nodeLabel$.connect((label) => {
+            if (label === model.selectedNode$.value.getLabel()) return
+            model.selectedNode$.value.setLabel(label)
+            model.nodes$.value = getNodes()
+        })
+
+        let dialog = new SampleDialog(model)
+
+        model.selectedNode$.connect((node) => {
+            if (!node) return
+            debug(`Selected Node: ${node.getLabel()}`)
+            node.select(true)
+            model.nodeLabel$.value = node.getLabel()
+            model.showNode$.value = node.isVisible()
+            model.hideNode$.value = !node.isVisible()
+        })
+        dialog.onNodeVisibilityChanged = (node, visible) => {
+            node.setVisible(visible)
+        }
+
+        model.selectedNode$.value = selectedNode
+
+        if (!dialog.run()) {
+            debug(`Dialog Cancelled`)
+            return
+        }
+
+        debug(`Dialog Closed`)
+        dump(model)
+    }
+}
 new SampleDialogScript().exec();