kipphi 2.1.2-rc.1 → 2.1.2

package/env.ts

@@ -81,6 +81,7 @@ export enum ERROR_IDS {
     
 
     INVALID_NOTE_PROP_TYPE =                        NOTE       | INVALID_TYPE  | 0,
+    HOLD_HAS_NO_DURATION =                          NOTE       | INVALID_DATA  | 0,
 
 
     INVALID_TIME_TUPLE =                            TC         | INVALID_DATA  | 0,
@@ -178,6 +179,8 @@ export const ERRORS = {
         `Macro '${macroId}' is not parametric. At ${pos}`,
     EVENT_NODE_NOT_DENSE: (pos: string) =>
         `EventNode is not dense. At ${pos}`,
+    HOLD_HAS_NO_DURATION: () =>
+        `Hold should have a duration.`,
 } satisfies Record<keyof typeof ERROR_IDS, (...args: any[]) => string>
 
 type EnumKeys<E extends Record<string, string | number>> = E[keyof E];

package/index.d.ts

@@ -2217,6 +2217,7 @@ declare module "env" {
         MISSING_MACRO_EVALUATOR_KEY = 2336,
         MACRO_EVALUATOR_NOT_FOUND = 2337,
         INVALID_NOTE_PROP_TYPE = 2880,
+        HOLD_HAS_NO_DURATION = 2848,
         INVALID_TIME_TUPLE = 3104,
         TIME_MACRO_NOT_FOUND = 3360,
         VALUE_MACRO_NOT_FOUND = 3361,
@@ -2261,6 +2262,7 @@ declare module "env" {
         PARAMETRIC_MACRO_REQUIRES_PROTO_KEY: (pos: any) => string;
         MACRO_NOT_PARAMETRIC: (macroId: string, pos: any) => string;
         EVENT_NODE_NOT_DENSE: (pos: string) => string;
+        HOLD_HAS_NO_DURATION: () => string;
     };
     interface ErrorMap extends Record<keyof typeof ERROR_IDS, Array<any>> {
         EVENT_NODE_NOT_DENSE: [EventNode];
@@ -2325,6 +2327,7 @@ declare module "env" {
             PARAMETRIC_MACRO_REQUIRES_PROTO_KEY: (pos: any) => KPAError<ERROR_IDS.PARAMETRIC_MACRO_REQUIRES_PROTO_KEY>;
             MACRO_NOT_PARAMETRIC: (macroId: string, pos: any) => KPAError<ERROR_IDS.MACRO_NOT_PARAMETRIC>;
             EVENT_NODE_NOT_DENSE: (pos: string) => KPAError<ERROR_IDS.EVENT_NODE_NOT_DENSE>;
+            HOLD_HAS_NO_DURATION: () => KPAError<ERROR_IDS.HOLD_HAS_NO_DURATION>;
         };
         freeze(): void;
     };
@@ -2437,6 +2440,7 @@ declare module "operation/basic" {
         undo(): void;
         redo(): void;
         do(operation: Operation): void;
+        tryDo(returnOperation: () => Operation): void;
         processFlags(operation: Operation): void;
         clear(): void;
         addEventListener<T extends OpEventType>(type: T, listener: (event: OpEventMap[T]) => void, options?: boolean | AddEventListenerOptions): void;
@@ -2532,8 +2536,8 @@ declare module "operation/event" {
          * @param targetPrevious 要插在谁后面 The node to insert after, accessed through `EventNodeSequence.getNodeAt(TC.toBeats(node))`
          */
         constructor(node: EventStartNode<VT>, targetPrevious: EventStartNode<VT>, updatesFP?: boolean);
-        do(): void;
-        undo(): void;
+        do(chart: Chart): void;
+        undo(chart: Chart): void;
     }
     export class EventNodePairInsertOrOverwriteOperation<VT extends EventValueESType> extends UnionOperation<LazyOperation<typeof EventNodePairInsertOperation<VT>> | EventNodeValueChangeOperation<VT>> {
         overlapping: boolean;

package/index.js

@@ -81,6 +81,7 @@ var ERROR_IDS;
   ERROR_IDS2[ERROR_IDS2["MISSING_MACRO_EVALUATOR_KEY"] = EVALUATOR | INVALID_DATA | 0] = "MISSING_MACRO_EVALUATOR_KEY";
   ERROR_IDS2[ERROR_IDS2["MACRO_EVALUATOR_NOT_FOUND"] = EVALUATOR | INVALID_DATA | 1] = "MACRO_EVALUATOR_NOT_FOUND";
   ERROR_IDS2[ERROR_IDS2["INVALID_NOTE_PROP_TYPE"] = NOTE | INVALID_TYPE | 0] = "INVALID_NOTE_PROP_TYPE";
+  ERROR_IDS2[ERROR_IDS2["HOLD_HAS_NO_DURATION"] = NOTE | INVALID_DATA | 0] = "HOLD_HAS_NO_DURATION";
   ERROR_IDS2[ERROR_IDS2["INVALID_TIME_TUPLE"] = TC | INVALID_DATA | 0] = "INVALID_TIME_TUPLE";
   ERROR_IDS2[ERROR_IDS2["TIME_MACRO_NOT_FOUND"] = MACRO | INVALID_DATA | 0] = "TIME_MACRO_NOT_FOUND";
   ERROR_IDS2[ERROR_IDS2["VALUE_MACRO_NOT_FOUND"] = MACRO | INVALID_DATA | 1] = "VALUE_MACRO_NOT_FOUND";
@@ -124,7 +125,8 @@ var ERRORS = {
   JAVASCRIPT_SYNTAX_ERROR: (error, macroId) => `JavaScript Syntax Error: ${error.message}. At ${macroId}`,
   PARAMETRIC_MACRO_REQUIRES_PROTO_KEY: (pos) => `Parametric Macro requires key. At ${pos}`,
   MACRO_NOT_PARAMETRIC: (macroId, pos) => `Macro '${macroId}' is not parametric. At ${pos}`,
-  EVENT_NODE_NOT_DENSE: (pos) => `EventNode is not dense. At ${pos}`
+  EVENT_NODE_NOT_DENSE: (pos) => `EventNode is not dense. At ${pos}`,
+  HOLD_HAS_NO_DURATION: () => `Hold should have a duration.`
 };
 
 class KPAError extends Error {
@@ -3850,6 +3852,16 @@ class OperationList extends EventTarget {
     this.dispatchEvent(new OperationEvent("do", operation));
     this.processFlags(operation);
   }
+  tryDo(returnOperation) {
+    let op;
+    try {
+      op = returnOperation();
+    } catch (e) {
+      this.dispatchEvent(new OperationErrorEvent(op, e));
+      return;
+    }
+    this.do(op);
+  }
   processFlags(operation) {
     if (operation.updatesEditor) {
       this.dispatchEvent(new OperationEvent("needsupdate", operation));
@@ -4013,12 +4025,18 @@ class EventNodePairInsertOperation extends Operation {
     }
     this.updatesFP = updatesFP && targetPrevious.isSpeed();
   }
-  do() {
+  do(chart) {
     const [endNode, startNode] = EventNode.insert(this.node, this.tarPrev);
     this.node.parentSeq.updateJump(endNode, startNode);
+    if (this.updatesFP) {
+      this.sequence.updateFloorPositionAfter(this.tarPrev, chart.timeCalculator);
+    }
   }
-  undo() {
+  undo(chart) {
     this.sequence.updateJump(...EventNode.removeNodePair(...EventNode.getEndStart(this.node)));
+    if (this.updatesFP) {
+      this.sequence.updateFloorPositionAfter(this.tarPrev, chart.timeCalculator);
+    }
   }
 }
 
@@ -4504,6 +4522,11 @@ class NoteAddOperation extends Operation {
     super();
     this.note = note;
     this.isHold = note.type === 2 /* hold */;
+    if (this.isHold) {
+      if (TC2.lt(note.endTime, note.startTime)) {
+        throw err.HOLD_HAS_NO_DURATION();
+      }
+    }
     this.noteNode = node;
     this.comboDelta = note.isFake ? 0 : 1;
   }

package/operation/basic.ts

@@ -152,6 +152,16 @@ export class OperationList extends EventTarget {
         this.dispatchEvent(new OperationEvent("do", operation));
         this.processFlags(operation);
     }
+    tryDo(returnOperation: () => Operation) {
+        let op: Operation;
+        try {
+            op = returnOperation();
+        } catch (e) {
+            this.dispatchEvent(new OperationErrorEvent(op, e as Error))
+            return
+        }
+        this.do(op);
+    } 
     processFlags(operation: Operation) {
 
         if (operation.updatesEditor) {

package/operation/event.ts

@@ -81,12 +81,20 @@ export class EventNodePairInsertOperation <VT extends EventValueESType> extends
         }
         this.updatesFP = updatesFP && targetPrevious.isSpeed();
     }
-    do() {
+    do(chart: Chart) {
         const [endNode, startNode] = EventNode.insert(this.node, this.tarPrev);
         this.node.parentSeq.updateJump(endNode, startNode)
+        if (this.updatesFP) {
+            // updatesFP的校验确保了序列为速度序列
+            (this.sequence as SpeedENS).updateFloorPositionAfter(this.tarPrev as EventStartNode, chart.timeCalculator) 
+        }
     }
-    undo() {
+    undo(chart: Chart) {
         this.sequence.updateJump(...EventNode.removeNodePair(...EventNode.getEndStart(this.node)))
+        if (this.updatesFP) {
+            // updatesFP的校验确保了序列为速度序列
+            (this.sequence as SpeedENS).updateFloorPositionAfter(this.tarPrev as EventStartNode, chart.timeCalculator) 
+        }
     }
 }
 

package/operation/note.ts

@@ -140,6 +140,11 @@ export class NoteAddOperation extends Operation {
         super()
         this.note = note;
         this.isHold = note.type === NoteType.hold;
+        if (this.isHold) {
+            if (TC.lt(note.endTime, note.startTime)) {
+                throw err.HOLD_HAS_NO_DURATION();
+            }
+        }
         this.noteNode = node;
         // 一般来说，操作是对于在谱里面的NoteNode，谱外面的不需要操作
         this.comboDelta = note.isFake ? 0 : +1;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kipphi",
     "description": "Parse your Phigros Chart(.rpe.json or .kpa.json) into an editor-friendly format.",
-    "version": "2.1.2-rc.1",
+    "version": "2.1.2",
     "author": "Team Zincs (https://github.com/TeamZincs)",
     "license": "MIT",
     "repository": {

package/line.ts

@@ -1,246 +0,0 @@
-import { Chart, JudgeLineGroup, BasicEventName, UIName } from "../chart";
-import { ExtendedEventTypeName, RGB } from "../chartTypes";
-import { EventNodeSequence } from "../event";
-import { JudgeLine, ExtendedLayer } from "../judgeline";
-import { Operation } from "./basic";
-
-
-
-// 有点怪异，感觉破坏了纯净性。不管了（
-enum JudgeLinesEditorLayoutType {
-    ordered = 0b001,
-    tree    = 0b010,
-    grouped = 0b100
-}
-
-
-export class JudgeLineInheritanceChangeOperation extends Operation {
-    originalValue: JudgeLine | null;
-    updatesEditor = true;
-    static REFLOWS = JudgeLinesEditorLayoutType.tree;
-    reflows = JudgeLineInheritanceChangeOperation.REFLOWS;
-    constructor(public chart: Chart, public judgeLine: JudgeLine, public value: JudgeLine | null) {
-        super();
-        this.originalValue = judgeLine.father;
-        // 这里只会让它静默失败，外面调用的时候能够在判断一次并抛错误才是最好的
-        if (JudgeLine.checkinterdependency(judgeLine, value)) {
-            this.ineffective = true;
-        }
-    }
-    do() {
-        const line = this.judgeLine;
-        line.father = this.value;
-        if (this.originalValue) {
-            this.originalValue.children.delete(line);
-        } else {
-            const index = this.chart.orphanLines.indexOf(line);
-            if (index >= 0) // Impossible to be false, theoretically
-                this.chart.orphanLines.splice(index, 1)
-        }
-        if (this.value) {
-            this.value.children.add(line);
-        } else {
-            this.chart.orphanLines.push(line);
-        }
-    }
-    undo() {
-        const line = this.judgeLine;
-        line.father = this.originalValue;
-        if (this.originalValue) {
-            this.originalValue.children.add(line);
-        } else {
-            this.chart.orphanLines.push(line);
-        }
-        if (this.value) {
-            this.value.children.delete(line);
-        } else {
-            const index = this.chart.orphanLines.indexOf(line);
-            if (index >= 0) // Impossible to be false, theoretically
-                this.chart.orphanLines.splice(index, 1)
-        }
-    }
-}
-
-export class JudgeLineRenameOperation extends Operation { 
-    updatesEditor = true;
-    originalValue: string;
-    constructor(public judgeLine: JudgeLine, public value: string) {
-        super();
-        this.originalValue = judgeLine.name;
-    }
-    do() {
-        this.judgeLine.name = this.value;
-    }
-    undo() {
-        this.judgeLine.name = this.originalValue;
-    }
-}
-
-type JudgeLinePropName = "name" | "rotatesWithFather" | "anchor" | "texture" | "cover" | "zOrder";
-
-export class JudgeLinePropChangeOperation<T extends JudgeLinePropName> extends Operation {
-    updatesEditor = true;
-    originalValue: JudgeLine[T];
-    constructor(public judgeLine: JudgeLine, public field: T, public value: JudgeLine[T]) {
-        super();
-        this.originalValue = judgeLine[field];
-    }
-    do() {
-        this.judgeLine[this.field] = this.value;
-    }
-    undo() {
-        this.judgeLine[this.field] = this.originalValue;
-    }
-}
-
-export class JudgeLineRegroupOperation extends Operation {
-    updatesEditor = true;
-    reflows = JudgeLinesEditorLayoutType.grouped;
-    originalValue: JudgeLineGroup;
-    constructor(public judgeLine: JudgeLine, public value: JudgeLineGroup) {
-        super();
-        this.originalValue = judgeLine.group;
-    }
-    do() {
-        this.judgeLine.group = this.value;
-        this.value.add(this.judgeLine);
-        this.originalValue.remove(this.judgeLine);
-    }
-    undo() {
-        this.judgeLine.group = this.originalValue;
-        this.originalValue.add(this.judgeLine);
-        this.value.remove(this.judgeLine);
-    }
-}
-
-export class JudgeLineCreateOperation extends Operation {
-    reflows = JudgeLinesEditorLayoutType.grouped | JudgeLinesEditorLayoutType.tree | JudgeLinesEditorLayoutType.ordered;
-    // 之前把=写成了:半天不知道咋错了
-    constructor(public chart: Chart, public judgeLine: JudgeLine) {
-        super();
-    }
-    do() {
-        const id = this.chart.judgeLines.length;
-        this.judgeLine.id = id;
-        this.chart.judgeLines.push(this.judgeLine);
-        this.chart.orphanLines.push(this.judgeLine);
-        this.chart.judgeLineGroups[0].add(this.judgeLine);
-    }
-    undo() {
-        this.chart.judgeLineGroups[0].remove(this.judgeLine);
-        this.chart.judgeLines.splice(this.chart.judgeLines.indexOf(this.judgeLine), 1);
-        this.chart.orphanLines.splice(this.chart.orphanLines.indexOf(this.judgeLine), 1);
-    }
-}
-
-export class JudgeLineDeleteOperation extends Operation {
-    readonly originalGroup: JudgeLineGroup;
-    constructor(public chart: Chart, public judgeLine: JudgeLine) {
-        super();
-        if (!this.chart.judgeLines.includes(this.judgeLine)) {
-            this.ineffective = true;
-        }
-        this.originalGroup = judgeLine.group;
-    }
-    do() {
-        this.chart.judgeLines.splice(this.chart.judgeLines.indexOf(this.judgeLine), 1);
-        if (this.chart.orphanLines.includes(this.judgeLine)) {
-            this.chart.orphanLines.splice(this.chart.orphanLines.indexOf(this.judgeLine), 1);
-        }
-        this.originalGroup.remove(this.judgeLine);
-    }
-    undo() {
-        this.chart.judgeLines.push(this.judgeLine);
-        this.chart.orphanLines.push(this.judgeLine);
-        this.originalGroup.add(this.judgeLine);
-    }
-}
-
-
-
-export class JudgeLineENSChangeOperation extends Operation {
-    originalValue: EventNodeSequence;
-    constructor(public judgeLine: JudgeLine, public layerId: number, public typeStr: BasicEventName, public value: EventNodeSequence) {
-        super();
-        this.originalValue = judgeLine.eventLayers[layerId][typeStr];
-    }
-    do() {
-        this.judgeLine.eventLayers[this.layerId][this.typeStr] = this.value;
-    }
-    undo() {
-        this.judgeLine.eventLayers[this.layerId][this.typeStr] = this.originalValue;
-    }
-}
-
-
-export type ENSOfTypeName<T extends ExtendedEventTypeName> = {
-    "scaleX": EventNodeSequence<number>,
-    "scaleY": EventNodeSequence<number>
-    "text": EventNodeSequence<string>,
-    "color": EventNodeSequence<RGB> 
-}[T]
-export class JudgeLineExtendENSChangeOperation<T extends ExtendedEventTypeName> extends Operation {
-    originalValue: ENSOfTypeName<T>;
-    constructor(public judgeLine: JudgeLine, public typeStr: T, public value: ENSOfTypeName<T> | null) {
-        super();
-        this.originalValue = judgeLine.extendedLayer[typeStr satisfies keyof ExtendedLayer] as ENSOfTypeName<T>;
-    }
-    do() {
-        this.judgeLine.extendedLayer[this.typeStr] = this.value
-    }
-    undo() {
-        this.judgeLine.extendedLayer[this.typeStr] = this.originalValue
-    }
-
-}
-
-export class UIAttachOperation extends Operation {
-    updatesEditor = true;
-    constructor(public chart: Chart, public judgeLine: JudgeLine, public ui: UIName) {
-        super();
-    }
-    do() {
-        this.chart.attachUIToLine(this.ui, this.judgeLine);
-    }
-    undo() {
-        this.chart.detachUI(this.ui);
-    }
-}
-
-export class UIDetachOperation extends Operation {
-    updatesEditor = true;
-    judgeLine: JudgeLine;
-    constructor(public chart: Chart, public ui: UIName) {
-        super();
-        if (chart[`${ui}Attach` satisfies keyof Chart]) {
-            this.judgeLine = chart[`${ui}Attach` satisfies keyof Chart];
-        } else {
-            this.ineffective = true;
-        }
-    }
-    do() {
-        this.chart.detachUI(this.ui);
-    }
-    undo() {
-        this.chart.attachUIToLine(this.ui, this.judgeLine);
-    }
-}
-
-export class JudgeLineDetachAllUIOperation extends Operation {
-    updatesEditor = true;
-    uinames: UIName[];
-    constructor(public chart: Chart, public judgeLine: JudgeLine) {
-        super();
-        this.uinames = chart.queryJudgeLineUI(this.judgeLine);
-    }
-    do() {
-        for (const ui of this.uinames) {
-            this.chart.detachUI(ui);
-        }
-    }
-    undo() {
-        for (const ui of this.uinames) {
-            this.chart.attachUIToLine(ui, this.judgeLine);
-        }
-    }
-}