fix namespace conflicts

externals/generated/PvPogoProtos.d.ts

@@ -1,5 +1,10 @@
 import * as $protobuf from "protobufjs";
-export namespace POGOProtos {
+export = PVPokemon;
+
+declare namespace PVPokemon {
+
+
+    namespace POGOProtos {
 
         namespace Enums {
 
@@ -1176,4 +1181,5 @@ export namespace POGOProtos {
                 POKEMON_TYPE_FAIRY = 18
             }
         }
+    }
 }

externals/generated/PvPogoProtos.js

@@ -1,29 +1,20 @@
 /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
-(function(global, factory) { /* global define, require, module */
+import * as $protobuf from "protobufjs/minimal";
 
-    /* AMD */ if (typeof define === 'function' && define.amd)
-        define(["protobufjs/minimal"], factory);
+// Common aliases
+const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
 
-    /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports)
-        module.exports = factory(require("protobufjs/minimal"));
+// Exported root namespace
+const $root = $protobuf.roots.PVPokemon || ($protobuf.roots.PVPokemon = {});
 
-})(this, function($protobuf) {
-    "use strict";
-
-    // Common aliases
-    var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
-    
-    // Exported root namespace
-    var $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
-    
-    $root.POGOProtos = (function() {
+export const POGOProtos = $root.POGOProtos = (() => {
 
     /**
      * Namespace POGOProtos.
      * @exports POGOProtos
      * @namespace
      */
-        var POGOProtos = {};
+    const POGOProtos = {};
 
     POGOProtos.Enums = (function() {
 
@@ -32,7 +23,7 @@
          * @memberof POGOProtos
          * @namespace
          */
-            var Enums = {};
+        const Enums = {};
 
         /**
          * Form enum.
@@ -173,7 +164,7 @@
          * @property {number} SPINDA_19=132 SPINDA_19 value
          */
         Enums.Form = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
+            const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "FORM_UNSET"] = 0;
             values[valuesById[1] = "UNOWN_A"] = 1;
             values[valuesById[2] = "UNOWN_B"] = 2;
@@ -568,7 +559,7 @@
          * @property {number} FAMILY_MELTAN=808 FAMILY_MELTAN value
          */
         Enums.PokemonFamilyId = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
+            const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "FAMILY_UNSET"] = 0;
             values[valuesById[1] = "FAMILY_BULBASAUR"] = 1;
             values[valuesById[4] = "FAMILY_CHARMANDER"] = 4;
@@ -1326,7 +1317,7 @@
          * @property {number} MELMETAL=809 MELMETAL value
          */
         Enums.PokemonId = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
+            const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "MISSINGNO"] = 0;
             values[valuesById[1] = "BULBASAUR"] = 1;
             values[valuesById[2] = "IVYSAUR"] = 2;
@@ -2090,7 +2081,7 @@
          * @property {number} POWER_UP_PUNCH=319 POWER_UP_PUNCH value
          */
         Enums.PokemonMove = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
+            const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "MOVE_UNSET"] = 0;
             values[valuesById[1] = "THUNDER_SHOCK"] = 1;
             values[valuesById[2] = "QUICK_ATTACK"] = 2;
@@ -2377,7 +2368,7 @@
          * @property {number} POKEMON_TYPE_FAIRY=18 POKEMON_TYPE_FAIRY value
          */
         Enums.PokemonType = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
+            const valuesById = {}, values = Object.create(valuesById);
             values[valuesById[0] = "POKEMON_TYPE_NONE"] = 0;
             values[valuesById[1] = "POKEMON_TYPE_NORMAL"] = 1;
             values[valuesById[2] = "POKEMON_TYPE_FIGHTING"] = 2;
@@ -2404,7 +2395,6 @@
     })();
 
     return POGOProtos;
-    })();
+})();
 
-    return $root;
-});
+export { $root as default };

package.json

@@ -11,8 +11,8 @@
     "tsnode": "node -r ts-node/register -r tsconfig-paths/register",
     "generate": "node_modules/.bin/run-s protobuf pbjs pbts pokemondata",
     "protobuf": "yarn tsnode ./src/scripts/generatePogoProtocolBuffer.ts PokemonId.proto Form.proto PokemonMove.proto PokemonFamilyId.proto PokemonType.proto",
