sonolus-d4dj-engine 1.4.6 → 1.5.1

package/dist/b34dj/{convert.d.cts → convert.d.ts}

@@ -1,4 +1,4 @@
 import { LevelData } from '@sonolus/core';
-import { B34DJChart } from './index.cjs';
+import { B34DJChart } from './index.js';
 export declare function b34djToLevelData(chart: B34DJChart, offset?: number): LevelData;
 export declare function d4djToLevelData(chart: any, offset?: number): LevelData;

package/dist/b34dj/{convert.cjs → convert.js}

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.d4djToLevelData = exports.b34djToLevelData = void 0;
-const index_cjs_1 = require("./index.cjs");
-function b34djToLevelData(chart, offset = 0) {
+import { D4DJNoteType } from './index.js';
+export function b34djToLevelData(chart, offset = 0) {
     let d4chart = [];
     d4chart[0] = chart.MusicName;
     d4chart[1] = [];
     d4chart[2] = chart.BarLineList;
-    d4chart[3] = chart.NoteDataList.map((note) => [note.LaneId, index_cjs_1.D4DJNoteType[note.Type], note.Time, note.NextId, note.Direction, note.EffectType, note.EffectParameter]);
+    d4chart[3] = chart.NoteDataList.map((note) => [note.LaneId, D4DJNoteType[note.Type], note.Time, note.NextId, note.Direction, note.EffectType, note.EffectParameter]);
     const timescale = chart.SoflanDataList.map((soflan) => [soflan.Time, soflan.TimeScale, soflan.LeftRight]);
     timescale.forEach((ts) => {
         const i = d4chart[1].findIndex((tsc) => (tsc[0] === ts[0]) && (tsc[1] === ts[1]));
@@ -18,9 +15,8 @@ function b34djToLevelData(chart, offset = 0) {
     });
     return d4djToLevelData(d4chart, offset);
 }
-exports.b34djToLevelData = b34djToLevelData;
 ;
-function d4djToLevelData(chart, offset = 0) {
+export function d4djToLevelData(chart, offset = 0) {
     let disc = {
         left: chart[1].filter((soflan) => [1, 3].includes(soflan[2])),
         right: chart[1].filter((soflan) => [2, 3].includes(soflan[2]))
@@ -308,14 +304,9 @@ function d4djToLevelData(chart, offset = 0) {
         ],
     }));
     let notes = note(chart);
-    const sd = Array.from({ length: (Math.max(chart[3][chart[3].length - 1][2], chart[2][chart[2].length - 1]) + offset + 5) * 120 / 16 }, (_, index) => ({
-        archetype: 'SliderData',
-        data: [],
-    }));
-    data.entities.push(...ts, ...discL, ...discR, ...notes, ...bl, ...sd);
+    data.entities.push(...ts, ...discL, ...discR, ...notes, ...bl);
     return data;
 }
-exports.d4djToLevelData = d4djToLevelData;
 function note(chart) {
     let hold = [];
     let slider = [];

package/dist/b34dj/{index.cjs → index.js}

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.D4DJNoteType = exports.B34DJNoteType = void 0;
-var B34DJNoteType;
+export var B34DJNoteType;
 (function (B34DJNoteType) {
     B34DJNoteType["Tap1"] = "Tap1";
     B34DJNoteType["Tap2"] = "Tap2";
@@ -13,8 +10,8 @@ var B34DJNoteType;
     B34DJNoteType["LongMiddle"] = "LongMiddle";
     B34DJNoteType["LongEnd"] = "LongEnd";
     B34DJNoteType["Slide"] = "Slide";
-})(B34DJNoteType || (exports.B34DJNoteType = B34DJNoteType = {}));
-var D4DJNoteType;
+})(B34DJNoteType || (B34DJNoteType = {}));
+export var D4DJNoteType;
 (function (D4DJNoteType) {
     D4DJNoteType[D4DJNoteType["Tap1"] = 0] = "Tap1";
     D4DJNoteType[D4DJNoteType["Tap2"] = 1] = "Tap2";
@@ -26,4 +23,4 @@ var D4DJNoteType;
     D4DJNoteType[D4DJNoteType["LongMiddle"] = 7] = "LongMiddle";
     D4DJNoteType[D4DJNoteType["LongEnd"] = 8] = "LongEnd";
     D4DJNoteType[D4DJNoteType["Slide"] = 9] = "Slide";
-})(D4DJNoteType || (exports.D4DJNoteType = D4DJNoteType = {}));
+})(D4DJNoteType || (D4DJNoteType = {}));

package/dist/d4c/{convert.d.cts → convert.d.ts}

@@ -1,3 +1,3 @@
 import { LevelData } from '@sonolus/core';
-import { D4CChartData } from './index.cjs';
+import { D4CChartData } from './index.js';
 export declare function d4cToLevelData(chart: D4CChartData, offset?: number): LevelData;

