split the utils files into multiple files. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

bbunks wants to merge 1 commit into d2foundry:main from bbunks:bbunks/split-utils

bun.lockb

Binary file not shown.

dist/index.js

Large diffs are not rendered by default.

dist/src/index.d.ts

-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
-    export { decompressJson, compressJson } from "@/utils";
+    export { decompressJson, compressJson } from "@/utils/json";
     export { buildSearchDatabase, getSearchDbFromDestinyApi, weaponSearchOptionKeys, } from "@/weapons";
     export type { KeywordType, WeaponSearchDbItem, WeaponSearchKeywords, WeaponSearchMetadataKeys, WeaponSearchKeywordSchema, WeaponSearchMetadataSchema, KeywordDefinition, } from "@/weapons";

dist/src/lib/weapons/reduceResolvers.d.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,6 +2,6 @@ import { AllDestinyManifestComponents, DestinyInventoryItemDefinition } from "bu
  
    import { WeaponSearchDbItem, WeaponSearchKeywordSchema } from "./schema";

    export default function reduceAllResolvers(weapons: DestinyInventoryItemDefinition[], defs: AllDestinyManifestComponents): WeaponSearchDbItem[];

    export declare const weaponSearchOptionKeys: {

        name: "energy" | "adept" | "ammo" | "craftable" | "event" | "foundry" | "frame" | "name" | "perk" | "rarity" | "rpm" | "season" | "slot" | "source" | "sunset" | "trait_1" | "trait_2" | "weapon" | "zoom";

        name: "adept" | "ammo" | "craftable" | "energy" | "event" | "foundry" | "frame" | "name" | "perk" | "rarity" | "rpm" | "season" | "slot" | "source" | "sunset" | "trait_1" | "trait_2" | "weapon" | "zoom";

        getFn: (searchDbItem: WeaponSearchKeywordSchema) => import("../../types").SearchValue;

    }[];

dist/src/utils/category/index.d.ts

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    import { DestinyInventoryItemDefinition } from "bungie-api-ts/destiny2";
+    export declare function hasWeaponItemCategory(item: DestinyInventoryItemDefinition): boolean | undefined;
+    export declare function hasDummyItemCategory(item: DestinyInventoryItemDefinition): boolean | undefined;
+    declare const _default: {
+        hasWeaponItemCategory: typeof hasWeaponItemCategory;
+        hasDummyItemCategory: typeof hasDummyItemCategory;
+    };
+    export default _default;

dist/src/utils/index.d.ts

-Original file line number
+Diff line change
@@ -1,22 +1 @@
-    import { TierType, AllDestinyManifestComponents, DamageType, DestinyInventoryItemDefinition, DestinyAmmunitionType } from "bungie-api-ts/destiny2";
-    export declare function getInventoryItem(inventoryItemHash: number, definitions: AllDestinyManifestComponents): DestinyInventoryItemDefinition;
-    export declare function mapItemSocketsToInventoryItems(item: DestinyInventoryItemDefinition, defs: AllDestinyManifestComponents): DestinyInventoryItemDefinition[][];
-    export declare function getWatermark(item: DestinyInventoryItemDefinition): string | undefined;
-    export declare const getItemSource: (itemHash: number, sourceHash?: number) => string | string[];
-    export declare const getAmmoType: (ammoType: DestinyAmmunitionType) => "" | "Primary" | "Special" | "Heavy";
-    export declare const getEnergyFromDamageType: (damageType?: DamageType | null) => "" | "kinetic" | "arc" | "solar" | "void" | "stasis" | "strand";
-    export declare const getSlotFromSlotHash: (slotHash?: number | null) => "" | "kinetic" | "energy" | "power";
-    export declare function getRarityFromTierType(tier?: TierType): "common" | "uncommon" | "rare" | "legendary" | "exotic" | "";
-    export declare const getTierTypeFromRarity: (rarity?: string) => 0 | 2 | 4 | 3 | 5 | 6;
-    export declare const getSeasonNumberFromWatermark: (watermarkSrc?: string) => number | null;
-    export declare const getSeasonNameFromNumber: (season?: number) => string;
-    export declare const getEventFromNumber: (event?: number) => string | undefined;
-    export declare const getEventFromWatermark: (watermarkSrc?: string) => number | null;
-    export declare function hasWeaponItemCategory(item: DestinyInventoryItemDefinition): boolean | undefined;
-    export declare function hasDummyItemCategory(item: DestinyInventoryItemDefinition): boolean | undefined;
-    export declare function getWeaponInventoryItems(defs: AllDestinyManifestComponents): DestinyInventoryItemDefinition[];
-    export declare const getIsAdeptFromName: (name: string) => boolean;
-    export declare const getBungieApiUrl: (url: string) => string;
-    export declare function compressJson(json: string): string;
-    export declare function decompressJson(compressed: string): string;
     export { default as sorter, ValueType } from "./sorter";

