codemod rest of utils to esm

odota · Dec 2, 2023 · 8932488 · 8932488
1 parent 63cb2c5
commit 8932488
Show file tree

Hide file tree

Showing 42 changed files with 57 additions and 119 deletions.
diff --git a/dev/findProMatches.mjs b/dev/findProMatches.mjs
@@ -1,7 +1,7 @@
 import async from 'async';
 import queries from '../store/queries.mjs';
 import db from '../store/db.mjs';
-import { generateJob, getData } from '../util/utility.js';
+import { generateJob, getData } from '../util/utility.mjs';
 
 // const leagueUrl = generateJob('api_leagues', {}).url;
 

diff --git a/dev/rePatch.mjs b/dev/rePatch.mjs
@@ -5,7 +5,7 @@ import async from 'async';
 import constants from 'dotaconstants';
 import db from '../store/db.mjs';
 import queries from '../store/queries.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 
 db.select(['match_id', 'start_time'])
   .from('matches')

diff --git a/dev/wordcount.mjs b/dev/wordcount.mjs
@@ -1,6 +1,6 @@
 import JSONStream from 'JSONStream';
 import db from '../store/db';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import compute from '../util/compute.mjs';
 
 const args = process.argv.slice(2);

diff --git a/processors/processAllPlayers.mjs b/processors/processAllPlayers.mjs
@@ -1,4 +1,4 @@
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 /**
  * Compute data requiring all players in a match for storage in match table
  * */