package/dist/d4c/{convert.cjs → convert.js}

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.d4cToLevelData = void 0;
-const index_cjs_1 = require("./index.cjs");
-function d4cToLevelData(chart, offset = 0) {
+import { D4CNoteType } from './index.js';
+export function d4cToLevelData(chart, offset = 0) {
     // let d4chart: any = []
     // d4chart[0] = chart.MusicName
     // d4chart[1] = []
@@ -119,39 +116,30 @@ function d4cToLevelData(chart, offset = 0) {
         ],
     }));
     let notes = note(chart);
-    const lastNoteBeat = chart.NoteDataList[chart.NoteDataList.length - 1].Beat;
-    let lastBlBeat = chart.BarLine.List[chart.BarLine.List.length - 1];
-    lastBlBeat = typeof lastBlBeat === "number" ? lastBlBeat : lastBlBeat.Beat;
-    const end = chart.BpmDataList.map((data, i, arr) => 60 / data.Bpm * ((i < arr.length - 1 ? arr[i + 1].Beat : Math.max(lastNoteBeat, lastBlBeat)) - data.Beat)).reduce((a, b) => a + b) + chart.Offset + offset + 5;
-    const sd = Array.from({ length: end * 120 / 16 }, (_, index) => ({
-        archetype: 'SliderData',
-        data: [],
-    }));
-    data.entities.push(...bpm, ...ts.flat(), ...notes, ...bl, ...sd);
+    data.entities.push(...bpm, ...ts.flat(), ...notes, ...bl);
     return data;
 }
