sonolus-next-rush-engine 1.4.0-beta.v5 → 1.4.0-beta.v6

package/dist/extended/convert.js

@@ -97,6 +97,8 @@ const guideKindMapping = {
 class ExtData {
     constructor(entities) {
         this.byArch = new Map();
+        this.byName = new Map();
+        this.indexByEntity = new Map();
         this.notes = [];
         this.connectors = [];
         this.entities = entities;
@@ -105,6 +107,10 @@ class ExtData {
             if (!this.byArch.has(arch))
                 this.byArch.set(arch, []);
             this.byArch.get(arch)?.push({ idx, e });
+            if (e.name !== undefined && !this.byName.has(e.name))
+                this.byName.set(e.name, e);
+            if (!this.indexByEntity.has(e))
+                this.indexByEntity.set(e, idx);
             if (arch in noteTypeMapping)
                 this.notes.push({ idx, e });
             if (arch in activeConnectorKindMapping)
@@ -183,11 +189,31 @@ function resolveOriginal(ext, ref) {
     if (typeof ref === 'number')
         return ext.get(ref);
     if (typeof ref === 'string')
-        return ext.entities.find((x) => x.name === ref);
+        return ext.byName.get(ref);
     return undefined;
 }
 export const extendedToLevelData = (data, offset = 0) => {
     const ext = new ExtData(data.entities);
+    const connectorsByHeadRef = new Map();
+    const connectorsByTailRef = new Map();
+    const connectorsByStartRef = new Map();
+    const pushConnectorIndex = (map, key, entry) => {
+        if (key === undefined)
+            return;
+        const list = map.get(key);
+        if (list)
+            list.push(entry);
+        else
+            map.set(key, [entry]);
+    };
+    for (const entry of ext.connectors) {
+        pushConnectorIndex(connectorsByHeadRef, getField(entry.e, 'head'), entry);
+        pushConnectorIndex(connectorsByTailRef, getField(entry.e, 'tail'), entry);
+        pushConnectorIndex(connectorsByStartRef, getField(entry.e, 'start'), entry);
+    }
+    const getConnectorsByHeadRef = (ref) => ref === undefined ? [] : (connectorsByHeadRef.get(ref) ?? []);
+    const getConnectorsByTailRef = (ref) => ref === undefined ? [] : (connectorsByTailRef.get(ref) ?? []);
+    const getConnectorsByStartRef = (ref) => ref === undefined ? [] : (connectorsByStartRef.get(ref) ?? []);
     const finalEntities = [];
     const defaultTsg = new EntityBuilder('#TIMESCALE_GROUP');
     finalEntities.push(defaultTsg);
@@ -491,11 +517,10 @@ export const extendedToLevelData = (data, offset = 0) => {
             if (headRef === undefined || visited.has(key))
                 return;
             visited.add(key);
-            const nextConnectors = ext.connectors.filter((c) => c.e.archetype === archetype &&
-                getField(c.e, 'head') === headRef &&
-                getField(c.e, 'start') === startRef);
+            const headConnectors = getConnectorsByHeadRef(headRef);
+            const nextConnectors = headConnectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'start') === startRef);
             if (nextConnectors.length === 0) {
-                nextConnectors.push(...ext.connectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'head') === headRef));
+                nextConnectors.push(...headConnectors.filter((c) => c.e.archetype === archetype));
             }
             if (nextConnectors.length === 0) {
                 const beat = getNum(resolveOriginal(ext, headRef) ?? { archetype: '', data: [] }, '#BEAT');
@@ -511,11 +536,9 @@ export const extendedToLevelData = (data, offset = 0) => {
         }
         visit(tailRef);
         if (isScoredSlideTickRef(ultimateTailRef)) {
-            for (const connector of ext.connectors) {
+            for (const connector of getConnectorsByStartRef(startRef)) {
                 if (connector.e.archetype !== archetype)
                     continue;
-                if (getField(connector.e, 'start') !== startRef)
-                    continue;
                 const candidateTailRef = getField(connector.e, 'tail');
                 const candidateTailBeat = getNum(resolveOriginal(ext, candidateTailRef) ?? { archetype: '', data: [] }, '#BEAT');
                 if (candidateTailBeat > ultimateTailBeat) {
@@ -538,10 +561,10 @@ export const extendedToLevelData = (data, offset = 0) => {
             visited.add(key);
             if (!isSlideTickRef(currentHeadRef))
                 return;
-            let previousConnectors = ext.connectors.filter((c) => c.e.archetype === archetype && getField(c.e, 'tail') === currentHeadRef);
+            const tailConnectors = getConnectorsByTailRef(currentHeadRef);
+            let previousConnectors = tailConnectors.filter((c) => c.e.archetype === archetype);
             if (previousConnectors.length === 0) {
-                previousConnectors = ext.connectors.filter((c) => c.e.archetype in activeConnectorKindMapping &&
-                    getField(c.e, 'tail') === currentHeadRef);
+                previousConnectors = tailConnectors.filter((c) => c.e.archetype in activeConnectorKindMapping);
             }
             for (const previousConnector of previousConnectors) {
                 const previousStartRef = getField(previousConnector.e, 'start');
@@ -561,10 +584,8 @@ export const extendedToLevelData = (data, offset = 0) => {
         return resolveOriginal(ext, ref)?.archetype === 'IgnoredSlideTickNote';
     }
     function getNextConnectorWithHead(archetype, startRef, headRef) {
-        return (ext.connectors.find(({ e }) => e.archetype === archetype &&
-            getField(e, 'start') === startRef &&
-            getField(e, 'head') === headRef) ??
-            ext.connectors.find(({ e }) => e.archetype === archetype && getField(e, 'head') === headRef));
+        const headConnectors = getConnectorsByHeadRef(headRef);
+        return (headConnectors.find(({ e }) => e.archetype === archetype && getField(e, 'start') === startRef) ?? headConnectors.find(({ e }) => e.archetype === archetype));
     }
     function resolveConnectorTailRef(archetype, startRef, tailRef) {
         const skippedNoteRefs = [];
@@ -589,7 +610,7 @@ export const extendedToLevelData = (data, offset = 0) => {
     }
     function refKey(ref) {
         const original = resolveOriginal(ext, ref);
-        const index = original ? ext.entities.indexOf(original) : -1;
+        const index = original ? (ext.indexByEntity.get(original) ?? -1) : -1;
         return index >= 0 ? `index:${index}` : `${typeof ref}:${String(ref)}`;
     }
     function getRefBeat(ref) {

package/dist/index.d.ts

@@ -7,7 +7,7 @@ import { USC } from './usc/index.js';
 export * from './usc/index.js';
 export { type ExtendedEntityData, type ExtendedEntityDataField, extendedToLevelData, mmwsToUSC, susToUSC, ucmmwsToLevelData, uscToLevelData, };
 export declare const convertToLevelData: (input: string | Uint8Array | USC | LevelData, offset?: number) => LevelData;
-export declare const version = "1.4.0-beta.v5";
+export declare const version = "1.4.0-beta.v6";
 export declare const databaseEngineItem: {
     readonly name: "next-rush";
     readonly version: 13;

package/dist/index.js

@@ -65,7 +65,7 @@ export const convertToLevelData = (input, offset = 0) => {
     }
     return uscToLevelData(usc, offset, true, true);
 };
-export const version = '1.4.0-beta.v5';
+export const version = '1.4.0-beta.v6';
 export const databaseEngineItem = {
     name: 'next-rush',
     version: 13,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonolus-next-rush-engine",
-  "version": "1.4.0-beta.v5",
+  "version": "1.4.0-beta.v6",
   "description": "Perspective-lane rhythm game for Sonolus",
   "author": "Hyeon2",
   "repository": {