Skip to content

Commit

Permalink
Update eslint rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@xShadowBlade
xShadowBlade committed Apr 28, 2024
1 parent 9cb0fa6 commit b9fafe5
Show file tree
Hide file tree
Showing 40 changed files with 349 additions and 252 deletions.
7 changes: 5 additions & 2 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"eslint:recommended",
"prettier",
"plugin:jsdoc/recommended-typescript",
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/strict-type-checked"
],
"env": {
"node": true,
Expand All @@ -12,7 +12,8 @@
},
"parserOptions": {
"sourceType": "module",
"ecmaVersion": "latest"
"ecmaVersion": "latest",
"project": "./tsconfig.json"
},
"parser": "@typescript-eslint/parser",
"rules": {
Expand Down Expand Up @@ -53,6 +54,8 @@
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/ban-ts-comment": "warn",
"@typescript-eslint/member-delimiter-style": "warn",
"@typescript-eslint/explicit-function-return-type": "warn",
"@typescript-eslint/restrict-template-expressions": ["warn", { "allowNumber": true, "allowBoolean": true }],

"jsdoc/require-param-type": "off",
"jsdoc/require-returns-type": "off",
Expand Down
76 changes: 46 additions & 30 deletions dist/game/eMath.game.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,7 @@ function decimalFormatGenerator(Decimal2) {
default:
if (!FORMATS2[type])
console.error(`Invalid format type "`, type, `"`);
return neg + FORMATS2[type]?.format(ex, acc, max);
return neg + FORMATS2[type].format(ex, acc, max);
}
}
function formatGain(amt, gain, type = "mixed_sc", acc, max) {
Expand Down Expand Up @@ -1611,7 +1611,7 @@ function decimalFormatGenerator(Decimal2) {
output = abbMax["name"];
break;
case 2:
output = `${num.divide(abbMax["value"]).format()}`;
output = num.divide(abbMax["value"]).format();
break;
case 3:
output = abbMax["altName"];
Expand Down Expand Up @@ -5510,7 +5510,7 @@ var Boost = class {
* @alias setBoost
* @deprecated Use {@link setBoost} instead.
*/
this.addBoost = this.setBoost;
this.addBoost = this.setBoost.bind(this);
boosts = boosts ? Array.isArray(boosts) ? boosts : [boosts] : void 0;
this.baseEffect = E(baseEffect);
this.boostArray = [];
Expand Down Expand Up @@ -5810,7 +5810,7 @@ var UpgradeStatic = class _UpgradeStatic {
}
getCached(type, start, end) {
if (type === "sum") {
return this.cache.get(upgradeToCacheNameSum(start, end));
return this.cache.get(upgradeToCacheNameSum(start, end ?? E(0)));
} else {
return this.cache.get(upgradeToCacheNameEL(start));
}
Expand Down Expand Up @@ -5893,7 +5893,6 @@ var CurrencyStatic = class {
};
if (upgrades)
this.addUpgrade(upgrades);
this.upgrades = this.upgrades;
}
/**
* Updates / applies effects to the currency on load.
Expand Down Expand Up @@ -6216,7 +6215,7 @@ var KeyManager = class _KeyManager {
*/
constructor(config) {
/** @deprecated Use {@link addKey} instead. */
this.addKeys = this.addKey;
this.addKeys = this.addKey.bind(this);
this.keysPressed = [];
this.binds = [];
this.tickers = [];
Expand Down Expand Up @@ -6369,7 +6368,7 @@ var EventManager = class _EventManager {
* @deprecated Use {@link EventManager.setEvent} instead.
* @alias eventManager.setEvent
*/
this.addEvent = this.setEvent;
this.addEvent = this.setEvent.bind(this);
this.config = _EventManager.configManager.parse(config);
this.events = {};
if (this.config.autoAddInterval) {
Expand All @@ -6395,18 +6394,27 @@ var EventManager = class _EventManager {
tickerFunction() {
const currentTime = Date.now();
for (const event of Object.values(this.events)) {
if (event.type === "interval") {
if (currentTime - event.intervalLast >= event.delay) {
const dt = currentTime - event.intervalLast;
event.callbackFn(dt);
event.intervalLast = currentTime;
}
} else if (event.type === "timeout") {
const dt = currentTime - event.timeCreated;
if (currentTime - event.timeCreated >= event.delay) {
event.callbackFn(dt);
delete this.events[event.name];
}
switch (event.type) {
case "interval" /* interval */:
{
if (currentTime - event.intervalLast >= event.delay) {
const dt = currentTime - event.intervalLast;
event.callbackFn(dt);
event.intervalLast = currentTime;
}
}
;
break;
case "timeout" /* timeout */:
{
const dt = currentTime - event.timeCreated;
if (currentTime - event.timeCreated >= event.delay) {
event.callbackFn(dt);
delete this.events[event.name];
}
}
;
break;
}
}
}
Expand All @@ -6431,11 +6439,19 @@ var EventManager = class _EventManager {
*/
timeWarp(dt) {
for (const event of Object.values(this.events)) {
if (event.type === "interval") {
event.intervalLast -= dt;
}
if (event.type === "timeout") {
event.timeCreated -= dt;
switch (event.type) {
case "interval" /* interval */:
{
event.intervalLast -= dt;
}
;
break;
case "timeout" /* timeout */:
{
event.timeCreated -= dt;
}
;
break;
}
}
}
Expand Down Expand Up @@ -6643,7 +6659,7 @@ var DataManager = class {
* @param data - The data to decompile. If not provided, it will be fetched from localStorage using the key `${game.config.name.id}-data`.
* @returns The decompiled object, or null if the data is empty or invalid.
*/
decompileData(data = window?.localStorage.getItem(`${this.gameRef.config.name.id}-data`)) {
decompileData(data = window.localStorage.getItem(`${this.gameRef.config.name.id}-data`)) {
if (!data)
return null;
let parsedData;
Expand Down Expand Up @@ -6683,7 +6699,7 @@ var DataManager = class {
this.data = this.normalData;
this.saveData();
if (reload)
window?.location.reload();
window.location.reload();
}
/**
* Saves the game data to local storage under the key `${game.config.name.id}-data`.
Expand Down Expand Up @@ -6722,7 +6738,7 @@ var DataManager = class {
* @returns The loaded data.
*/
parseData(dataToParse = this.decompileData(), mergeData = true) {
if (mergeData && (!this.normalData || !this.normalDataPlain))
if ((!this.normalData || !this.normalDataPlain) && mergeData)
throw new Error("dataManager.parseData(): You must call init() before writing to data.");
if (!dataToParse)
return null;
Expand All @@ -6744,7 +6760,7 @@ var DataManager = class {
const upgrades = targetCurrency.upgrades;
targetCurrency.upgrades = {};
for (const upgrade of upgrades) {
targetCurrency.upgrades[upgrade.id] = upgrade.level;
targetCurrency.upgrades[upgrade.id] = upgrade;
}
}
targetCurrency.upgrades = { ...sourceCurrency.upgrades, ...targetCurrency.upgrades };
Expand Down Expand Up @@ -6837,7 +6853,7 @@ var GameCurrency = class {
this.staticPointer = typeof staticPointer === "function" ? staticPointer : () => staticPointer;
this.game = gamePointer;
this.name = name;
this.game?.dataManager.addEventOnLoad(() => {
this.game.dataManager.addEventOnLoad(() => {
this.static.onLoadData();
});
}
Expand Down Expand Up @@ -6910,7 +6926,7 @@ var GameReset = class {
currency.static.reset();
});
this.extender.forEach((extender) => {
if (extender && extender.id !== this.id) {
if (extender.id !== this.id) {
extender.reset();
}
});
Expand Down
2 changes: 1 addition & 1 deletion dist/game/eMath.game.min.js
View file

Large diffs are not rendered by default.

76 changes: 46 additions & 30 deletions dist/game/eMath.game.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ function decimalFormatGenerator(Decimal2) {
default:
if (!FORMATS2[type])
console.error(`Invalid format type "`, type, `"`);
return neg + FORMATS2[type]?.format(ex, acc, max);
return neg + FORMATS2[type].format(ex, acc, max);
}
}
function formatGain(amt, gain, type = "mixed_sc", acc, max) {
Expand Down Expand Up @@ -1578,7 +1578,7 @@ function decimalFormatGenerator(Decimal2) {
output = abbMax["name"];
break;
case 2:
output = `${num.divide(abbMax["value"]).format()}`;
output = num.divide(abbMax["value"]).format();
break;
case 3:
output = abbMax["altName"];
Expand Down Expand Up @@ -5477,7 +5477,7 @@ var Boost = class {
* @alias setBoost
* @deprecated Use {@link setBoost} instead.
*/
this.addBoost = this.setBoost;
this.addBoost = this.setBoost.bind(this);
boosts = boosts ? Array.isArray(boosts) ? boosts : [boosts] : void 0;
this.baseEffect = E(baseEffect);
this.boostArray = [];
Expand Down Expand Up @@ -5777,7 +5777,7 @@ var UpgradeStatic = class _UpgradeStatic {
}
getCached(type, start, end) {
if (type === "sum") {
return this.cache.get(upgradeToCacheNameSum(start, end));
return this.cache.get(upgradeToCacheNameSum(start, end ?? E(0)));
} else {
return this.cache.get(upgradeToCacheNameEL(start));
}
Expand Down Expand Up @@ -5860,7 +5860,6 @@ var CurrencyStatic = class {
};
if (upgrades)
this.addUpgrade(upgrades);
this.upgrades = this.upgrades;
}
/**
* Updates / applies effects to the currency on load.
Expand Down Expand Up @@ -6183,7 +6182,7 @@ var KeyManager = class _KeyManager {
*/
constructor(config) {
/** @deprecated Use {@link addKey} instead. */
this.addKeys = this.addKey;
this.addKeys = this.addKey.bind(this);
this.keysPressed = [];
this.binds = [];
this.tickers = [];
Expand Down Expand Up @@ -6336,7 +6335,7 @@ var EventManager = class _EventManager {
* @deprecated Use {@link EventManager.setEvent} instead.
* @alias eventManager.setEvent
*/
this.addEvent = this.setEvent;
this.addEvent = this.setEvent.bind(this);
this.config = _EventManager.configManager.parse(config);
this.events = {};
if (this.config.autoAddInterval) {
Expand All @@ -6362,18 +6361,27 @@ var EventManager = class _EventManager {
tickerFunction() {
const currentTime = Date.now();
for (const event of Object.values(this.events)) {
if (event.type === "interval") {
if (currentTime - event.intervalLast >= event.delay) {
const dt = currentTime - event.intervalLast;
event.callbackFn(dt);
event.intervalLast = currentTime;
}
} else if (event.type === "timeout") {
const dt = currentTime - event.timeCreated;
if (currentTime - event.timeCreated >= event.delay) {
event.callbackFn(dt);
delete this.events[event.name];
}
switch (event.type) {
case "interval" /* interval */:
{
if (currentTime - event.intervalLast >= event.delay) {
const dt = currentTime - event.intervalLast;
event.callbackFn(dt);
event.intervalLast = currentTime;
}
}
;
break;
case "timeout" /* timeout */:
{
const dt = currentTime - event.timeCreated;
if (currentTime - event.timeCreated >= event.delay) {
event.callbackFn(dt);
delete this.events[event.name];
}
}
;
break;
}
}
}
Expand All @@ -6398,11 +6406,19 @@ var EventManager = class _EventManager {
*/
timeWarp(dt) {
for (const event of Object.values(this.events)) {
if (event.type === "interval") {
event.intervalLast -= dt;
}
if (event.type === "timeout") {
event.timeCreated -= dt;
switch (event.type) {
case "interval" /* interval */:
{
event.intervalLast -= dt;
}
;
break;
case "timeout" /* timeout */:
{
event.timeCreated -= dt;
}
;
break;
}
}
}
Expand Down Expand Up @@ -6610,7 +6626,7 @@ var DataManager = class {
* @param data - The data to decompile. If not provided, it will be fetched from localStorage using the key `${game.config.name.id}-data`.
* @returns The decompiled object, or null if the data is empty or invalid.
*/
decompileData(data = window?.localStorage.getItem(`${this.gameRef.config.name.id}-data`)) {
decompileData(data = window.localStorage.getItem(`${this.gameRef.config.name.id}-data`)) {
if (!data)
return null;
let parsedData;
Expand Down Expand Up @@ -6650,7 +6666,7 @@ var DataManager = class {
this.data = this.normalData;
this.saveData();
if (reload)
window?.location.reload();
window.location.reload();
}
/**
* Saves the game data to local storage under the key `${game.config.name.id}-data`.
Expand Down Expand Up @@ -6689,7 +6705,7 @@ var DataManager = class {
* @returns The loaded data.
*/
parseData(dataToParse = this.decompileData(), mergeData = true) {
if (mergeData && (!this.normalData || !this.normalDataPlain))
if ((!this.normalData || !this.normalDataPlain) && mergeData)
throw new Error("dataManager.parseData(): You must call init() before writing to data.");
if (!dataToParse)
return null;
Expand All @@ -6711,7 +6727,7 @@ var DataManager = class {
const upgrades = targetCurrency.upgrades;
targetCurrency.upgrades = {};
for (const upgrade of upgrades) {
targetCurrency.upgrades[upgrade.id] = upgrade.level;
targetCurrency.upgrades[upgrade.id] = upgrade;
}
}
targetCurrency.upgrades = { ...sourceCurrency.upgrades, ...targetCurrency.upgrades };
Expand Down Expand Up @@ -6804,7 +6820,7 @@ var GameCurrency = class {
this.staticPointer = typeof staticPointer === "function" ? staticPointer : () => staticPointer;
this.game = gamePointer;
this.name = name;
this.game?.dataManager.addEventOnLoad(() => {
this.game.dataManager.addEventOnLoad(() => {
this.static.onLoadData();
});
}
Expand Down Expand Up @@ -6877,7 +6893,7 @@ var GameReset = class {
currency.static.reset();
});
this.extender.forEach((extender) => {
if (extender && extender.id !== this.id) {
if (extender.id !== this.id) {
extender.reset();
}
});
Expand Down
Loading

0 comments on commit b9fafe5

Please sign in to comment.