Fixes and Build

ReplAPI-it · Apr 28, 2021 · 3c34125 · 3c34125
1 parent d39b888
commit 3c34125
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 67 deletions.
diff --git a/commonjs/index.js b/commonjs/index.js
@@ -17,7 +17,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _jsonStableStringifyWithoutJsonify = _interopRequireDefault(require("json-stable-stringify-without-jsonify"));
 
-var _source = _interopRequireDefault(require("./src/source.mjs"));
+var _source = _interopRequireDefault(require("./src/source.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Blog.js b/commonjs/src/classes/Blog.js
@@ -11,6 +11,8 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -25,13 +27,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 var parser = new _rssParser["default"]();
 var exportable;
-var isExperimentalFeaturesEnabled;
-
-if (_fs["default"].existsSync(_path["default"].join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(_fs["default"].readFileSync(_path["default"].join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
 
-if (isExperimentalFeaturesEnabled) {
+if (_constants["default"].initVariables.experimentalFeatures) {
   exportable = /*#__PURE__*/function () {
     function Blog() {
       _classCallCheck(this, Blog);

diff --git a/commonjs/src/classes/Board.js b/commonjs/src/classes/Board.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Comment.js b/commonjs/src/classes/Comment.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Custom.js b/commonjs/src/classes/Custom.js
@@ -7,9 +7,9 @@ exports.CustomRecursiveQuery = exports.CustomDataQuery = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Database.js b/commonjs/src/classes/Database.js
@@ -15,6 +15,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _crypto = _interopRequireDefault(require("crypto"));
 
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -55,13 +57,8 @@ function compare(value, hashData) {
 }
 
 var exportable;
-var isExperimentalFeaturesEnabled;
-
-if (_fs["default"].existsSync(_path["default"].join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(_fs["default"].readFileSync(_path["default"].join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
 
-if (isExperimentalFeaturesEnabled) {
+if (_constants["default"].initVariables.experimentalFeatures) {
   exportable = /*#__PURE__*/function () {
     function Database(dbToken) {
       var salt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';

diff --git a/commonjs/src/classes/Leaderboard.js b/commonjs/src/classes/Leaderboard.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Login.js b/commonjs/src/classes/Login.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Notifications.js b/commonjs/src/classes/Notifications.js
@@ -11,9 +11,9 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -28,13 +28,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var exportable;
-var isExperimentalFeaturesEnabled;
 
-if (_fs["default"].existsSync(_path["default"].join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(_fs["default"].readFileSync(_path["default"].join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
-
-if (isExperimentalFeaturesEnabled) {
+if (_constants["default"].initVariables.experimentalFeatures) {
   exportable = /*#__PURE__*/function () {
     function Notifications() {
       _classCallCheck(this, Notifications);

diff --git a/commonjs/src/classes/Post.js b/commonjs/src/classes/Post.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/Repl.js b/commonjs/src/classes/Repl.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/classes/User.js b/commonjs/src/classes/User.js
@@ -7,9 +7,9 @@ exports["default"] = void 0;
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
-var _headers = _interopRequireDefault(require("../utils/headers.mjs"));
+var _headers = _interopRequireDefault(require("../utils/headers.js"));
 
-var _constants = _interopRequireDefault(require("../utils/constants.mjs"));
+var _constants = _interopRequireDefault(require("../utils/constants.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/commonjs/src/source.js b/commonjs/src/source.js
@@ -5,29 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _Blog = _interopRequireDefault(require("./classes/Blog.mjs"));
+var _Blog = _interopRequireDefault(require("./classes/Blog.js"));
 
-var _Board = _interopRequireDefault(require("./classes/Board.mjs"));
+var _Board = _interopRequireDefault(require("./classes/Board.js"));
 
-var _Comment = _interopRequireDefault(require("./classes/Comment.mjs"));
+var _Comment = _interopRequireDefault(require("./classes/Comment.js"));
 
-var _Custom = require("./classes/Custom.mjs");
+var _Custom = require("./classes/Custom.js");
 
-var _Database = _interopRequireDefault(require("./classes/Database.mjs"));
+var _Database = _interopRequireDefault(require("./classes/Database.js"));
 
-var _Languages = _interopRequireDefault(require("./classes/Languages.mjs"));
+var _Languages = _interopRequireDefault(require("./classes/Languages.js"));
 
-var _Leaderboard = _interopRequireDefault(require("./classes/Leaderboard.mjs"));
+var _Leaderboard = _interopRequireDefault(require("./classes/Leaderboard.js"));
 
-var _Login = _interopRequireDefault(require("./classes/Login.mjs"));
+var _Login = _interopRequireDefault(require("./classes/Login.js"));
 
-var _Notifications = _interopRequireDefault(require("./classes/Notifications.mjs"));
+var _Notifications = _interopRequireDefault(require("./classes/Notifications.js"));
 
-var _Post = _interopRequireDefault(require("./classes/Post.mjs"));
+var _Post = _interopRequireDefault(require("./classes/Post.js"));
 
-var _Repl = _interopRequireDefault(require("./classes/Repl.mjs"));
+var _Repl = _interopRequireDefault(require("./classes/Repl.js"));
 
-var _User = _interopRequireDefault(require("./classes/User.mjs"));
+var _User = _interopRequireDefault(require("./classes/User.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

diff --git a/esm/src/classes/Blog.mjs b/esm/src/classes/Blog.mjs
@@ -2,15 +2,13 @@ import Parser from 'rss-parser';
 import fs from 'fs';
 import path from 'path';
 
+import constants from '../utils/constants.mjs';
+
 const parser = new Parser();
 
 let exportable;
-let isExperimentalFeaturesEnabled;
-if (fs.existsSync(path.join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(fs.readFileSync(path.join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
 
-if (isExperimentalFeaturesEnabled) {
+if (constants.initVariables.experimentalFeatures) {
   exportable = class Blog {
     async blogData() {
       const feed = await parser.parseURL('https://blog.replit.com/feed.xml');

diff --git a/esm/src/classes/Database.mjs b/esm/src/classes/Database.mjs
@@ -4,6 +4,8 @@ import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
 
+import constants from '../utils/constants.mjs';
+
 function hash(value, salt) {
   const hashItem = crypto.createHmac('sha512', salt);
   hashItem.update(value);
@@ -23,12 +25,8 @@ function compare(value, hashData) {
 }
 
 let exportable;
-let isExperimentalFeaturesEnabled;
-if (fs.existsSync(path.join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(fs.readFileSync(path.join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
 
-if (isExperimentalFeaturesEnabled) {
+if (constants.initVariables.experimentalFeatures) {
   exportable = class Database {
     constructor(dbToken, salt = '', options = {}) {
       if (!process.env.REPLIT_DB_URL) throw new Error('Please run the Database Class on a Replit Project only.');

diff --git a/esm/src/classes/Notifications.mjs b/esm/src/classes/Notifications.mjs
@@ -6,12 +6,8 @@ import headers from '../utils/headers.mjs';
 import constants from '../utils/constants.mjs';
 
 let exportable;
-let isExperimentalFeaturesEnabled;
-if (fs.existsSync(path.join(process.cwd(), '.replapirc.json'))) {
-  isExperimentalFeaturesEnabled = JSON.parse(fs.readFileSync(path.join(process.cwd(), '.replapirc.json'))).experimentalFeatures;
-}
 
-if (isExperimentalFeaturesEnabled) {
+if (constants.initVariables.experimentalFeatures) {
   exportable = class Notifications {
     async postReplyNotification(after, count) {
       if (!global.cookies) {

diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
   "module": "./esm/index.mjs",
   "scripts": {
     "start": "node esm/index.mjs",
+    "test": "node tests/common.test.js --experimental-conditional-exports & node tests/esm.test.mjs --experimental-conditional-exports",
     "test:commonjs": "node tests/common.test.js --experimental-conditional-exports",
     "test:esm": "node tests/esm.test.mjs --experimental-conditional-exports",
     "build": "babel esm --out-dir commonjs",

diff --git a/tests/common.test.js b/tests/common.test.js
@@ -3,4 +3,32 @@ const replapi = ReplAPI({
 	username: 'RayhanADev',
 });
 
-console.log(replapi);
+const replapiClasses = [
+  'Blog',
+  'Board',
+  'Comment',
+  'CustomDataQuery',
+  'CustomRecursiveQuery',
+  'Database',
+  'Languages',
+  'Leaderboard',
+  'Login',
+  'Notifications',
+  'Post',
+  'Repl',
+  'User',
+]
+
+const containsAll = (obj, arr) => {
+   for(const str of arr){
+      if(Object.keys(obj).includes(str)) {
+        continue;
+      } else {
+        return false;
+      }
+   }
+
+   return true;
+};
+
+console.log(`CommonJS Test: ${containsAll(replapi, replapiClasses) ? 'Passing' : 'Fail'}`);
diff --git a/tests/esm.test.mjs b/tests/esm.test.mjs
@@ -1,6 +1,34 @@
 import ReplAPI from '../esm/index.mjs';
 const replapi = ReplAPI({
-	username: 'RayhanADev'
+	username: 'RayhanADev',
 });
 
-console.log(replapi);
+const replapiClasses = [
+  'Blog',
+  'Board',
+  'Comment',
+  'CustomDataQuery',
+  'CustomRecursiveQuery',
+  'Database',
+  'Languages',
+  'Leaderboard',
+  'Login',
+  'Notifications',
+  'Post',
+  'Repl',
+  'User',
+]
+
+const containsAll = (obj, arr) => {
+   for(const str of arr){
+      if(Object.keys(obj).includes(str)) {
+        continue;
+      } else {
+        return false;
+      }
+   }
+
+   return true;
+};
+
+console.log(`ESM Test: ${containsAll(replapi, replapiClasses) ? 'Passing' : 'Fail'}`);