@ray-js/lamp-schedule-core 1.0.5-beta.8 → 1.0.5-beta.9

package/lib/conflict/index.d.ts

@@ -1,10 +1,15 @@
-import { TConflictRes, ConflictRule, TFoldScheduleList, TSchedule } from './type';
+import { TConflictRes, ConflictRule, TFoldScheduleList, TSchedule, PartialSchedule } from './type';
+import { EScheduleFunctionType } from '../types';
 /**
  * 冲突检测
  */
 export declare class Conflict {
     static rule: ConflictRule;
     static isInit: boolean;
+    /**
+     * 获取冲突检测数据
+     */
+    static getData(): Record<string, any>[];
     /**
      * 添加冲突规则
      */
@@ -18,13 +23,18 @@ export declare class Conflict {
      *          conflictList - 具体的冲突检测结果数组
      */
     static add(current: TSchedule): TConflictRes;
+    /**
+     * 删除指定类型的日程
+     * @param type - 日程类型
+     */
+    static removeByType(type: EScheduleFunctionType): void;
     /**
      * 删除日程
      *
-     * @param current - 待添加的日程对象，类型为 Schedule
+     * @param current - 待添加的日程对象，类型为 Schedule,  如果没有 detail 则认为是删除指定类型的日程
      * @returns void
      */
-    static remove(current: TSchedule): void;
+    static remove(current: TSchedule | PartialSchedule): void;
     /**
      * 更新新日程时检测冲突
      *

package/lib/conflict/index.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import { scheduleLogger } from '../utils/ScheduleLogger';
 import { checkConflicts } from './ConflictResolver';
@@ -12,6 +13,13 @@ import { EScheduleFunctionType } from '../types';
  * 冲突检测
  */
 export class Conflict {
+  /**
+   * 获取冲突检测数据
+   */
+  static getData() {
+    return ScheduleDataManager.getInstance().getData();
+  }
+
   /**
    * 添加冲突规则
    */
@@ -50,13 +58,31 @@ export class Conflict {
     };
   }
 
+  /**
+   * 删除指定类型的日程
+   * @param type - 日程类型
+   */
+  static removeByType(type) {
+    const instance = ScheduleDataManager.getInstance();
+    const list = instance.getData() || [];
+    const filteredList = list.filter(item => item.type !== type);
+    ScheduleDataManager.list = filteredList;
+  }
+
   /**
    * 删除日程
    *
-   * @param current - 待添加的日程对象，类型为 Schedule
+   * @param current - 待添加的日程对象，类型为 Schedule,  如果没有 detail 则认为是删除指定类型的日程
    * @returns void
    */
   static remove(current) {
+    if (!current) {
+      return;
+    }
+    if (current.type && !current.detail) {
+      this.removeByType(current.type);
+      return;
+    }
     const [cur] = transScheduleListToConflictList([current]);
     scheduleLogger.debug('Conflict.remove cur, current:', cur, current);
 

package/lib/conflict/scheduleDataManager.js

@@ -1,3 +1,4 @@
+import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
@@ -63,10 +64,11 @@ export class ScheduleDataManager {
     }
     const idsToAdd = new Set(itemsMap.keys());
     const filteredList = ScheduleDataManager.list.filter(item => !idsToAdd.has(item.id));
-    ScheduleDataManager.list = [...filteredList, ...itemsMap.values()].filter(item => {
+    const newList = [...filteredList, ...itemsMap.values()].filter(item => {
       var _item$data;
       return (item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.status) === true;
     });
+    ScheduleDataManager.list = newList;
   }
   clearData() {
     scheduleLogger.debug('ScheduleDataManager.clearData pre', ScheduleDataManager.list);
@@ -76,12 +78,14 @@ export class ScheduleDataManager {
     if (!current) {
       return;
     }
-    scheduleLogger.debug('ScheduleDataManager.deleteData pre', current);
+    scheduleLogger.debug('ScheduleDataManager.deleteData pre', current, JSON.stringify(ScheduleDataManager.list));
     const index = ScheduleDataManager.list.findIndex(item => item.id === current.id);
     if (index !== -1) {
       ScheduleDataManager.list.splice(index, 1);
+      scheduleLogger.debug('ScheduleDataManager.deleteData post', JSON.stringify(ScheduleDataManager.list));
+    } else {
+      scheduleLogger.debug('ScheduleDataManager.deleteData post not found', JSON.stringify(ScheduleDataManager.list));
     }
-    scheduleLogger.debug('ScheduleDataManager.deleteData post', ScheduleDataManager.list);
   }
 
   // 添加remove方法作为deleteData的别名，用于测试

package/lib/conflict/type.d.ts

@@ -52,5 +52,9 @@ export type TSchedule = {
     type: EScheduleFunctionType;
     detail: ScheduleNodeType[];
 };
+export type PartialSchedule = {
+    type: EScheduleFunctionType;
+    detail?: ScheduleNodeType[];
+};
 export type TFoldScheduleList = TSchedule[];
 export {};

package/lib/dpParser/__test__/sleepSigmesh.test.js

@@ -121,6 +121,7 @@ describe('SleepSigmesh parser & formatter', () => {
         index: 0
       }]
     });
+    // formatter 固定输出 version=1, dataMode=1
     expect(result).toBe(buildDpStr([{
       onOff: 1,
       loops: loopsToHex('1000000'),
@@ -129,7 +130,7 @@ describe('SleepSigmesh parser & formatter', () => {
       minute: 15,
       brightness: 90,
       temperature: 50
-    }], 1, 3));
+    }], 1, 1));
   });
   it('round-trips dp string through parser and formatter', () => {
     const nodes = [{
@@ -144,7 +145,8 @@ describe('SleepSigmesh parser & formatter', () => {
     const dpStr = buildDpStr(nodes, 2, 3);
     const parsed = sleepParserSigmesh.parser(dpStr);
     const formatted = sleepParserSigmesh.formatter(parsed);
-    expect(formatted).toBe(dpStr);
+    // formatter 固定输出 version=1, dataMode=1，故 round-trip 后与原始 dpStr 不同
+    expect(formatted).toBe(buildDpStr(nodes, 1, 1));
   });
   it('handles multiple nodes correctly', () => {
     const nodes = [{

package/lib/dpParser/__test__/wakeupSigmesh.test.js

@@ -97,6 +97,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
         index: 0
       }]
     });
+    // formatter 固定输出 version=1, dataMode=1（与 parser 可解析的格式一致）
     expect(result).toBe(buildDpStr([{
       onOff: 1,
       loops: loopsToHex('1000000'),
@@ -106,7 +107,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
       brightness: 90,
       temperature: 50,
       duration: 20
-    }], 1, 3));
+    }], 1, 1));
   });
   it('round-trips dp string through parser and formatter', () => {
     const nodes = [{
@@ -122,6 +123,7 @@ describe('WakeUpSigmesh parser & formatter', () => {
     const dpStr = buildDpStr(nodes, 2, 3);
     const parsed = wakeupParserSigmesh.parser(dpStr);
     const formatted = wakeupParserSigmesh.formatter(parsed);
-    expect(formatted).toBe(dpStr);
+    // formatter 固定输出 version=1, dataMode=1，故 round-trip 后与原始 dpStr 不同
+    expect(formatted).toBe(buildDpStr(nodes, 1, 1));
   });
 });

package/lib/hooks/__test__/useTimerDp.test.js

@@ -2,10 +2,12 @@ import "core-js/modules/es.json.stringify.js";
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useTimerDp } from '../useTimerDp';
 import { useBaseLightDp } from '../useBaseLightDp';
+import { useSupport } from '../useCommonSupport';
 import { scheduleDpCodes } from '../../config/dpCodes';
 import { rtcTimerParser } from '../../dpParser/rtcTimer';
 // Mock dependencies
 jest.mock('../useBaseLightDp');
+jest.mock('../useCommonSupport');
 jest.mock('../../dpParser/rtcTimer');
 describe('useTimerDp', () => {
   const mockTimerData = {
@@ -27,6 +29,9 @@ describe('useTimerDp', () => {
   };
   beforeEach(() => {
     jest.clearAllMocks();
+    useSupport.mockReturnValue({
+      isSupportDp: jest.fn(code => code === scheduleDpCodes.RTC_TIMER)
+    });
     useBaseLightDp.mockReturnValue({
       dpValue: mockTimerData,
       updateDp: jest.fn()
@@ -72,9 +77,4 @@ describe('useTimerDp', () => {
     renderHook(() => useTimerDp());
     expect(useBaseLightDp).toHaveBeenCalledWith(scheduleDpCodes.RTC_TIMER);
   });
-  it('should handle custom dpCode', () => {
-    const customDpCode = scheduleDpCodes.RTC_TIMER;
-    renderHook(() => useTimerDp(customDpCode));
-    expect(useBaseLightDp).toHaveBeenCalledWith(customDpCode);
-  });
 });

package/lib/utils/ScheduleSupport.js

@@ -129,11 +129,11 @@ export class Support {
               // 群组中为空
               groupId && (devIdOrGroupIdCache === null || devIdOrGroupIdCache === void 0 ? void 0 : devIdOrGroupIdCache.set('', groupId));
               const dpMap = {};
-              scheduleLogger.debug(firstDevDps, hasDps, 'group and devInfo merge: firstDevDps ==== ');
-              scheduleLogger.debug(res, 'group and devInfo merge: resresres ==== ');
-              scheduleLogger.debug(groupRes, 'resresres groupRes ==== ');
-              scheduleLogger.debug(deviceInfoRes, 'resresres deviceInfoRes ==== ');
-              scheduleLogger.debug(filteredDeviceInfo, 'resresres filteredDeviceInfo ==== ');
+              scheduleLogger.debug('group and devInfo merge: firstDevDps ==== ', firstDevDps, hasDps);
+              scheduleLogger.debug('group and devInfo merge: resresres ==== ', res);
+              scheduleLogger.debug('resresres groupRes ==== ', groupRes);
+              scheduleLogger.debug('resresres deviceInfoRes ==== ', deviceInfoRes);
+              scheduleLogger.debug('resresres filteredDeviceInfo ==== ', filteredDeviceInfo);
               Object.keys(res.dps).forEach(dpId => {
                 const dpCode = getDpCodeByDpId(dpId);
                 dpCode && setDpState(dpCode, res.dps[dpId]);

package/lib/utils/__test__/ScheduleDataSync.test.d.ts

@@ -3,6 +3,7 @@ declare const mockNavigateTo: jest.Mock<any, any, any>;
 declare const mockUsePageInstance: jest.Mock<any, any, any>;
 declare const mockLogger: {
     debug: jest.Mock<any, any, any>;
+    info: jest.Mock<any, any, any>;
     error: jest.Mock<any, any, any>;
 };
 declare let navigateToSchedule: typeof import('../ScheduleDataSync').navigateToSchedule;

package/lib/utils/__test__/ScheduleDataSync.test.js

@@ -2,6 +2,7 @@ const mockNavigateTo = jest.fn();
 const mockUsePageInstance = jest.fn();
 const mockLogger = {
   debug: jest.fn(),
+  info: jest.fn(),
   error: jest.fn()
 };
 let navigateToSchedule;
@@ -21,6 +22,7 @@ describe('ScheduleDataSync utilities', () => {
     mockNavigateTo.mockReset();
     mockUsePageInstance.mockReset();
     mockLogger.debug.mockReset();
+    mockLogger.info.mockReset();
     mockLogger.error.mockReset();
     global.ty = {
       presetFunctionalData: jest.fn()

package/lib/utils/__test__/objectToId.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/__test__/objectToId.test.js

@@ -0,0 +1,98 @@
+import { objectToId } from '../objectToId';
+describe('objectToId', () => {
+  it('相同内容、不同 key 顺序的对象应得到相同 id', () => {
+    expect(objectToId({
+      z: [1, 2, 3],
+      a: 2,
+      m: 3
+    })).toBe(objectToId({
+      m: 3,
+      z: [1, 2, 3],
+      a: 2
+    }));
+  });
+  it('不同内容的对象应得到不同 id', () => {
+    expect(objectToId({
+      a: 1
+    })).not.toBe(objectToId({
+      a: 2
+    }));
+    expect(objectToId({
+      a: 1
+    })).not.toBe(objectToId({
+      b: 1
+    }));
+    expect(objectToId({})).not.toBe(objectToId({
+      a: 1
+    }));
+  });
+  it('空对象应返回稳定的 id', () => {
+    const id = objectToId({});
+    expect(typeof id).toBe('string');
+    expect(id).toMatch(/^[a-z0-9]+$/);
+    expect(objectToId({})).toBe(objectToId({}));
+  });
+  it('带 prefix 时应在 id 前拼接 prefix', () => {
+    const id = objectToId({
+      x: 1
+    });
+    const withPrefix = objectToId({
+      x: 1
+    }, 'prefix_');
+    expect(withPrefix).toBe('prefix_' + id);
+    expect(objectToId({}, 'id-')).toMatch(/^id-[a-z0-9]+$/);
+  });
+  it('嵌套对象按 key 排序后一致则 id 相同', () => {
+    expect(objectToId({
+      outer: {
+        z: 1,
+        a: 2
+      }
+    })).toBe(objectToId({
+      outer: {
+        a: 2,
+        z: 1
+      }
+    }));
+  });
+  it('数组内容与顺序会影响 id', () => {
+    expect(objectToId([1, 2])).not.toBe(objectToId([2, 1]));
+    expect(objectToId([1, 2])).toBe(objectToId([1, 2]));
+  });
+  it('返回值应为非空字符串且为 36 进制形式', () => {
+    const id = objectToId({
+      foo: 'bar'
+    });
+    expect(id.length).toBeGreaterThan(0);
+    expect(id).toMatch(/^[a-z0-9]+$/);
+  });
+  it('对 null 输入应返回稳定 id', () => {
+    const id = objectToId(null);
+    expect(typeof id).toBe('string');
+    expect(objectToId(null)).toBe(id);
+  });
+  it('对原始类型输入应返回稳定 id', () => {
+    const numId = objectToId(42);
+    const strId = objectToId('hello');
+    expect(typeof numId).toBe('string');
+    expect(typeof strId).toBe('string');
+    expect(numId).not.toBe(strId);
+  });
+  it('深层嵌套对象 key 顺序不影响 id', () => {
+    expect(objectToId({
+      a: {
+        b: {
+          c: 1,
+          d: 2
+        }
+      }
+    })).toBe(objectToId({
+      a: {
+        b: {
+          d: 2,
+          c: 1
+        }
+      }
+    }));
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-schedule-core",
-  "version": "1.0.5-beta.8",
+  "version": "1.0.5-beta.9",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [