@vyr/engine 0.0.36 → 0.0.37

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@vyr/engine",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@vyr/locale": "0.0.36",
+    "@vyr/locale": "0.0.37",
     "decamelize-keys": "^2.0.1",
     "camelcase-keys": "^10.0.1",
     "tinycolor2": "1.6.0",

package/src/descriptor/AnimationUnit.ts

@@ -1,4 +1,4 @@
-import { AnimationFrameData, parseFrameData, Vector2FrameDataSchema } from "../schema"
+import { AnimationFrameData, parseFrameData, PropertyPathSchema, Vector2FrameDataSchema } from "../schema"
 import { DeserializationObject } from "../Serialization"
 import { Descriptor } from "./Descriptor"
 
@@ -69,7 +69,7 @@ export class AnimationUnit extends Descriptor {
         this.count = descriptor.count ?? Infinity
         this.mode = descriptor.mode ?? 1
         this.startTime = descriptor.startTime ?? 0
-        this.propertyPath = descriptor.propertyPath ?? ''
+        this.propertyPath = PropertyPathSchema.parse(descriptor.propertyPath)
         this.frameData = descriptor.frameData ? parseFrameData(descriptor.frameData) : Vector2FrameDataSchema.parse({})
     }
 }

package/src/schema/Descriptor.ts

@@ -19,23 +19,25 @@ export interface DescriptorAdjacency {
     next: string
 }
 
-const pathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*|\[\d+\])*$/
+const propertyPathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*|\[\d+\])*$/
 
-const validatePath = (path: string) => {
+const validatePropertyPath = (path: string) => {
     const value = path.trim()
-    return value === '' || pathRegex.test(value)
+    return value === '' || propertyPathRegex.test(value)
 }
 
+export const PropertyPathSchema = z.string().default('').refine(
+    validatePropertyPath,
+    language.get('descriptor.variables.config.value')
+)
+
 export const VariabConfigSchema = z.object({
     type: z.enum(['key', 'custom']).default('key'),
     enabled: z.boolean().default(false),
-    value: z.string().default('').refine(
-        validatePath,
-        language.get('descriptor.variables.config.value')
-    )
+    value: PropertyPathSchema
 })
 export type VariabConfig = z.infer<typeof VariabConfigSchema>
 
-export const DescriptorVariablesSchema = z.object().catchall(VariabConfigSchema).default({})
+export const DescriptorVariablesSchema = z.record(PropertyPathSchema, VariabConfigSchema).default({})
 export type DescriptorVariables = z.infer<typeof DescriptorVariablesSchema>