fleethub-core 1.3.3 → 1.4.0

package/node/fleethub_core.d.ts

@@ -3,9 +3,7 @@
 /**
  */
 export function set_panic_hook(): void;
-export interface EBonusFnGearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
+export interface EBonuses {
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -16,19 +14,18 @@ export interface EBonusFnGearInput {
   bombing: number;
   accuracy: number;
   range: number;
-  radius: number;
-  stars: number;
-  ace: number;
 }
 
-export interface EBonusFnShipInput {
+export interface ShipInput {
   ship_id: number;
   ctype: number;
   stype: number;
   yomi: string;
 }
 
-export interface EBonuses {
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -39,8 +36,13 @@ export interface EBonuses {
   bombing: number;
   accuracy: number;
   range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
+export type GearVecInput = GearInput[];
+
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -1072,9 +1074,8 @@ export class FhCore {
   free(): void;
   /**
    * @param {MasterData} js_master
-   * @param {Function} js_fn
    */
-  constructor(js_master: MasterData, js_fn: Function);
+  constructor(js_master: MasterData);
   /**
    * @param {GearState | undefined} input
    * @returns {Gear | undefined}
@@ -1105,6 +1106,10 @@ export class FhCore {
    * @returns {Ship | undefined}
    */
   create_ship_by_id(ship_id: number): Ship | undefined;
+  /**
+   * @returns {Ship[]}
+   */
+  create_all_ships(): Ship[];
   /**
    * @param {Uint16Array} main
    * @param {Uint16Array | undefined} escort
@@ -1977,6 +1982,10 @@ export class Ship {
    * @returns {number | undefined}
    */
   readonly torpedo: number | undefined;
+  /**
+   * @returns {number}
+   */
+  readonly torpedo_accuracy_mod: number;
   /**
    * @returns {boolean}
    */

package/node/fleethub_core.js

@@ -1,6 +1,7 @@
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
+const { createEquipmentBonuses } = require(`equipment-bonus`);
 const { TextEncoder, TextDecoder } = require(`util`);
 
 const heap = new Array(32).fill(undefined);
@@ -111,71 +112,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function debugString(val) {
-    // primitive types
-    const type = typeof val;
-    if (type == 'number' || type == 'boolean' || val == null) {
-        return  `${val}`;
-    }
-    if (type == 'string') {
-        return `"${val}"`;
-    }
-    if (type == 'symbol') {
-        const description = val.description;
-        if (description == null) {
-            return 'Symbol';
-        } else {
-            return `Symbol(${description})`;
-        }
-    }
-    if (type == 'function') {
-        const name = val.name;
-        if (typeof name == 'string' && name.length > 0) {
-            return `Function(${name})`;
-        } else {
-            return 'Function';
-        }
-    }
-    // objects
-    if (Array.isArray(val)) {
-        const length = val.length;
-        let debug = '[';
-        if (length > 0) {
-            debug += debugString(val[0]);
-        }
-        for(let i = 1; i < length; i++) {
-            debug += ', ' + debugString(val[i]);
-        }
-        debug += ']';
-        return debug;
-    }
-    // Test for built-in
-    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
-    let className;
-    if (builtInMatches.length > 1) {
-        className = builtInMatches[1];
-    } else {
-        // Failed to match the standard '[object ClassName]'
-        return toString.call(val);
-    }
-    if (className == 'Object') {
-        // we're a user defined class or Object
-        // JSON.stringify avoids problems with cycles, and is generally much
-        // easier than looping through ownProperties of `val`.
-        try {
-            return 'Object(' + JSON.stringify(val) + ')';
-        } catch (_) {
-            return 'Object';
-        }
-    }
-    // errors
-    if (val instanceof Error) {
-        return `${val.name}: ${val.message}\n${val.stack}`;
-    }
-    // TODO we could test for more things here, like `Set`s and `Map`s.
-    return className;
-}
-
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
@@ -228,11 +164,6 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
-/**
-*/
-module.exports.set_panic_hook = function() {
-    wasm.set_panic_hook();
-};
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -251,6 +182,11 @@ function passArray8ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+/**
+*/
+module.exports.set_panic_hook = function() {
+    wasm.set_panic_hook();
+};
 
 function handleError(f, args) {
     try {
@@ -815,12 +751,11 @@ class FhCore {
     }
     /**
     * @param {MasterData} js_master
-    * @param {Function} js_fn
     */
-    constructor(js_master, js_fn) {
+    constructor(js_master) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fhcore_new(retptr, addHeapObject(js_master), addHeapObject(js_fn));
+            wasm.fhcore_new(retptr, addHeapObject(js_master));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             var r2 = getInt32Memory0()[retptr / 4 + 2];
@@ -881,6 +816,13 @@ class FhCore {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
+    * @returns {Ship[]}
+    */
+    create_all_ships() {
+        const ret = wasm.fhcore_create_all_ships(this.ptr);
+        return takeObject(ret);
+    }
+    /**
     * @param {Uint16Array} main
     * @param {Uint16Array | undefined} escort
     * @returns {Comp}
@@ -3103,6 +3045,13 @@ class Ship {
         return ret;
     }
     /**
+    * @returns {number}
+    */
+    get torpedo_accuracy_mod() {
+        const ret = wasm.ship_torpedo_accuracy_mod(this.ptr);
+        return ret;
+    }
+    /**
     * @returns {boolean}
     */
     is_installation() {
@@ -3281,10 +3230,20 @@ class Ship {
 }
 module.exports.Ship = Ship;
 
+module.exports.__wbg_ship_new = function(arg0) {
+    const ret = Ship.__wrap(arg0);
+    return addHeapObject(ret);
+};
+
 module.exports.__wbindgen_object_drop_ref = function(arg0) {
     takeObject(arg0);
 };
 
+module.exports.__wbg_createEquipmentBonuses_273b5cec732de9f9 = function(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+    return addHeapObject(ret);
+};
+
 module.exports.__wbindgen_json_serialize = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = JSON.stringify(obj === undefined ? null : obj);
@@ -3379,6 +3338,11 @@ module.exports.__wbg_msCrypto_d07655bf62361f21 = function(arg0) {
     return addHeapObject(ret);
 };
 
+module.exports.__wbg_new_94fb1279cf6afea5 = function() {
+    const ret = new Array();
+    return addHeapObject(ret);
+};
+
 module.exports.__wbg_newnoargs_e23b458e372830de = function(arg0, arg1) {
     const ret = new Function(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
@@ -3394,10 +3358,10 @@ module.exports.__wbindgen_object_clone_ref = function(arg0) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_call_a19d3173f3e1d3c5 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-    const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-    return addHeapObject(ret);
-}, arguments) };
+module.exports.__wbg_push_40c6a90f1805aa90 = function(arg0, arg1) {
+    const ret = getObject(arg0).push(getObject(arg1));
+    return ret;
+};
 
 module.exports.__wbg_self_99737b4dcdf6f0d8 = function() { return handleError(function () {
     const ret = self.self;
@@ -3453,14 +3417,6 @@ module.exports.__wbg_subarray_da527dbd24eafb6b = function(arg0, arg1, arg2) {
     return addHeapObject(ret);
 };
 
-module.exports.__wbindgen_debug_string = function(arg0, arg1) {
-    const ret = debugString(getObject(arg1));
-    const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len0;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
-};
-
 module.exports.__wbindgen_throw = function(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };

package/node/fleethub_core_bg.wasm.d.ts

@@ -78,6 +78,7 @@ export function ship_luck(a: number): number;
 export function ship_range(a: number): number;
 export function ship_speed(a: number): number;
 export function ship_accuracy(a: number): number;
+export function ship_torpedo_accuracy_mod(a: number): number;
 export function ship_is_installation(a: number): number;
 export function ship_get_slot_size(a: number, b: number): number;
 export function ship_get_max_slot_size(a: number, b: number): number;
@@ -207,18 +208,18 @@ export function fleet_expedition_bonus(a: number): number;
 export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
 export function fleet_reset_battle_state(a: number): void;
 export function __wbg_fhcore_free(a: number): void;
-export function fhcore_new(a: number, b: number, c: number): void;
+export function fhcore_new(a: number, b: number): void;
 export function fhcore_create_gear(a: number, b: number): number;
 export function fhcore_create_ship(a: number, b: number): number;
 export function fhcore_create_air_squadron(a: number, b: number): number;
 export function fhcore_create_fleet(a: number, b: number): number;
 export function fhcore_create_org(a: number, b: number): number;
 export function fhcore_create_ship_by_id(a: number, b: number): number;
+export function fhcore_create_all_ships(a: number): number;
 export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
 export function fhcore_create_default_ship(a: number): number;
 export function fhcore_create_analyzer(a: number): number;
 export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;
@@ -335,6 +336,7 @@ export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
+export function set_panic_hook(): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleethub-core",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "license": "UNLICENSED",
   "sideEffects": false,
   "exports": {
@@ -16,7 +16,7 @@
   "collaborators": [
     "まどの <madonoharu@gmail.com>"
   ],
-  "devDependencies": {
-    "jest-environment-jsdom": "^28.0.2"
+  "peerDependencies": {
+    "equipment-bonus": "*"
   }
 }

package/pkg/fleethub_core.d.ts

@@ -3,9 +3,7 @@
 /**
  */
 export function set_panic_hook(): void;
-export interface EBonusFnGearInput {
-  gear_id: number;
-  types: GearTypeIdArray;
+export interface EBonuses {
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -16,19 +14,18 @@ export interface EBonusFnGearInput {
   bombing: number;
   accuracy: number;
   range: number;
-  radius: number;
-  stars: number;
-  ace: number;
 }
 
-export interface EBonusFnShipInput {
+export interface ShipInput {
   ship_id: number;
   ctype: number;
   stype: number;
   yomi: string;
 }
 
-export interface EBonuses {
+export interface GearInput {
+  gear_id: number;
+  types: GearTypeIdArray;
   firepower: number;
   torpedo: number;
   anti_air: number;
@@ -39,8 +36,13 @@ export interface EBonuses {
   bombing: number;
   accuracy: number;
   range: number;
+  radius: number;
+  stars: number;
+  ace: number;
 }
 
+export type GearVecInput = GearInput[];
+
 export type AirStateRank = "Rank0" | "Rank1" | "Rank2" | "Rank3";
 
 export type AirState =
@@ -1072,9 +1074,8 @@ export class FhCore {
   free(): void;
   /**
    * @param {MasterData} js_master
-   * @param {Function} js_fn
    */
-  constructor(js_master: MasterData, js_fn: Function);
+  constructor(js_master: MasterData);
   /**
    * @param {GearState | undefined} input
    * @returns {Gear | undefined}
@@ -1105,6 +1106,10 @@ export class FhCore {
    * @returns {Ship | undefined}
    */
   create_ship_by_id(ship_id: number): Ship | undefined;
+  /**
+   * @returns {Ship[]}
+   */
+  create_all_ships(): Ship[];
   /**
    * @param {Uint16Array} main
    * @param {Uint16Array | undefined} escort
@@ -1977,6 +1982,10 @@ export class Ship {
    * @returns {number | undefined}
    */
   readonly torpedo: number | undefined;
+  /**
+   * @returns {number}
+   */
+  readonly torpedo_accuracy_mod: number;
   /**
    * @returns {boolean}
    */

package/pkg/fleethub_core_bg.js

@@ -1,3 +1,4 @@
+import { createEquipmentBonuses } from 'equipment-bonus';
 import * as wasm from './fleethub_core_bg.wasm';
 
 const heap = new Array(32).fill(undefined);
@@ -112,71 +113,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function debugString(val) {
-    // primitive types
-    const type = typeof val;
-    if (type == 'number' || type == 'boolean' || val == null) {
-        return  `${val}`;
-    }
-    if (type == 'string') {
-        return `"${val}"`;
-    }
-    if (type == 'symbol') {
-        const description = val.description;
-        if (description == null) {
-            return 'Symbol';
-        } else {
-            return `Symbol(${description})`;
-        }
-    }
-    if (type == 'function') {
-        const name = val.name;
-        if (typeof name == 'string' && name.length > 0) {
-            return `Function(${name})`;
-        } else {
-            return 'Function';
-        }
-    }
-    // objects
-    if (Array.isArray(val)) {
-        const length = val.length;
-        let debug = '[';
-        if (length > 0) {
-            debug += debugString(val[0]);
-        }
-        for(let i = 1; i < length; i++) {
-            debug += ', ' + debugString(val[i]);
-        }
-        debug += ']';
-        return debug;
-    }
-    // Test for built-in
-    const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
-    let className;
-    if (builtInMatches.length > 1) {
-        className = builtInMatches[1];
-    } else {
-        // Failed to match the standard '[object ClassName]'
-        return toString.call(val);
-    }
-    if (className == 'Object') {
-        // we're a user defined class or Object
-        // JSON.stringify avoids problems with cycles, and is generally much
-        // easier than looping through ownProperties of `val`.
-        try {
-            return 'Object(' + JSON.stringify(val) + ')';
-        } catch (_) {
-            return 'Object';
-        }
-    }
-    // errors
-    if (val instanceof Error) {
-        return `${val.name}: ${val.message}\n${val.stack}`;
-    }
-    // TODO we could test for more things here, like `Set`s and `Map`s.
-    return className;
-}
-
 const u32CvtShim = new Uint32Array(2);
 
 const uint64CvtShim = new BigUint64Array(u32CvtShim.buffer);
@@ -229,11 +165,6 @@ function getUint16Memory0() {
 function getArrayU16FromWasm0(ptr, len) {
     return getUint16Memory0().subarray(ptr / 2, ptr / 2 + len);
 }
-/**
-*/
-export function set_panic_hook() {
-    wasm.set_panic_hook();
-}
 
 function passArray16ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 2);
@@ -252,6 +183,11 @@ function passArray8ToWasm0(arg, malloc) {
     WASM_VECTOR_LEN = arg.length;
     return ptr;
 }
+/**
+*/
+export function set_panic_hook() {
+    wasm.set_panic_hook();
+}
 
 function handleError(f, args) {
     try {
@@ -813,12 +749,11 @@ export class FhCore {
     }
     /**
     * @param {MasterData} js_master
-    * @param {Function} js_fn
     */
-    constructor(js_master, js_fn) {
+    constructor(js_master) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.fhcore_new(retptr, addHeapObject(js_master), addHeapObject(js_fn));
+            wasm.fhcore_new(retptr, addHeapObject(js_master));
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             var r2 = getInt32Memory0()[retptr / 4 + 2];
@@ -879,6 +814,13 @@ export class FhCore {
         return ret === 0 ? undefined : Ship.__wrap(ret);
     }
     /**
+    * @returns {Ship[]}
+    */
+    create_all_ships() {
+        const ret = wasm.fhcore_create_all_ships(this.ptr);
+        return takeObject(ret);
+    }
+    /**
     * @param {Uint16Array} main
     * @param {Uint16Array | undefined} escort
     * @returns {Comp}
@@ -3096,6 +3038,13 @@ export class Ship {
         return ret;
     }
     /**
+    * @returns {number}
+    */
+    get torpedo_accuracy_mod() {
+        const ret = wasm.ship_torpedo_accuracy_mod(this.ptr);
+        return ret;
+    }
+    /**
     * @returns {boolean}
     */
     is_installation() {
@@ -3273,10 +3222,20 @@ export class Ship {
     }
 }
 
+export function __wbg_ship_new(arg0) {
+    const ret = Ship.__wrap(arg0);
+    return addHeapObject(ret);
+};
+
 export function __wbindgen_object_drop_ref(arg0) {
     takeObject(arg0);
 };
 
+export function __wbg_createEquipmentBonuses_273b5cec732de9f9(arg0, arg1) {
+    const ret = createEquipmentBonuses(takeObject(arg0), takeObject(arg1));
+    return addHeapObject(ret);
+};
+
 export function __wbindgen_json_serialize(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = JSON.stringify(obj === undefined ? null : obj);
@@ -3371,6 +3330,11 @@ export function __wbg_msCrypto_d07655bf62361f21(arg0) {
     return addHeapObject(ret);
 };
 
+export function __wbg_new_94fb1279cf6afea5() {
+    const ret = new Array();
+    return addHeapObject(ret);
+};
+
 export function __wbg_newnoargs_e23b458e372830de(arg0, arg1) {
     const ret = new Function(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
@@ -3386,10 +3350,10 @@ export function __wbindgen_object_clone_ref(arg0) {
     return addHeapObject(ret);
 };
 
-export function __wbg_call_a19d3173f3e1d3c5() { return handleError(function (arg0, arg1, arg2, arg3) {
-    const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
-    return addHeapObject(ret);
-}, arguments) };
+export function __wbg_push_40c6a90f1805aa90(arg0, arg1) {
+    const ret = getObject(arg0).push(getObject(arg1));
+    return ret;
+};
 
 export function __wbg_self_99737b4dcdf6f0d8() { return handleError(function () {
     const ret = self.self;
@@ -3445,14 +3409,6 @@ export function __wbg_subarray_da527dbd24eafb6b(arg0, arg1, arg2) {
     return addHeapObject(ret);
 };
 
-export function __wbindgen_debug_string(arg0, arg1) {
-    const ret = debugString(getObject(arg1));
-    const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len0;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
-};
-
 export function __wbindgen_throw(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 };

package/pkg/fleethub_core_bg.wasm.d.ts

@@ -78,6 +78,7 @@ export function ship_luck(a: number): number;
 export function ship_range(a: number): number;
 export function ship_speed(a: number): number;
 export function ship_accuracy(a: number): number;
+export function ship_torpedo_accuracy_mod(a: number): number;
 export function ship_is_installation(a: number): number;
 export function ship_get_slot_size(a: number, b: number): number;
 export function ship_get_max_slot_size(a: number, b: number): number;
@@ -207,18 +208,18 @@ export function fleet_expedition_bonus(a: number): number;
 export function fleet_sum_ship_stat_by(a: number, b: number, c: number, d: number): void;
 export function fleet_reset_battle_state(a: number): void;
 export function __wbg_fhcore_free(a: number): void;
-export function fhcore_new(a: number, b: number, c: number): void;
+export function fhcore_new(a: number, b: number): void;
 export function fhcore_create_gear(a: number, b: number): number;
 export function fhcore_create_ship(a: number, b: number): number;
 export function fhcore_create_air_squadron(a: number, b: number): number;
 export function fhcore_create_fleet(a: number, b: number): number;
 export function fhcore_create_org(a: number, b: number): number;
 export function fhcore_create_ship_by_id(a: number, b: number): number;
+export function fhcore_create_all_ships(a: number): number;
 export function fhcore_create_comp_by_map_enemy(a: number, b: number, c: number, d: number, e: number): number;
 export function fhcore_create_default_ship(a: number): number;
 export function fhcore_create_analyzer(a: number): number;
 export function fhcore_simulate_shelling_support(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function set_panic_hook(): void;
 export function __wbg_ibonuses_free(a: number): void;
 export function __wbg_get_ibonuses_shelling_power(a: number): number;
 export function __wbg_set_ibonuses_shelling_power(a: number, b: number): void;
@@ -335,6 +336,7 @@ export function gear_is_abyssal_patrolling_attack_hawk(a: number): number;
 export function gear_expedition_bonus(a: number): number;
 export function gear_can_be_deployed_to_land_base(a: number): number;
 export function gear_has_proficiency(a: number): number;
+export function set_panic_hook(): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;