Skip to content

Commit dcf4ee4

Browse files
gakadagakada
committed
fix tests
1 parent 1da29fb commit dcf4ee4

15 files changed

+1554
-1311
lines changed

‎.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
"max-params": ["error", 10],
1919
"max-statements": ["error", 50],
2020
"no-console": 0
21-
}
21+
},
22+
"root": true
2223
}

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dist
1+
dist*
22
node_modules

‎package.json

+24-30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "poi-plugin-tsundb",
3-
"version": "0.0.19",
3+
"version": "0.0.20",
44
"description": "TsunDB data submission plugin for Poi",
55
"keywords": [
66
"kancolle",
@@ -25,41 +25,35 @@
2525
"i18n"
2626
],
2727
"scripts": {
28-
"format": "prettier --loglevel warn --write '**/*.{js,json,md,ts,yaml,yml}'",
28+
"format": "prettier --log-level warn --write '**/*.{js,json,md,ts,yaml,yml}'",
2929
"lint": "eslint . --ext ts --fix",
30-
"build": "rimraf dist && tsc",
31-
"test": "yarn format && yarn lint && yarn build && cross-env TSUNDB_API_URL=http://localhost:12345 tape -r ts-node/register test",
30+
"build": "rm -rf dist* && tsc && tsc -b tsconfig.test.json && cp package.json dist-test && cp -r test/data dist-test/test",
31+
"test": "yarn format && yarn lint && yarn build && TSUNDB_API_URL=http://localhost:12345 node dist-test/test",
3232
"prepack": "yarn test",
3333
"up": "yarn upgrade --latest"
3434
},
3535
"devDependencies": {
36-
"@types/fs-extra": "^9.0.11",
37-
"@types/lodash": "^4.14.169",
38-
"@types/node": "^20.4.8",
39-
"@types/node-fetch": "^2.5.10",
40-
"@types/react": "^17.0.5",
41-
"@types/react-dom": "^17.0.5",
42-
"@types/tape": "^4.13.0",
43-
"@typescript-eslint/eslint-plugin": "^4.23.0",
44-
"@typescript-eslint/parser": "^4.23.0",
45-
"body-parser": "^1.19.0",
46-
"cross-env": "^7.0.3",
47-
"eslint": "^7.26.0",
48-
"eslint-config-prettier": "^8.3.0",
49-
"eslint-plugin-prettier": "^3.4.0",
50-
"fastify": "^3.15.1",
51-
"fs-extra": "^10.0.0",
36+
"@types/fs-extra": "^11.0.1",
37+
"@types/lodash": "^4.14.197",
38+
"@types/node": "^20.5.7",
39+
"@types/node-fetch": "^2.6.4",
40+
"@types/react": "^18.2.21",
41+
"@types/react-dom": "^18.2.7",
42+
"@typescript-eslint/eslint-plugin": "^6.4.1",
43+
"@typescript-eslint/parser": "^6.4.1",
44+
"body-parser": "^1.20.2",
45+
"eslint": "^8.48.0",
46+
"eslint-config-prettier": "^9.0.0",
47+
"eslint-plugin-prettier": "^5.0.0",
48+
"fastify": "^4.22.0",
49+
"fs-extra": "^11.1.1",
5250
"lodash": "^4.17.21",
53-
"node-fetch": "^2.6.1",
54-
"prettier": "^2.3.0",
55-
"react": "^17.0.2",
56-
"react-dom": "^17.0.2",
57-
"redux": "^4.1.0",
58-
"rimraf": "^3.0.2",
59-
"subtender": "^0.15.0",
60-
"tape": "^5.2.2",
61-
"ts-node": "^9.1.1",
62-
"typescript": "^4.2.4"
51+
"node-fetch": "^2.7.0",
52+
"prettier": "^3.0.2",
53+
"react": "^18.2.0",
54+
"react-dom": "^18.2.0",
55+
"redux": "^4.2.1",
56+
"typescript": "^5.1.0"
6357
},
6458
"poiPlugin": {
6559
"title": "Plugin.Title",

‎readme.md

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![Version](https://img.shields.io/npm/v/poi-plugin-tsundb.svg)](https://www.npmjs.com/package/poi-plugin-tsundb)
44
[![Downloads](https://img.shields.io/npm/dm/poi-plugin-tsundb.svg)](https://www.npmjs.com/package/poi-plugin-tsundb)
5-
[![Dependencies](https://img.shields.io/david/dev/kcwiki/poi-plugin-tsundb.svg)](https://david-dm.org/kcwiki/poi-plugin-tsundb?type=dev)
65

76
[TsunDB](https://tsundb.kc3.moe/) data submission plugin for [Poi](https://poi.io/).
87

‎src/subtender.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
declare module 'subtender/poi' {
22
export function shipRemodelInfoSelector(_: any): {
3-
originMstIdOf: { [_: number]: number },
3+
originMstIdOf: { [_: number]: number }
44
remodelChains: number[]
55
}
66
}

‎src/utils.ts

+42-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { readJsonSync } from 'fs-extra'
22
import fetch from 'node-fetch'
33
import { resolve } from 'path'
44
import _ from 'lodash'
5-
import { shipRemodelInfoSelector } from 'subtender/poi'
5+
// import { shipRemodelInfoSelector } from 'subtender/poi'
66

77
const { name, version } = readJsonSync(resolve(__dirname, '../package.json'))
88

@@ -64,20 +64,51 @@ const losC2: { [_: number]: number } = {
6464
export const getEquipmentF33 = (master: any, equip: any): number =>
6565
(master.api_saku + (losC1[master.api_type[2]] || 0) * Math.sqrt(equip.api_level || 0)) * (losC2[master.api_type[2]] || 0.6)
6666

67-
export const getShipCounts = (): { [_: number]: number } => {
68-
const poiState = (window as any).getStore()
69-
const { originMstIdOf } = shipRemodelInfoSelector(poiState)
67+
const getActualPrevId = (es: { api_id: number }[], forId: string): number | null =>
68+
es.length === 1 ? es[0].api_id : (es.find(e => +(window as any).$ships[forId].api_aftershipid !== e.api_id) || {}).api_id || null
69+
70+
const getPrevIds = (): { [_: number]: number | null } =>
71+
_((window as any).$ships)
72+
.filter(e => +e.api_aftershipid)
73+
.groupBy('api_aftershipid')
74+
.mapValues((es, forId) => getActualPrevId(es, forId))
75+
.value()
7076

71-
const getBaseId = (shipId: number): number => {
72-
const base = originMstIdOf[shipId]
73-
if (!base) {
74-
console.warn(name, 'getBaseId', `can't find base id for ${shipId}`)
75-
return shipId
77+
const getBaseId = (shipId: number, prevIds: { [_: number]: number | null }, useSort: boolean = false): number => {
78+
for (let i = 0, id = shipId; i < 10; ++i) {
79+
const prev = prevIds[id]
80+
if (!prev || (useSort && (window as any).$ships[id].api_sort_id % 10 === 1)) {
81+
return id
7682
}
77-
return base
83+
id = prev
7884
}
85+
if (useSort) {
86+
console.warn(name, 'getBaseId', `can't find base id for ${shipId}`)
87+
}
88+
return useSort ? shipId : getBaseId(shipId, prevIds, true)
89+
}
7990

91+
export const getShipCounts = (): { [_: number]: number } => {
92+
const prevIds = getPrevIds()
8093
return _((window as any)._ships)
81-
.countBy(e => getBaseId(e.api_ship_id))
94+
.countBy(e => getBaseId(e.api_ship_id, prevIds))
8295
.value()
8396
}
97+
98+
// export const getShipCounts = (): { [_: number]: number } => {
99+
// const poiState = (window as any).getStore()
100+
// const { originMstIdOf } = shipRemodelInfoSelector(poiState)
101+
102+
// const getBaseId = (shipId: number): number => {
103+
// const base = originMstIdOf[shipId]
104+
// if (!base) {
105+
// console.warn(name, 'getBaseId', `can't find base id for ${shipId}`)
106+
// return shipId
107+
// }
108+
// return base
109+
// }
110+
111+
// return _((window as any)._ships)
112+
// .countBy(e => getBaseId(e.api_ship_id))
113+
// .value()
114+
// }

0 commit comments

Comments
 (0)