simply-xp 2.0.0-dev.2 → 2.0.0-dev.2-fix.0

package/lib/src/add.js

@@ -9,7 +9,7 @@
  * @link `Documentation:` https://simplyxp.js.org/docs/addlevel
  * @returns {Promise<UserResult>} - Object of user data on success
  * @throws {XpFatal} - If parameters are not provided correctly
- */async function addLevel(userId,guildId,level,username){if(!userId)throw new xplogs_1.XpFatal({function:"addLevel()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"addLevel()",message:"Guild ID was not provided"});if(!level)throw new xplogs_1.XpFatal({function:"addLevel()",message:"Level was not provided"});var e=await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}});if(e)return database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:e.level+level,xp:(0,utilities_1.convertFrom)(level+e.level)}});if(xp_1.xp.auto_create&&username)return database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:level,xp:(0,utilities_1.convertFrom)(level)}});throw new xplogs_1.XpFatal({function:"addLevel()",message:"User does not exist"})}
+ */async function addLevel(userId,guildId,level,username){if(!userId)throw new xplogs_1.XpFatal({function:"addLevel()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"addLevel()",message:"Guild ID was not provided"});if(isNaN(level))throw new xplogs_1.XpFatal({function:"addLevel()",message:"Level was not provided"});var e=await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}});if(e)return database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:e.level+level,xp:(0,utilities_1.convertFrom)(level+e.level)}});if(xp_1.xp.auto_create&&username)return database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:level,xp:(0,utilities_1.convertFrom)(level)}});throw new xplogs_1.XpFatal({function:"addLevel()",message:"User does not exist"})}
 /**
  * Add XP to a user.
  * @async

package/lib/src/connect.js

@@ -10,28 +10,15 @@
  * @throws {XpFatal} If an invalid type is provided or if the value is not provided.
  */async function connect(uri,options={type:void 0}){var e,{type:t,auto_create:o,auto_purge:r,notify:a,debug:n}=options;if(!uri)throw new xplogs_1.XpFatal({function:"connect()",message:"No URI Provided"});switch(!1===a&&(xp_1.xp.notify=!1),o&&(xp_1.xp.auto_create=!0),r&&(xp_1.xp.auto_purge=!0),n&&(xp_1.xp.debug=!0),t||(options.type="mongodb",xplogs_1.XpLog.warn("connect()","Database type not provided, defaulting to MongoDB")),t){case"mongodb":if(e=(await Promise.resolve().then(()=>__importStar(require("mongodb")))).MongoClient,!await checkPackageVersion("mongodb"))return xplogs_1.XpLog.err("connect()","MongoDB V4 or higher is required");e=await e.connect(uri).catch(error=>{throw new xplogs_1.XpFatal({function:"connect()",message:error.message})}),xp_1.xp.dbType="mongodb",xp_1.xp.database=e||void 0;break;case"sqlite":try{var[s,i]=await Promise.all([Promise.resolve().then(()=>__importStar(require("better-sqlite3"))),checkPackageVersion("sqlite")]);if(!i)return xplogs_1.XpLog.err("connect()","better-sqlite3 V7 or higher is required");xp_1.xp.database=new s.default(uri),xp_1.xp.dbType="sqlite",xp_1.xp.database.exec(`CREATE TABLE IF NOT EXISTS "simply-xps"
                               (
-                                  user
-                                  TEXT
-                                  UNIQUE,
-                                  guild
-                                  TEXT,
-                                  xp
-                                  INTEGER
-                                  DEFAULT
-                                  0,
-                                  level
-                                  INTEGER
-                                  DEFAULT
-                                  0
+                                  user  TEXT UNIQUE,
+                                  guild TEXT,
+                                  name  TEXT    DEFAULT NULL,
+                                  level INTEGER DEFAULT 0,
+                                  xp    INTEGER DEFAULT 0
                               )`),xp_1.xp.database.exec(`CREATE TABLE IF NOT EXISTS "simply-xp-levelroles"
                               (
-                                  gid
-                                  TEXT
-                                  UNIQUE,
-                                  lvlrole
-                                  TEXT
-                                  NOT
-                                  NULL
+                                  gid     TEXT UNIQUE,
+                                  lvlrole TEXT NOT NULL
                               )`)}catch(t){if("object"==typeof t&&null!==t&&void 0!==(e=t).code&&"MODULE_NOT_FOUND"!==e.code)throw new xplogs_1.XpFatal({function:"connect()",message:e.message})}break;default:throw new xplogs_1.XpFatal({function:"connect()",message:"DATABASE TYPE NOT PROVIDED OR INVALID"})}return!!xp_1.xp.database&&(xplogs_1.XpLog.info("connect()","Connected to database!"),!0)}
 /**
  * Returns the package manager used

package/lib/src/functions/database.js

@@ -5,7 +5,8 @@
  * @param {string} functionName
  * @returns {void}
  * @private
- */function handleError(error,functionName){throw new xplogs_1.XpFatal({function:"db."+functionName,message:error})}Object.defineProperty(exports,"__esModule",{value:!0}),exports.db=void 0;const xplogs_1=require("./xplogs"),xp_1=require("../../xp");class db{
+ */
+function handleError(error,functionName){throw new xplogs_1.XpFatal({function:"db."+functionName,message:error})}Object.defineProperty(exports,"__esModule",{value:!0}),exports.db=void 0;const xplogs_1=require("./xplogs"),xp_1=require("../../xp");class db{
 /**
      * Creates one document in the database.
      *
@@ -15,7 +16,7 @@
      * @returns {Promise<UserResult | LevelRoleResult>} The created document.
      * @throws {XpFatal} Throws an error if there is no database connection.
      */
-static async createOne(query){if(!xp_1.xp.database)throw new xplogs_1.XpFatal({function:"createOne()",message:"No database connection"});let e;switch(xp_1.xp.dbType){case"mongodb":e=xp_1.xp.database.db().collection(query.collection).insertOne(query.data).catch(error=>handleError(error,"createOne()"));break;case"sqlite":e="simply-xps"===query.collection?xp_1.xp.database.prepare('INSERT INTO "simply-xps" (user, guild, xp, level) VALUES (?, ?, ?, ?)').run(query.data.user,query.data.guild,query.data.xp,query.data.level):xp_1.xp.database.prepare('INSERT INTO "simply-xp-levelroles" (guild, level, role) VALUES (?, ?, ?)').run(query.data.guild,query.data.level,query.data.roles)}return e}
+static async createOne(query){if(!xp_1.xp.database)throw new xplogs_1.XpFatal({function:"createOne()",message:"No database connection"});let e;switch(xp_1.xp.dbType){case"mongodb":e=xp_1.xp.database.db().collection(query.collection).insertOne(query.data).catch(error=>handleError(error,"createOne()"));break;case"sqlite":e="simply-xps"===query.collection?xp_1.xp.database.prepare('INSERT INTO "simply-xps" (user, guild, xp, level, name) VALUES (?, ?, ?, ?, ?)').run(query.data.user,query.data.guild,query.data.xp,query.data.level,query.data?.name):xp_1.xp.database.prepare('INSERT INTO "simply-xp-levelroles" (guild, level, role) VALUES (?, ?, ?)').run(query.data.guild,query.data.level,query.data.roles)}return e}
 /**
      * Deletes one document from the database.
      *
@@ -53,4 +54,4 @@ static async createOne(query){if(!xp_1.xp.database)throw new xplogs_1.XpFatal({f
      * @link https://simplyxp.js.org/docs/handlers/database#updateOne Documentation
      * @returns {Promise<UserResult | LevelRoleResult>} The updated document.
      * @throws {XpFatal} Throws an error if there is no database connection.
-     */static async updateOne(filter,update,options){if(!xp_1.xp.database)throw new xplogs_1.XpFatal({function:"updateOne()",message:"No database connection"});switch(xp_1.xp.dbType){case"mongodb":await xp_1.xp.database.db().collection(update.collection).updateOne(filter.data,{$set:update.data},options).catch(error=>handleError(error,"updateOne()"));break;case"sqlite":if("simply-xps"===filter.collection&&"simply-xps"===update.collection&&xp_1.xp.database.prepare('UPDATE "simply-xps" SET xp = ?, level = ? WHERE guild = ? AND user = ?').run(update.data.xp,update.data.level,filter.data.guild,filter.data.user),"simply-xps"!==filter.collection||"simply-xp-levelroles"!==update.collection)throw new xplogs_1.XpFatal({function:"updateOne()",message:"Collection mismatch, expected same collection on both filter and update."});xp_1.xp.database.prepare('UPDATE "simply-xp-levelroles" SET role = ? WHERE guild = ? AND level = ?').run(update.data.roles,filter.data.guild,filter.data.level)}return db.findOne(update)}}exports.db=db;
+     */static async updateOne(filter,update,options){if(!xp_1.xp.database)throw new xplogs_1.XpFatal({function:"updateOne()",message:"No database connection"});switch(xp_1.xp.dbType){case"mongodb":await xp_1.xp.database.db().collection(update.collection).updateOne(filter.data,{$set:update.data},options).catch(error=>handleError(error,"updateOne()"));break;case"sqlite":if("simply-xps"===filter.collection&&"simply-xps"===update.collection)xp_1.xp.database.prepare('UPDATE "simply-xps" SET xp = ?, level = ?, name = ? WHERE guild = ? AND user = ?').run(update.data.xp,update.data.level,update.data?.name,filter.data.guild,filter.data?.user);else{if("simply-xp-levelroles"!==filter.collection||"simply-xp-levelroles"!==update.collection)throw new xplogs_1.XpFatal({function:"updateOne()",message:"Collection mismatch, expected same collection on both filter and update."});xp_1.xp.database.prepare('UPDATE "simply-xp-levelroles" SET role = ? WHERE guild = ? AND level = ?').run(update.data.roles,filter.data.guild,filter.data.level)}}return db.findOne(update)}}exports.db=db;

package/lib/src/functions/utilities.js

@@ -7,7 +7,7 @@
  * @link `Documentation:` https://simplyxp.js.org/docs/utilities/convert
  * @returns {number} - The converted value. (XP to level or level to XP)
  * @throws {XpFatal} If an invalid type is provided or if the value is not provided.
- */function convertFrom(value,type="level"){if(!value)throw new xplogs_1.XpFatal({function:"convertFrom()",message:"Value was not provided"});if("xp"!==type&&"level"!==type)throw new xplogs_1.XpFatal({function:"convert()",message:"Invalid type provided"});if("level"===type)return Math.pow(value/.1,2);if("xp"===type)return Math.floor(.1*Math.sqrt(value));throw new xplogs_1.XpFatal({function:"convertFrom()",message:"Invalid type provided"})}
+ */function convertFrom(value,type="level"){if(isNaN(value))throw new xplogs_1.XpFatal({function:"convertFrom()",message:"Value was not provided"});if("xp"!==type&&"level"!==type)throw new xplogs_1.XpFatal({function:"convert()",message:"Invalid type provided"});if("level"===type)return Math.pow(value/.1,2);if("xp"===type)return Math.floor(.1*Math.sqrt(value));throw new xplogs_1.XpFatal({function:"convertFrom()",message:"Invalid type provided"})}
 /**
  * Updates the options of the XP client.
  * @param {NewClientOptions} clientOptions - The new options to update.

package/lib/src/set.js

@@ -9,7 +9,7 @@
  * @link `Documentation:` https://simplyxp.js.org/docs/setlevel
  * @returns {Promise<UserResult>} - Object of user data on success
  * @throws {XpFatal} - If parameters are not provided correctly
- */async function setLevel(userId,guildId,level,username){if(!userId)throw new xplogs_1.XpFatal({function:"setLevel()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"setLevel()",message:"Guild ID was not provided"});if(!level)throw new xplogs_1.XpFatal({function:"setLevel()",message:"Level was not provided"});if(await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}}))return database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:level,xp:(0,utilities_1.convertFrom)(level)}});if(xp_1.xp.auto_create&&username)return database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:level,xp:(0,utilities_1.convertFrom)(level)}});throw new xplogs_1.XpFatal({function:"setLevel()",message:"User does not exist"})}
+ */async function setLevel(userId,guildId,level,username){if(!userId)throw new xplogs_1.XpFatal({function:"setLevel()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"setLevel()",message:"Guild ID was not provided"});if(isNaN(level))throw new xplogs_1.XpFatal({function:"setLevel()",message:"Level was not provided"});if(await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}}))return database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:level,xp:(0,utilities_1.convertFrom)(level)}});if(xp_1.xp.auto_create&&username)return database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:level,xp:(0,utilities_1.convertFrom)(level)}});throw new xplogs_1.XpFatal({function:"setLevel()",message:"User does not exist"})}
 /**
  * Set user XP
  * @async
@@ -20,4 +20,4 @@
  * @link `Documentation:` https://simplyxp.js.org/docs/setxp
  * @returns {Promise<XPResult>} - Object of user data on success
  * @throws {XpFatal} - If parameters are not provided correctly
- */async function setXP(userId,guildId,xpData,username){if(!userId)throw new xplogs_1.XpFatal({function:"setXP()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"setXP()",message:"Guild ID was not provided"});if(!xpData)throw new xplogs_1.XpFatal({function:"setXP()",message:"XP was not provided"});var e=await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}});let s;if(e)s=await database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:(0,utilities_1.convertFrom)(xpData),xp:xpData}});else{if(!xp_1.xp.auto_create||!username)throw new xplogs_1.XpFatal({function:"setXP()",message:"User does not exist"});s=await database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:(0,utilities_1.convertFrom)(xpData),xp:xpData}})}return{...s,hasLevelledUp:s.level>e.level}}Object.defineProperty(exports,"__esModule",{value:!0}),exports.setXP=exports.setLevel=void 0;const xplogs_1=require("./functions/xplogs"),utilities_1=require("./functions/utilities"),database_1=require("./functions/database"),xp_1=require("../xp");exports.setLevel=setLevel,exports.setXP=setXP;
+ */async function setXP(userId,guildId,xpData,username){if(!userId)throw new xplogs_1.XpFatal({function:"setXP()",message:"User ID was not provided"});if(!guildId)throw new xplogs_1.XpFatal({function:"setXP()",message:"Guild ID was not provided"});if(isNaN(xpData))throw new xplogs_1.XpFatal({function:"setXP()",message:"XP was not provided"});var e=await database_1.db.findOne({collection:"simply-xps",data:{user:userId,guild:guildId}});let s;if(e)s=await database_1.db.updateOne({collection:"simply-xps",data:{user:userId,guild:guildId}},{collection:"simply-xps",data:{user:userId,guild:guildId,level:(0,utilities_1.convertFrom)(xpData),xp:xpData}});else{if(!xp_1.xp.auto_create||!username)throw new xplogs_1.XpFatal({function:"setXP()",message:"User does not exist"});s=await database_1.db.createOne({collection:"simply-xps",data:{guild:guildId,user:userId,name:username,level:(0,utilities_1.convertFrom)(xpData),xp:xpData}})}return{...s,hasLevelledUp:s.level>e.level}}Object.defineProperty(exports,"__esModule",{value:!0}),exports.setXP=exports.setLevel=void 0;const xplogs_1=require("./functions/xplogs"),utilities_1=require("./functions/utilities"),database_1=require("./functions/database"),xp_1=require("../xp");exports.setLevel=setLevel,exports.setXP=setXP;

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "simply-xp",
-  "version": "2.0.0-dev.2",
-  "description": "The easiest way to implement xp system",
-  "main": "lib/xp.js",
-  "scripts": {
-    "beta": "node Tests/clean.mjs && pnpm update && npm publish --tag beta",
-    "clean": "node Tests/clean.mjs",
-    "dev": "node Tests/clean.mjs && pnpm update && npm publish --tag dev",
-    "docs": "node Tests/jsdocs.cjs",
-    "latest": "node Tests/clean.mjs && pnpm update && npm publish",
-    "test": "node Tests/clean.mjs && node Tests/test.cjs"
-  },
-  "author": "Abadima",
-  "keywords": [
-    "amaribot",
-    "charts",
-    "discord",
-    "discord.js",
-    "discord-xp",
-    "easy",
-    "fun",
-    "guilded",
-    "leaderboard",
-    "level role",
-    "level up",
-    "mee6",
-    "mongodb",
-    "package",
-    "simply",
-    "simply-djs",
-    "simplydjs",
-    "sqlite",
-    "system",
-    "xp"
-  ],
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Rahuletto/simply-xp.git"
-  },
-  "dependencies": {
-    "@napi-rs/canvas": "^0.1.41"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.4",
-    "@types/node": "^20.4.8",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
-    "better-sqlite3": "8.5.0",
-    "discord.js": "^14.12.1",
-    "eslint": "^8.46.0",
-    "guilded.ts": "^0.20.2",
-    "jsdoc-to-markdown": "^8.0.0",
-    "mongodb": "5.7.0",
-    "typescript": "^5.1.6",
-    "uglify-js": "^3.17.4"
-  },
-  "engines": {
-    "node": ">=15.5.0"
-  },
-  "bugs": {
-    "url": "https://github.com/Rahuletto/simply-xp/issues"
-  },
-  "homepage": "https://simplyxp.js.org",
-  "directories": {
-    "doc": "Mini_Docs",
-    "lib": "lib"
-  }
-}
+{
+  "name": "simply-xp",
+  "version": "2.0.0-dev.2-fix.0",
+  "description": "The easiest way to implement xp system",
+  "main": "lib/xp.js",
+  "scripts": {
+    "beta": "node Tests/clean.mjs && pnpm update && npm publish --tag beta",
+    "clean": "node Tests/clean.mjs",
+    "dev": "node Tests/clean.mjs && pnpm update && npm publish --tag dev",
+    "docs": "node Tests/jsdocs.cjs",
+    "latest": "node Tests/clean.mjs && pnpm update && npm publish",
+    "test": "node Tests/clean.mjs && node Tests/test.cjs"
+  },
+  "author": "Abadima",
+  "keywords": [
+    "amaribot",
+    "charts",
+    "discord",
+    "discord.js",
+    "discord-xp",
+    "easy",
+    "fun",
+    "guilded",
+    "leaderboard",
+    "level role",
+    "level up",
+    "mee6",
+    "mongodb",
+    "package",
+    "simply",
+    "simply-djs",
+    "simplydjs",
+    "sqlite",
+    "system",
+    "xp"
+  ],
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Rahuletto/simply-xp.git"
+  },
+  "dependencies": {
+    "@napi-rs/canvas": "^0.1.41"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.4",
+    "@types/node": "^20.4.8",
+    "@typescript-eslint/eslint-plugin": "^6.3.0",
+    "@typescript-eslint/parser": "^6.3.0",
+    "better-sqlite3": "8.5.0",
+    "discord.js": "^14.12.1",
+    "eslint": "^8.46.0",
+    "guilded.ts": "^0.20.2",
+    "jsdoc-to-markdown": "^8.0.0",
+    "mongodb": "5.7.0",
+    "typescript": "^5.1.6",
+    "uglify-js": "^3.17.4"
+  },
+  "engines": {
+    "node": ">=15.5.0"
+  },
+  "bugs": {
+    "url": "https://github.com/Rahuletto/simply-xp/issues"
+  },
+  "homepage": "https://simplyxp.js.org",
+  "directories": {
+    "doc": "Mini_Docs",
+    "lib": "lib"
+  }
+}