-exports.d4cToLevelData = d4cToLevelData;
 function note(chart) {
     let hold = [];
     let slider = [];
     let notes = {};
     let nots = chart.NoteDataList.map(({ Beat, Type, LaneId, NextId, Direction, EffectType, EffectParameter, TimeScaleGroupId }, i) => {
         const not = {
-            archetype: Type === index_cjs_1.D4CNoteType.Tap1
+            archetype: Type === D4CNoteType.Tap1
                 ? "DarkTapNote"
-                : Type === index_cjs_1.D4CNoteType.Tap2
+                : Type === D4CNoteType.Tap2
                     ? "LightTapNote"
-                    : Type === index_cjs_1.D4CNoteType.Scratch
+                    : Type === D4CNoteType.Scratch
                         ? "ScratchNote"
-                        : Type === index_cjs_1.D4CNoteType.StopStart
+                        : Type === D4CNoteType.StopStart
                             ? "StopStartNote"
-                            : Type === index_cjs_1.D4CNoteType.StopEnd
+                            : Type === D4CNoteType.StopEnd
                                 ? "StopEndNote"
-                                : Type === index_cjs_1.D4CNoteType.LongStart
+                                : Type === D4CNoteType.LongStart
                                     ? "HoldStartNote"
-                                    : Type === index_cjs_1.D4CNoteType.LongEnd
+                                    : Type === D4CNoteType.LongEnd
                                         ? "HoldEndNote"
-                                        : Type === index_cjs_1.D4CNoteType.LongMiddle
+                                        : Type === D4CNoteType.LongMiddle
                                             ? "HoldMiddleNote"
                                             : Direction !== 0
                                                 ? "SliderFlickNote"
@@ -175,7 +163,7 @@ function note(chart) {
         notes[Beat]
             ? notes[Beat].push({ name: `note${i}`, lane: LaneId })
             : (notes[Beat] = [{ name: `note${i}`, lane: LaneId }]);
-        if (NextId && (Type === index_cjs_1.D4CNoteType.LongStart || Type === index_cjs_1.D4CNoteType.StopStart)) {
+        if (NextId && (Type === D4CNoteType.LongStart || Type === D4CNoteType.StopStart)) {
             let note = {};
             note.head = not.name;
             note.tail = `note${NextId}`;
@@ -185,7 +173,7 @@ function note(chart) {
                 ref: `note${NextId}`,
             });
         }
-        if (Type === index_cjs_1.D4CNoteType.Slide) {
+        if (Type === D4CNoteType.Slide) {
             if (NextId && NextId > 0) {
                 slider.push({ prev: not.name, next: `note${NextId}` });
                 not.data.push({
@@ -200,7 +188,7 @@ function note(chart) {
                     ref: sld.prev,
                 });
         }
-        if (Type === index_cjs_1.D4CNoteType.LongEnd || Type === index_cjs_1.D4CNoteType.StopEnd) {
+        if (Type === D4CNoteType.LongEnd || Type === D4CNoteType.StopEnd) {
             not.data.push({
                 name: "head",
                 ref: hold.find((note) => note.tail === not.name).head,

package/dist/d4c/{index.cjs → index.js}

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.D4CNoteType = void 0;
-var D4CNoteType;
+export var D4CNoteType;
 (function (D4CNoteType) {
     D4CNoteType["Tap1"] = "Tap1";
     D4CNoteType["Tap2"] = "Tap2";
@@ -12,4 +9,4 @@ var D4CNoteType;
     D4CNoteType["LongMiddle"] = "LongMiddle";
     D4CNoteType["LongEnd"] = "LongEnd";
     D4CNoteType["Slide"] = "Slide";
-})(D4CNoteType || (exports.D4CNoteType = D4CNoteType = {}));
+})(D4CNoteType || (D4CNoteType = {}));

package/dist/{index.d.cts → index.d.ts}

@@ -1,8 +1,8 @@
-export { b34djToLevelData, d4djToLevelData } from './b34dj/convert.cjs';
-export { d4cToLevelData } from './d4c/convert.cjs';
-export * from './b34dj/index.cjs';
-export * from './d4c/index.cjs';
-export declare const version = "1.4.6";
+export { b34djToLevelData, d4djToLevelData } from './b34dj/convert.js';
+export { d4cToLevelData } from './d4c/convert.js';
+export * from './b34dj/index.js';
+export * from './d4c/index.js';
+export declare const version = "1.5.1";
 export declare const databaseEngineItem: {
     readonly name: "d4dj";
     readonly version: 13;

package/dist/index.js

@@ -0,0 +1,30 @@
+export { b34djToLevelData, d4djToLevelData } from './b34dj/convert.js';
+export { d4cToLevelData } from './d4c/convert.js';
+export * from './b34dj/index.js';
+export * from './d4c/index.js';
+export const version = '1.5.1';
+export const databaseEngineItem = {
+    name: 'd4dj',
+    version: 13,
+    title: {
+        en: 'D4DJ'
+    },
+    subtitle: {
+        en: 'D4DJ Groovy Mix',
+        ja: 'D4DJグルミク',
+    },
+    author: {
+        en: 'Gorengan Hunter#329978',
+    },
+    description: {
+        en: [
+            'A recreation of D4DJ Groovy Mix engine in Sonolus.',
+            '',
+            'Version:',
+            version,
+            '',
+            'GitHub Repository:',
+            'https://github.com/gorenganhunter/sonolus-d4dj-engine',
+        ].join('\n'),
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonolus-d4dj-engine",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "description": "A recreation of D4DJ Groovy Mix engine in Sonolus.",
   "type": "module",
   "author": "Gorengan Hunter",
@@ -14,7 +14,7 @@
     "dist"
   ],
   "exports": {
-    ".": "./dist/index.cjs",
+    ".": "./dist/index.js",
     "./EngineConfiguration": "./dist/EngineConfiguration",
     "./EnginePlayData": "./dist/EnginePlayData",
     "./EngineWatchData": "./dist/EngineWatchData",
@@ -33,12 +33,11 @@
     "build": "tsc -p ./lib && sonolus-cli --build ./play && sonolus-cli --build ./watch && sonolus-cli --build ./preview && sonolus-cli --build ./tutorial && node ./lib/build.mjs"
   },
   "dependencies": {
-    "@sonolus/core": "^7.13.2",
-    "@sonolus/express": "^7.3.2"
+    "@sonolus/core": "^7.14.0"
   },
   "devDependencies": {
     "@eslint/js": "^8.57.0",
-    "@sonolus/sonolus.js": "^9.5.6",
+    "@sonolus/sonolus.js": "^9.6.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "prettier": "^3.3.1",

package/dist/index.cjs

@@ -1,50 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.databaseEngineItem = exports.version = exports.d4cToLevelData = exports.d4djToLevelData = exports.b34djToLevelData = void 0;
-var convert_cjs_1 = require("./b34dj/convert.cjs");
-Object.defineProperty(exports, "b34djToLevelData", { enumerable: true, get: function () { return convert_cjs_1.b34djToLevelData; } });
-Object.defineProperty(exports, "d4djToLevelData", { enumerable: true, get: function () { return convert_cjs_1.d4djToLevelData; } });
-var convert_cjs_2 = require("./d4c/convert.cjs");
-Object.defineProperty(exports, "d4cToLevelData", { enumerable: true, get: function () { return convert_cjs_2.d4cToLevelData; } });
-__exportStar(require("./b34dj/index.cjs"), exports);
-__exportStar(require("./d4c/index.cjs"), exports);
-exports.version = '1.4.6';
-exports.databaseEngineItem = {
-    name: 'd4dj',
-    version: 13,
-    title: {
-        en: 'D4DJ'
-    },
-    subtitle: {
-        en: 'D4DJ Groovy Mix',
-        ja: 'D4DJグルミク',
-    },
-    author: {
-        en: 'Gorengan Hunter#329978',
-    },
-    description: {
-        en: [
-            'A recreation of D4DJ Groovy Mix engine in Sonolus.',
-            '',
-            'Version:',
-            exports.version,
-            '',
-            'GitHub Repository:',
-            'https://github.com/gorenganhunter/sonolus-d4dj-engine',
-        ].join('\n'),
-    },
-};