dist/src/utils/items/index.d.ts

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    import { AllDestinyManifestComponents, DestinyInventoryItemDefinition } from "bungie-api-ts/destiny2";
+    export declare function getInventoryItem(inventoryItemHash: number, definitions: AllDestinyManifestComponents): DestinyInventoryItemDefinition;
+    export declare function mapItemSocketsToInventoryItems(item: DestinyInventoryItemDefinition, defs: AllDestinyManifestComponents): DestinyInventoryItemDefinition[][];
+    export declare function getWatermark(item: DestinyInventoryItemDefinition): string | undefined;
+    export declare function getWeaponInventoryItems(defs: AllDestinyManifestComponents): DestinyInventoryItemDefinition[];
+    export declare const getIsAdeptFromName: (name: string) => boolean;

dist/src/utils/json/index.d.ts

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export declare function compressJson(json: string): string;
		export declare function decompressJson(compressed: string): string;

dist/src/utils/mapping/itemProperties.d.ts

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    import { DamageType, DestinyAmmunitionType, TierType } from "bungie-api-ts/destiny2";
+    export declare const getAmmoType: (ammoType: DestinyAmmunitionType) => "" | "Primary" | "Special" | "Heavy";
+    export declare const getEnergyFromDamageType: (damageType?: DamageType | null) => "" | "kinetic" | "arc" | "solar" | "void" | "stasis" | "strand";
+    export declare function getRarityFromTierType(tier?: TierType): "" | "common" | "uncommon" | "rare" | "legendary" | "exotic";
+    export declare const getTierTypeFromRarity: (rarity?: string) => 0 | 2 | 4 | 3 | 5 | 6;
+    export declare const getSlotFromSlotHash: (slotHash?: number | null) => "" | "kinetic" | "energy" | "power";

dist/src/utils/mapping/sources.d.ts

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    export declare const getItemSource: (itemHash: number, sourceHash?: number) => string | string[];
+    export declare const getEventFromNumber: (event?: number) => string | undefined;
+    export declare const getEventFromWatermark: (watermarkSrc?: string) => number | null;
+    export declare const getSeasonNumberFromWatermark: (watermarkSrc?: string) => number | null;
+    export declare const getSeasonNameFromNumber: (season?: number) => string;
+    declare const _default: {
+        getEventFromNumber: (event?: number | undefined) => string | undefined;
+        getEventFromWatermark: (watermarkSrc?: string | undefined) => number | null;
+    };
+    export default _default;

dist/src/utils/url/index.d.ts

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export declare const getBungieApiUrl: (url: string) => string;

