dazscript-framework 1.0.36 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

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

@@ -0,0 +1,29 @@
+import { describe, expect, it, vi } from 'vitest'
+import { isHairType } from './node-helper'
+
+const getTypeForNode = vi.fn()
+const isHairTypeAsset = vi.fn()
+
+vi.mock('@dsf/core/global', () => ({
+    app: {
+        getAssetMgr: () => ({
+            getTypeForNode,
+            isHairType: isHairTypeAsset
+        })
+    },
+    sceneHelper: {}
+}))
+
+describe('node helper hair classification', () => {
+    it('treats eyelash content types as hair regardless of case', () => {
+        getTypeForNode.mockReturnValue('Follower/Attachment/Head/Face/Eyelashes')
+        isHairTypeAsset.mockReturnValue(false)
+
+        const node = {
+            iskindof: (type: string) => type === 'DzSkeleton',
+            getSkeleton: () => node
+        }
+
+        expect(isHairType(node as unknown as DzNode)).toBe(true)
+    })
+})

package/src/helpers/node-helper.ts

@@ -120,7 +120,7 @@ export const isHairType = (node: DzNode): boolean => {
     const figure = getFigure(node)!
     const assetMgr = app.getAssetMgr()
     const type = assetMgr.getTypeForNode(figure)
-    return assetMgr.isHairType(type) || contains(type.valueOf(), 'Hair')
+    return assetMgr.isHairType(type) || contains(type.valueOf(), ['Hair', 'Eyelashes'], true)
 }
 
 export const isGeoShell = (node: DzNode): boolean => {

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

@@ -0,0 +1,12 @@
+import { describe, expect, it } from 'vitest'
+import { contains } from './string-helper'
+
+describe('string contains helper', () => {
+    it('matches any requested token case-insensitively when requested', () => {
+        expect(contains('Follower/Attachment/Head/Face/Eyelashes', ['hair', 'eyelashes'], true)).toBe(true)
+    })
+
+    it('keeps matching case-sensitive by default', () => {
+        expect(contains('Follower/Attachment/Head/Face/Eyelashes', 'eyelashes')).toBe(false)
+    })
+})

package/src/helpers/string-helper.ts

@@ -4,7 +4,17 @@ export const isNumeric = (value: string | number): boolean => {
         !isNaN(Number(value.toString())))
 }
 
-export const contains = (source: string, search: string | string[]): boolean => {
+export const contains = (source: string, search: string | string[], caseInsensitive: boolean = false): boolean => {
+    if (caseInsensitive) {
+        source = source.toLowerCase()
+        if (Array.isArray(search)) {
+            search = search.map(s => s.toLowerCase())
+        }
+        else {
+            search = search.toLowerCase()
+        }
+    }
+
     if (Array.isArray(search)) {
         for (const s of search) {
             if (source.indexOf(s) >= 0) return true