-    "pbjs": "node_modules/.bin/pbjs --keep-case -t static-module --no-verify --no-create --no-delimited -o ./externals/generated/PvPogoProtos.js ./externals/generated/POGOProtos.generated.proto",
-    "pbts": "node_modules/.bin/pbts --no-comments -o ./externals/generated/PvPogoProtos.d.ts ./externals/generated/PvPogoProtos.js",
+    "pbjs": "node_modules/.bin/pbjs --keep-case -t static-module --no-verify --no-create --no-delimited -w es6 -r PVPokemon -o ./externals/generated/PVPogoProtos.js ./externals/generated/POGOProtos.generated.proto",
+    "pbts": "node_modules/.bin/pbts --no-comments -n PVPokemon -o ./externals/generated/PVPogoProtos.d.ts ./externals/generated/PVPogoProtos.js",
     "pokemondata": "yarn tsnode ./src/scripts/generatePokemonData.ts"
   },
   "devDependencies": {

src/scripts/generatePokemonData.ts

@@ -9,7 +9,7 @@ import { ILeaguePokemonJson } from 'api/PokemonService';
 import { ILeaguePokemon, League, MaxCpByLeague } from 'app/models/League';
 import { Grade, IMaxStats, IStats } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 type ICpAndTotalFound = Record<number, Array<IStats>>;
 interface IStatsDistribution {

src/scripts/parseGameMaster.ts

@@ -1,12 +1,13 @@
 import fs from 'fs';
 import path from 'path';
+import POGOProtos from 'pogo-protos';
 
 import { ApiService } from 'api/ApiService';
 
 import { CombatMoveStats, IBaseStatsRank, IPokemon, TypeEffectiveness, TypeOrder } from 'app/models/Pokemon';
 
 import { LegacyMoves } from 'common/models/LegacyMoves';
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 interface ICalculateRelativeStats {
     id : PVPogoProtos.PokemonId;
@@ -15,8 +16,6 @@ interface ICalculateRelativeStats {
 }
 
 export const parseGameMaster = async () => {
-    const POGOProtos = await import('pogo-protos');
-
     const apiService = new ApiService();
     const pokemonDataByPokemonId : Map<PVPogoProtos.PokemonId, Array<IPokemon>> = new Map();
     const pokemonFormsByPokemonId : Map<PVPogoProtos.PokemonId, Array<PVPogoProtos.PokemonForm>> = new Map();

src/ts/api/ApiService.ts

@@ -5,7 +5,7 @@ import { AjaxRequest } from 'api/AjaxRequest';
 
 import { DEFAULT_POKEMON_NAME, IPokemonSpecies } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 interface IPokeApiSpeciesNameJSON {
     pokemon_species_id : string;

src/ts/api/PokemonService.ts

@@ -4,7 +4,7 @@ import { AttackTypeEffectivenessSerializingTuple, IConfig, IConfigJson } from 'a
 import { ILeaguePokemon } from 'app/models/League';
 import { IPokemon, TypeEffectiveness } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 export interface ILeaguePokemonJson extends Omit<ILeaguePokemon, 'effectiveness'> {

src/ts/app/PokemonApp.tsx

@@ -18,7 +18,7 @@ import { Header } from 'app/components/Header';
 import { ConnectedPokemonExplorer } from 'app/components/PokemonExplorer/PokemonExplorer';
 import { PokemonSelectList } from 'app/components/PokemonSelectList/PokemonSelectList';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/styles/PokemonApp.scss';
 

src/ts/app/components/PokemonExplorer/LeagueStatsList.tsx

@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import { IIndividualValues } from 'app/components/PokemonExplorer/types';
 import { Grade, IStats } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/LeagueStatsList.scss';
 

src/ts/app/components/PokemonExplorer/MovesDropdown.tsx

@@ -11,7 +11,7 @@ import { TypeIndicator, TypeTheme } from './TypeIndicator';
 import { formatType } from 'app/utils/formatter';
 import { getMoveType } from 'app/utils/types';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/MovesDropdown.scss';
 

src/ts/app/components/PokemonExplorer/MovesExplorer.tsx

@@ -12,7 +12,7 @@ import { EffectivenessMode, TypeEffectiveDisplay } from './TypeEffectiveDisplay'
 
 import { calculateTypeCoverage } from 'app/utils/types';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/MovesExplorer.scss';
 

src/ts/app/components/PokemonExplorer/PokemonDisplay.tsx

@@ -9,7 +9,7 @@ import { formatDexNumber, formatForm, Forms } from 'app/utils/formatter';
 import { StatDisplay } from './StatDisplay';
 import { TypeIndicator, TypeTheme } from './TypeIndicator';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/PokemonDisplay.scss';
 

src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx

@@ -26,7 +26,7 @@ import { EffectivenessMode, TypeEffectiveDisplay } from 'app/components/PokemonE
 import { appendQueryString } from 'app/utils/navigation';
 import { calculateTypeCoverage } from 'app/utils/types';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/styles/PokemonApp.scss';
 

src/ts/app/components/PokemonExplorer/TypeEffectiveDisplay.tsx

@@ -6,7 +6,7 @@ import { IPokemon, TypeEffectiveness } from 'app/models/Pokemon';
 
 import { TypeIndicator, TypeTheme } from './TypeIndicator';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/TypeEffectiveDisplay.scss';
 

src/ts/app/components/PokemonExplorer/TypeIndicator.tsx

@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import { formatType } from 'app/utils/formatter';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from 'app/components/PokemonExplorer/styles/TypeIndicator.scss';
 

src/ts/app/components/PokemonSelectList/PokemonSelectList.tsx

@@ -10,7 +10,7 @@ import { appendQueryString } from 'app/utils/navigation';
 
 import { DEFAULT_POKEMON_NAME, IPokemon } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 import * as styles from './styles/PokemonSelectList.scss';
 

src/ts/app/components/PokemonSelectList/actions.ts

@@ -6,7 +6,7 @@ import { IPokemon } from 'app/models/Pokemon';
 import { ThunkResult } from 'app/types';
 import { PokemonSelectListActionTypes } from './types';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 export const setIsLoading = (isLoading : boolean) => action(PokemonSelectListActionTypes.SET_IS_LOADING, { isLoading });
 

src/ts/app/components/PokemonSelectList/types.ts

@@ -1,7 +1,7 @@
 import { ILeaguePokemon } from 'app/models/League';
 import { IPokemon } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 export interface IPokemonSelectListState {
     isLoading : boolean;

src/ts/app/models/Config.ts

@@ -1,6 +1,6 @@
 import { CombatMoveStats, ICombatMoveStats, IMaxStats, TypeEffectiveness } from 'app/models/Pokemon';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 type TypeEffectivenessByTypeJson = Array<[PVPogoProtos.PokemonType, TypeEffectiveness]>;
 type AttackTypeEffectivenessJson = Array<[PVPogoProtos.PokemonType, TypeEffectivenessByTypeJson]>;

src/ts/app/models/Pokemon.ts

@@ -1,4 +1,4 @@
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 export const DEFAULT_POKEMON_NAME = 'MissingNo.';
 

src/ts/app/utils/formatter.ts

@@ -1,4 +1,4 @@
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 export const formatDexNumber = (dex : number) => {
     let prefix : string = '';

src/ts/app/utils/types.ts

@@ -3,7 +3,7 @@ import { CombatMoveStats, ICombatMoveStats, IPokemonMove, TypeEffectiveness } fr
 
 import { SelectedCombatMoves } from 'app/components/PokemonExplorer/types';
 
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 export const calculateTypeCoverage = (
     selectedMoves : SelectedCombatMoves,

src/ts/common/models/LegacyMoves.ts

@@ -1,4 +1,4 @@
-import * as PVPogoProtos from 'common/models/PvPogoProtos';
+import * as PVPogoProtos from 'common/models/PVPogoProtos';
 
 interface ILegacyMoves {
     quick_moves : Array<PVPogoProtos.PokemonMove>;

src/ts/common/models/PvPogoProtos.ts

@@ -1,19 +1,19 @@
-import { POGOProtos } from 'externals/generated/PvPogoProtos';
+import * as PVPogoProtos from 'externals/generated/PVPogoProtos';
 
-export const PokemonId = POGOProtos.Enums.PokemonId;
-export type PokemonId = POGOProtos.Enums.PokemonId;
+export const PokemonId = PVPogoProtos.POGOProtos.Enums.PokemonId;
+export type PokemonId = PVPogoProtos.POGOProtos.Enums.PokemonId;
 
-export const PokemonMove = POGOProtos.Enums.PokemonMove;
-export type PokemonMove = POGOProtos.Enums.PokemonMove;
+export const PokemonMove = PVPogoProtos.POGOProtos.Enums.PokemonMove;
+export type PokemonMove = PVPogoProtos.POGOProtos.Enums.PokemonMove;
 
-export const PokemonFamilyId = POGOProtos.Enums.PokemonFamilyId;
-export type PokemonFamilyId = POGOProtos.Enums.PokemonFamilyId;
+export const PokemonFamilyId = PVPogoProtos.POGOProtos.Enums.PokemonFamilyId;
+export type PokemonFamilyId = PVPogoProtos.POGOProtos.Enums.PokemonFamilyId;
 
-export const PokemonType = POGOProtos.Enums.PokemonType;
-export type PokemonType = POGOProtos.Enums.PokemonType;
+export const PokemonType = PVPogoProtos.POGOProtos.Enums.PokemonType;
+export type PokemonType = PVPogoProtos.POGOProtos.Enums.PokemonType;
 
-export const PokemonForm = POGOProtos.Enums.Form;
-export type PokemonForm = POGOProtos.Enums.Form;
+export const PokemonForm = PVPogoProtos.POGOProtos.Enums.Form;
+export type PokemonForm = PVPogoProtos.POGOProtos.Enums.Form;
 
 // this worked, until i realized that i needed to access the values of the enums and not just the types
 // export declare const PokemonId : import('pogo-protos').Enums.PokemonId;