Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
remove parseSequelizeURI, fix some utils functions. Add tests for Utils
Browse files Browse the repository at this point in the history
  • Loading branch information
Hatry1337 committed Mar 15, 2022
1 parent 87afb29 commit 0273f20
Show file tree
Hide file tree
Showing 9 changed files with 347 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
npm i
fi
- run: npm run build
- run: npm run test
- run: npm test

publish-npm:
needs: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
npm i
fi
- run: npm run build
- run: npm run test
- run: npm test
env:
DISCORD_TOKEN: ${{secrets.discord_token}}
DATABASE_URI: ${{secrets.db_uri}}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/node_modules
/dist/**
/docs/**
/coverage/**
package-lock.json
*.env
*.log
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/node_modules
/docs
/coverage
package-lock.json
*.env
*.log
195 changes: 195 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
/*
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/tmp/jest_rs",

// Automatically clear mock calls, instances and results before every test
// clearMocks: false,

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
preset: 'ts-jest',

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rainbowbot-core",
"version": "3.4.5",
"version": "3.5.0",
"description": "RainbowBOT Core",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand All @@ -9,7 +9,7 @@
"build": "tsc",
"docs": "npx typedoc",
"prepublish": "npm run build",
"test": "echo No tests specified."
"test": "npx jest"
},
"author": {
"name": "Hatry1337"
Expand All @@ -30,9 +30,12 @@
"sqlite3": "^4.2.0"
},
"devDependencies": {
"@types/jest": "^27.4.1",
"@types/node": "^15.14.9",
"@types/sequelize": "^4.28.11",
"@types/validator": "^13.7.1",
"jest": "^27.5.1",
"ts-jest": "^27.1.3",
"typedoc": "^0.22.13",
"typedoc-plugin-discordjs-types": "^1.0.3",
"typedoc-plugin-eventemitter3": "^0.22.0",
Expand Down
69 changes: 13 additions & 56 deletions src/Utils.ts
Original file line number Diff line number Diff line change
@@ -1,51 +1,6 @@
import Discord from "discord.js";
import { SequelizeOptions } from "sequelize-typescript";
import { Dialect } from "sequelize/types";
import url from "url";
import path from "path";

export class Utils{
static parseSequelizeURI(uri: string){
let options: SequelizeOptions = {};
const urlParts = url.parse(arguments[0], true);
options.dialect = urlParts.protocol?.replace(/:$/, "") as Dialect;
options.host = urlParts.hostname as string;
if (options.dialect === "sqlite" && urlParts.pathname && !urlParts.pathname.startsWith("/:memory")) {
const storagePath = path.join(options.host, urlParts.pathname);
options.storage = path.resolve(options.storage || storagePath);
}
if (urlParts.pathname) {
options.database = urlParts.pathname.replace(/^\//, "");
}
if (urlParts.port) {
options.port = parseInt(urlParts.port);
}
if (urlParts.auth) {
const authParts = urlParts.auth.split(":");
options.username = authParts[0];
if (authParts.length > 1)
options.password = authParts.slice(1).join(":");
}
if (urlParts.query) {
if (urlParts.query.host) {
options.host = urlParts.query.host as string;
}
if (options.dialectOptions) {
Object.assign(options.dialectOptions, urlParts.query);
} else {
options.dialectOptions = urlParts.query;
if (urlParts.query.options) {
try {
const o = JSON.parse(urlParts.query?.options as string);
options.dialectOptions = Object.assign({ options: o }, options.dialectOptions);
} catch (e) {
}
}
}
}
return options;
}

static ErrMsg(message: string){
var embd = new Discord.MessageEmbed({
title: `${Emojis.RedErrorCross} ${message}`,
Expand All @@ -67,7 +22,9 @@ export class Utils{
* Pads specified `number` to `count` zeros
*/
static padz(count: number, number: number){
return String(number).padStart(count, '0');
let neg = number < 0;
if(neg) number = Math.abs(number);
return (neg ? "-" : "") + String(number).padStart(count, '0');
}

/**
Expand All @@ -79,7 +36,7 @@ export class Utils{

static parseID(raw_data: string) {
raw_data = raw_data?.toString();
if (raw_data?.startsWith("<<@")) {
if (raw_data?.startsWith("<<@")) { //idk where to search for this tag, if you have one, please leave issue.
return raw_data?.split(">")[1];
} else if (raw_data?.startsWith("<@!")) {
raw_data = raw_data?.replace(/\<\@\!/g, "");
Expand Down Expand Up @@ -107,22 +64,22 @@ export class Utils{
}

static valNum(num: number, from?: number, to?: number){
let flag = !num || isNaN(num) || !isFinite(num);
if(from){
flag = flag || num <= from;
if((!num && num !== 0) || isNaN(num) || !isFinite(num)) return false;
if(from || from === 0){
if(num < from) return false;
}
if(to){
flag = flag || num >= to;
if(to || to === 0){
if(num > to) return false;
}
return !flag || num === 0;
return true;
}

static extractDashParam(text: string, param: string){
var data;
var p_pos = text.indexOf(`--${param} `);
let data: string | undefined;
let p_pos = text.indexOf(`--${param}`);

if(p_pos !== -1){
var dhpos = text.indexOf(" --", p_pos + param.length + 3);
let dhpos = text.indexOf(" --", p_pos + param.length + 3);
if(dhpos !== -1){
data = text.slice(p_pos + param.length + 3, dhpos);
}else{
Expand Down
Loading

0 comments on commit 0273f20

Please sign in to comment.