src/index.ts

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    export { decompressJson, compressJson } from "@/utils";
+    export { decompressJson, compressJson } from "@/utils/json";
     export {
       buildSearchDatabase,
@@ Expand Down @@

src/lib/client/index.ts

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
-    import { ValueType, sorter, getTierTypeFromRarity } from "@/utils";
+    import { ValueType, sorter } from "@/utils";
     import type { WeaponSearchDbItem } from "@/weapons";
     import type { ClientSearchResults } from "./types";
+    import { getTierTypeFromRarity } from "@/utils/mapping/itemProperties";
     type ClientWeaponSearchResults = ClientSearchResults<WeaponSearchDbItem>;
@@ Expand Down @@

src/lib/weapons/index.ts

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     import { AllDestinyManifestComponents } from "bungie-api-ts/destiny2";
-    import { getWeaponInventoryItems } from "@/utils";
     import { getManifest } from "@/dataSources/destinyManifest";
     import reduceAllResolvers, { weaponSearchOptionKeys } from "./reduceResolvers";
+    import { getWeaponInventoryItems } from "@/utils/items";
     function buildSearchDatabase(defs: AllDestinyManifestComponents) {
       const weapons = getWeaponInventoryItems(defs);
@@ Expand Down @@

src/lib/weapons/resolvers.ts

-Original file line number
+Diff line change
@@ -1,25 +1,29 @@
-    import {
-      getAmmoType,
-      getBungieApiUrl,
-      getEnergyFromDamageType,
-      getEventFromNumber,
-      getEventFromWatermark,
-      getInventoryItem,
-      getIsAdeptFromName,
-      getItemSource,
-      getRarityFromTierType,
-      getSeasonNumberFromWatermark,
-      getSlotFromSlotHash,
-      getWatermark,
-      mapItemSocketsToInventoryItems,
-    } from "@/utils";
     import { createMetadataResolver, createResolver } from "./createResolver";
     import craftableHashes from "@/data/d2-additional-info/craftable-hashes.json";
     import watermarkToFoundry from "@/data/watermarkToFoundry.json";
     import extendedFoundry from "@/data/d2-additional-info/extended-foundry.json";
     import adeptWeaponHashes from "@/data/d2-additional-info/adept-weapon-hashes.json";
     import { S22_EXOTICS, SOTL_2023, SUNSET_MAX_POWER } from "./constants";
+    import { getBungieApiUrl } from "src/utils/url";
+    import {
+      getEventFromNumber,
+      getEventFromWatermark,
+      getItemSource,
+      getSeasonNumberFromWatermark,
+    } from "src/utils/mapping/sources";
+    import {
+      getInventoryItem,
+      getIsAdeptFromName,
+      getWatermark,
+      mapItemSocketsToInventoryItems,
+    } from "src/utils/items";
+    import {
+      getAmmoType,
+      getEnergyFromDamageType,
+      getRarityFromTierType,
+      getSlotFromSlotHash,
+    } from "@/utils/mapping/itemProperties";
     const adept = createResolver({
       label: "adept",
@@ Expand Down @@

src/utils/__test__/utils.test.ts

-Original file line number
+Diff line change
@@ -1,14 +1,7 @@
     import { test, expect, describe } from "bun:test";
-    import {
-      getIsAdeptFromName,
-      getItemSource,
-      getAmmoType,
-      getEnergyFromDamageType,
-      // getEventFromWatermark,
-      getRarityFromTierType,
-      // getSlotFromSlotHash,
-      // getSeasonNumberFromWatermark,
-    } from "../index";
+    import { getItemSource } from "../mapping/sources";
+    import { getIsAdeptFromName } from "../items";
+    import { getAmmoType, getEnergyFromDamageType, getRarityFromTierType } from "../mapping/itemProperties";
     const MISSING_SOURCE_ITEM = 4024037919; // origin story
     const PROPHECY_SOURCE_HASH = 506073192;
@@ Expand Down @@

src/utils/category/index.ts

-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    import { DestinyInventoryItemDefinition } from "bungie-api-ts/destiny2";
+    const WEAPONS_ITEM_CATEGORY = 1;
+    const DUMMIES_ITEM_CATEGORY = 3109687656;
+    export function hasWeaponItemCategory(item: DestinyInventoryItemDefinition) {
+      return item.itemCategoryHashes?.includes(WEAPONS_ITEM_CATEGORY);
+    }
+    export function hasDummyItemCategory(item: DestinyInventoryItemDefinition) {
+      return item.itemCategoryHashes?.includes(DUMMIES_ITEM_CATEGORY);
+    }
+    export default {
+      hasWeaponItemCategory,
+      hasDummyItemCategory,
+    };

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

split the utils files into multiple files. #17

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

split the utils files into multiple files. #17

Are you sure you want to change the base?

Uh oh!

split the utils files into multiple files. #17

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!