Minor type fix

repalash · Jan 5, 2025 · becd4e4 · becd4e4
1 parent c6009a4
commit becd4e4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "uiconfig.js",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "A framework for building user interface layouts with JSON configuration.",
     "main": "dist/index.js",
     "module": "dist/index.js",

diff --git a/src/UiConfigMethods.ts b/src/UiConfigMethods.ts
@@ -92,7 +92,7 @@ export class UiConfigMethods {
         let sameType = !!lastCommand && (lastCommand as SetValueCommand).type === 'UiConfigMethods_set' && (lastCommand as SetValueCommand).config === c.config
         if (sameType) {
             const cLast = lastCommand as SetValueCommand
-            if (!cLast.final && c.time - cLast.time < 2000) {
+            if (!cLast.final && (c.time - cLast.time) < 2000) {
                 // replace cLast with c using lastVal from cLast
                 c.lastVal = cLast.lastVal
                 c.val = clonePrimitive(c.val)

diff --git a/src/decorator_utils.ts b/src/decorator_utils.ts
@@ -93,7 +93,7 @@ export function generateUiConfig(obj: any): Required<UiObjectConfig>['children']
 export function generateUiFolder(label: string, obj: any, params: any = {}, type = 'folder', dynamic = false): UiObjectConfig {
     return {
         type, label,
-        children: !dynamic ? generateUiConfig(obj) : [()=> generateUiConfig(obj)],
+        children: !dynamic ? generateUiConfig(obj) : ()=> generateUiConfig(obj),
         uuid: uuidV4(),
         ...params,
     }

diff --git a/src/primitive_value.ts b/src/primitive_value.ts
@@ -1,8 +1,8 @@
 
 export interface PrimitiveValObject {
-    clone(): PrimitiveValObject
-    equals(other: PrimitiveValObject|PrimitiveVal): boolean
-    copy(other: PrimitiveValObject): void
+    clone(): this
+    equals(other: this|any): boolean
+    copy(other: this|any): void|this|any
 }
 // note that arbitrary objects are not allowed
 export type PrimitiveVal = string | number | boolean | null | PrimitiveValObject | PrimitiveVal[]