diff --git a/routes/requests/queryParams/scenarioParams.js b/routes/requests/queryParams/scenarioParams.js
@@ -1,10 +1,8 @@
-const su = require('../../../util/scenariosUtil');
-
 module.exports = {
   scenarioParam: {
     name: 'scenario',
     in: 'query',
-    description: su.teamScenariosQueryParams.toString(),
+    description: 'Name of the scenario (see teamScenariosQueryParams)',
     required: false,
     schema: {
       type: 'string',

diff --git a/routes/spec.mjs b/routes/spec.mjs
@@ -10,7 +10,7 @@ import searchES from '../store/searchES.mjs';
 import buildMatch from '../store/buildMatch.mjs';
 import buildStatus from '../store/buildStatus.mjs';
 import playerFields from './playerFields.json' assert { type: 'json' };
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
 import packageJson from '../package.json' assert { type: 'json' };

diff --git a/store/buildMatch.mjs b/store/buildMatch.mjs
@@ -2,7 +2,7 @@ import constants from 'dotaconstants';
 import config from '../config.js';
 import queries from './queries.mjs';
 import compute from '../util/compute.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import cassandra from './cassandra.mjs';
 import redis from './redis.mjs';
 import db from './db.mjs';

diff --git a/store/buildStatus.mjs b/store/buildStatus.mjs
@@ -1,5 +1,5 @@
 import async from 'async';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 export default function buildStatus(db, redis, cb) {
   function generatePercentiles(arr) {
     // sort the list

diff --git a/store/getGcData.mjs b/store/getGcData.mjs
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 import queries from './queries.mjs';
 import db from './db.mjs';

diff --git a/store/queries.mjs b/store/queries.mjs
@@ -1,10 +1,10 @@
 import async from 'async';
 import constants from 'dotaconstants';
 import util from 'util';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 import queue from './queue.mjs';
-import su from '../util/scenariosUtil.js';
+import su from '../util/scenariosUtil.mjs';
 import filter from '../util/filter.mjs';
 import compute from '../util/compute.mjs';
 import db from './db.mjs';

diff --git a/svc/apiadmin.mjs b/svc/apiadmin.mjs
@@ -3,7 +3,7 @@ import moment from 'moment';
 import stripeLib from 'stripe';
 import redis from '../store/redis.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 import config from '../config.js';
 const stripe = stripeLib(config.STRIPE_SECRET);

diff --git a/svc/backupscanner.mjs b/svc/backupscanner.mjs
@@ -1,5 +1,5 @@
 import async from 'async';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import redis from '../store/redis.mjs';
 import queries from '../store/queries.mjs';
 import config from '../config.js';

diff --git a/svc/benchmarks.mjs b/svc/benchmarks.mjs
@@ -1,6 +1,6 @@
 import queue from '../store/queue.mjs';
 import buildMatch from '../store/buildMatch.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 import redis from '../store/redis.mjs';
 

diff --git a/svc/buildsets.mjs b/svc/buildsets.mjs
@@ -1,7 +1,7 @@
 import buildSets from '../store/buildSets.mjs';
 import redis from '../store/redis.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { invokeInterval } = utility;
 function doBuildSets(cb) {
   buildSets(db, redis, cb);

diff --git a/svc/cosmetics.mjs b/svc/cosmetics.mjs
@@ -1,7 +1,7 @@
 import vdf from 'simple-vdf';
 import async from 'async';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 const { invokeInterval, cleanItemSchema } = utility;
 function doCosmetics(cb) {

diff --git a/svc/counts.mjs b/svc/counts.mjs
@@ -2,7 +2,7 @@ import async from 'async';
 import moment from 'moment';
 import redis from '../store/redis.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 import queue from '../store/queue.mjs';
 import config from '../config.js';

diff --git a/svc/distributions.mjs b/svc/distributions.mjs
@@ -3,7 +3,7 @@ import async from 'async';
 import constants from 'dotaconstants';
 import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { invokeInterval } = utility;
 const sql = {};
 const sqlq = fs.readdirSync('./sql');

diff --git a/svc/fullhistory.mjs b/svc/fullhistory.mjs
@@ -2,7 +2,7 @@ import async from 'async';
 import urllib from 'url';
 import constants from 'dotaconstants';
 import config from '../config.js';
-import { redisCount, getData, generateJob } from '../util/utility.js';
+import { redisCount, getData, generateJob } from '../util/utility.mjs';
 import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
 import queue from '../store/queue.mjs';

diff --git a/svc/gcdata.mjs b/svc/gcdata.mjs
@@ -1,7 +1,7 @@
 import getGcData from '../util/getGcData.mjs';
 import queue from '../store/queue.mjs';
 import config from '../config.js';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { getRetrieverArr } = utility;
 const retrieverArr = getRetrieverArr();
 async function processGcData(job, cb) {

diff --git a/svc/heroes.mjs b/svc/heroes.mjs
@@ -1,6 +1,6 @@
 import async from 'async';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 const { invokeInterval, generateJob, getData } = utility;
 function doHeroes(cb) {

diff --git a/svc/herostats.mjs b/svc/herostats.mjs
@@ -3,7 +3,7 @@ import moment from 'moment';
 import async from 'async';
 import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { invokeInterval } = utility;
 function doHeroStats(cb) {
   const minTime = moment().subtract(30, 'day').format('X');

diff --git a/svc/items.mjs b/svc/items.mjs
@@ -1,6 +1,6 @@
 import async from 'async';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 const { invokeInterval } = utility;
 function doItems(cb) {

diff --git a/svc/leagues.mjs b/svc/leagues.mjs
@@ -1,5 +1,5 @@
 import async from 'async';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import db from '../store/db.mjs';
 import queries from '../store/queries.mjs';
 const { invokeInterval, generateJob, getData } = utility;

diff --git a/svc/livegames.mjs b/svc/livegames.mjs
@@ -3,7 +3,7 @@ import JSONbig from 'json-bigint';
 import request from 'request';
 import redis from '../store/redis.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 const { invokeInterval } = utility;
 function doLiveGames(cb) {

diff --git a/svc/migrater.mjs b/svc/migrater.mjs
@@ -1,7 +1,7 @@
 import async from 'async';
 import fs from 'fs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const sqlQuery = fs.readFileSync('./sql/create_tables.sql', 'utf8');
 // const cassQuery = fs.readFileSync('./sql/create_tables.cql', 'utf8');
 const { invokeInterval } = utility;

diff --git a/svc/mmr.mjs b/svc/mmr.mjs
@@ -3,7 +3,7 @@ import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
 import queries from '../store/queries.mjs';
 import config from '../config.js';
-import { getData, redisCount, getRetrieverArr } from '../util/utility.js';
+import { getData, redisCount, getRetrieverArr } from '../util/utility.mjs';
 const { insertPlayer, insertPlayerRating } = queries;
 const retrieverArr = getRetrieverArr();
 function processMmr(job, cb) {

diff --git a/svc/monitor.mjs b/svc/monitor.mjs
@@ -3,7 +3,7 @@ import config from '../config.js';
 import redis from '../store/redis.mjs';
 import db from '../store/db.mjs';
 import cassandra from '../store/cassandra.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const apiKey = config.STEAM_API_KEY.split(',')[0];
 function invokeInterval(func) {
   // invokes the function immediately, waits for callback, waits the delay, and then calls it again

diff --git a/svc/parser.mjs b/svc/parser.mjs
@@ -8,7 +8,7 @@
 import { exec } from 'child_process';
 import os from 'os';
 import express from 'express';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import getGcData from '../store/getGcData.mjs';
 import config from '../config.js';
 import queue from '../store/queue.mjs';

diff --git a/svc/profiler.mjs b/svc/profiler.mjs
@@ -1,7 +1,7 @@
 import async from 'async';
 import queries from '../store/queries.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { insertPlayer, bulkIndexPlayer } = queries;
 const { getData, generateJob, convert64to32 } = utility;
 function getSummaries(cb) {

diff --git a/svc/proplayers.mjs b/svc/proplayers.mjs
@@ -1,7 +1,7 @@
 import async from 'async';
 import db from '../store/db.mjs';
 import queries from '../store/queries.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { invokeInterval, generateJob, getData } = utility;
 function doProPlayers(cb) {
   const container = generateJob('api_notable', {});

diff --git a/svc/repatch.mjs b/svc/repatch.mjs
@@ -2,7 +2,7 @@ import async from 'async';
 import constants from 'dotaconstants';
 import db from '../store/db.mjs';
 import queries from '../store/queries.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 const { invokeInterval } = utility;
 function rePatch() {
   db.select(['match_id', 'start_time'])

diff --git a/svc/scanner.mjs b/svc/scanner.mjs
@@ -1,5 +1,5 @@
 import async from 'async';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 import redis from '../store/redis.mjs';
 import queries from '../store/queries.mjs';

diff --git a/svc/scenarios.mjs b/svc/scenarios.mjs
@@ -3,8 +3,8 @@ import util from 'util';
 import queue from '../store/queue.mjs';
 import buildMatch from '../store/buildMatch.mjs';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
-import su from '../util/scenariosUtil.js';
+import utility from '../util/utility.mjs';
+import su from '../util/scenariosUtil.mjs';
 async function processScenarios(matchID, cb) {
   try {
     const match = await buildMatch(matchID);

diff --git a/svc/scenariosCleanup.mjs b/svc/scenariosCleanup.mjs
@@ -1,7 +1,7 @@
 import async from 'async';
 import db from '../store/db.mjs';
 import config from '../config.js';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 function clearScenariosTables(cb) {
   const currentWeek = utility.epochWeek();
   async.parallel(

diff --git a/svc/syncSubs.mjs b/svc/syncSubs.mjs
@@ -1,5 +1,5 @@
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 import stripeLib from 'stripe';
 const stripe = stripeLib(config.STRIPE_SECRET);

diff --git a/svc/teams.mjs b/svc/teams.mjs
@@ -1,6 +1,6 @@
 import async from 'async';
 import db from '../store/db.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import queries from '../store/queries.mjs';
 const { invokeInterval } = utility;
 function doTeams(cb) {

diff --git a/svc/web.mjs b/svc/web.mjs
@@ -17,7 +17,7 @@ import api from '../routes/api.mjs';
 import queries from '../store/queries.mjs';
 import db from '../store/db.mjs';
 import redis from '../store/redis.mjs';
-import utility from '../util/utility.js';
+import utility from '../util/utility.mjs';
 import config from '../config.js';
 const SteamStrategy = passportSteam.Strategy;
 const stripe = stripeLib(config.STRIPE_SECRET);

diff --git a/util/compute.mjs b/util/compute.mjs
@@ -1,5 +1,5 @@
 import constants from 'dotaconstants';
-import utility from './utility.js';
+import utility from './utility.mjs';
 const { max, min, isRadiant } = utility;
 const { ancients } = constants;
 /**

diff --git a/util/filter.mjs b/util/filter.mjs
@@ -1,4 +1,4 @@
-import utility from './utility.js';
+import utility from './utility.mjs';
 const { isRadiant } = utility;
 function filter(matches, filters) {
   const curtime = Math.floor(Date.now() / 1000);

diff --git a/util/laneMappings.js → util/laneMappings.mjs b/util/laneMappings.js → util/laneMappings.mjs
@@ -22,4 +22,4 @@ for (let i = 0; i < 128; i += 1) {
     laneMappings[i].push(lane);
   }
 }
-module.exports = laneMappings;
+export default laneMappings;