Fixed yarn, babel and other problem which occured after dependencies version bump (#30)

* rollup import fix

* babel fix

* Update .gitignore

Co-authored-by: Maksymilian Gala <94986692+maxidragon@users.noreply.github.com>

* removed type: module from package.json

* support both es import and cjs require

* replaced libraries which doesn't support both mjs and cjs

Author: BaderBC

.babelrc

@@ -8,6 +8,8 @@
     "@babel/proposal-object-rest-spread",
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
     ["@babel/proposal-class-properties", { "loose": true }],
-    "babel-plugin-transform-typescript-metadata"
+    "babel-plugin-transform-typescript-metadata",
+    ["@babel/plugin-transform-private-property-in-object", { "loose": true }],
+    ["@babel/plugin-transform-private-methods", { "loose": true }]
   ]
 }

.gitignore

@@ -118,3 +118,7 @@ keystore.json
 
 # Other package managers
 pnpm-lock.yaml
+
+# IDE's
+.idea/
+.vscode/

package.json

@@ -1,22 +1,27 @@
 {
+  "main": "lib/index.js",
   "name": "vulcan-api-js",
   "version": "3.5.2",
   "description": "Unofficial API for UONET+ e-register from Vulcan.",
-  "main": "lib/index.js",
   "scripts": {
-    "prepublish": "rollup -c & yarn tsc",
+    "prepublish": "rollup -c rollup.config.mjs & yarn tsc",
     "type-check": "tsc"
   },
   "repository": "https://github.com/avorty/vulcan-api-js.git",
   "homepage": "https://avorty.github.io/vulcan-api-js",
   "author": "Avorty",
   "license": "MIT",
+  "type": "module",
+  "exports": {
+    "require": "./lib/index.cjs",
+    "import": "./lib/index.js"
+  },
   "dependencies": {
     "@babel/runtime": "^7.23.6",
     "axios": "^1.6.2",
     "buffer": "^6.0.3",
-    "dateformat": "^5.0.3",
-    "node-fetch": "^3.3.2",
+    "cross-fetch": "^4.0.0",
+    "moment": "^2.29.4",
     "node-forge": "^1.3.1",
     "querystring": "^0.2.1",
     "reflect-metadata": "^0.2.1",
@@ -27,6 +32,7 @@
     "@babel/core": "^7.23.6",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.23.6",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-transform-runtime": "^7.23.6",
     "@babel/preset-env": "^7.23.6",
     "@babel/preset-typescript": "^7.23.3",

rollup.config.js rollup.config.mjsrollup.config.js renamed to rollup.config.mjs

@@ -2,12 +2,15 @@ import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
 import babel from '@rollup/plugin-babel';
 import json from '@rollup/plugin-json';
-import pkg from './package.json';
+import fs from 'fs';
 
 const extensions = [
   '.js', '.jsx', '.ts', '.tsx',
 ];
 
+const packageRaw = fs.readFileSync("./package.json");
+const pkg = JSON.parse(packageRaw);
+
 const name = 'RollupTypeScriptBabel';
 
 export default {
@@ -29,8 +32,14 @@ export default {
     babel({ extensions, include: ['src/**/*'], babelHelpers: 'runtime' }),
   ],
 
-  output: [{
-    file: pkg.main,
-    format: 'cjs',
-  }]
-};
+  output: [
+    {
+      file: pkg.exports.import,
+      format: 'es',
+    },
+    {
+      file: pkg.exports.require,
+      format: 'cjs',
+    },
+  ],
+};

src/api.ts

@@ -1,5 +1,5 @@
 import { Keystore } from "./keystore";
-import fetch from "node-fetch";
+import "cross-fetch/polyfill";
 import { getSignatureValues } from "./signer";
 import { ApiHelper } from "./apiHelper";
 import {

src/apiHelper.ts

@@ -1,4 +1,4 @@
-import dateFormat from "dateformat";
+import moment from 'moment';
 import { Api } from "./api";
 import {
   DATA_BY_MESSAGEBOX,
@@ -89,20 +89,19 @@ export class ApiHelper {
         break;
     }
     if (dateFrom) {
-      query["dateFrom"] = dateFormat(dateFrom, "yyyy-mm-dd");
+      query["dateFrom"] = moment(dateFrom).format("yyyy-mm-dd");
     }
     if (dateTo) {
-      query["dateTo"] = dateFormat(dateTo, "yyyy-mm-dd");
+      query["dateTo"] = moment(dateTo).format("yyyy-mm-dd");
     }
     if (folder) {
       query['folder'] = folder;
     }
     query["lastId"] = "-2147483648"; // Comment from vulcan-api for python: don't ask, it's just Vulcan
     query["pageSize"] = 500;
-    query["lastSyncDate"] = dateFormat(
-      lastSync || new Date("1970"),
-      "yyyy-mm-dd HH:MM:ss"
-    );
+    query["lastSyncDate"] = moment(
+        lastSync || new Date("1970"),
+    ).format("yyyy-mm-dd HH:MM:ss");
 
     if (params) {
       query = { ...query, ...params };

src/index.ts

@@ -15,6 +15,7 @@ import { Keystore } from "./keystore";
 import { APP_OS, getBaseUrl, uuid } from "./utils";
 import { FilterType } from "./apiHelper";
 import dateFormat from "dateformat";
+import moment from "moment";
 import { Account, ChangedLesson, Grade, Lesson, LuckyNumber, Student, MessageBox, Message, Homework, Attendance, Exam } from "./models";
 
 export { AccountTools } from "./utils";
@@ -62,7 +63,7 @@ export class VulcanHebe {
   }
 
   public async getStudents() {
-    const data = await this.api.get(STUDENT_LIST);
+    const data: any = await this.api.get(STUDENT_LIST);
     const studentsToReturn: Student[] = data.map(
       (item: any): Student => new Student().serialize(item)
     );
@@ -120,7 +121,7 @@ export class VulcanHebe {
   public async getLuckyNumber(): Promise<LuckyNumber> {
     const data = await this.api.helper.getData(DATA_LUCKY_NUMBER, {
       constituentId: this.api.student.school.id,
-      day: dateFormat(new Date(), "yyyy-mm-dd"),
+      day: moment().format("yyyy-mm-dd"),
     });
     return new LuckyNumber().serialize(data);
   }

src/utils.ts

@@ -1,4 +1,4 @@
-import dateFormat from "dateformat";
+import moment from 'moment';
 
 import forge from "node-forge";
 
@@ -128,10 +128,7 @@ export const generateKeyPair = async () => {
   return { certificate, fingerprint, privateKey: privateKeyToReturn };
 };
 
-export const nowIso = () => {
-  const date = new Date();
-  return dateFormat(date, "yyyy-mm-dd HH:MM:ss");
-};
+export const nowIso = () => moment().format('YYYY-MM-DD HH:mm:ss');
 
 export class AccountTools {
   public static loadFromObject(account: {

tsconfig.json

@@ -22,6 +22,7 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
     /* Strict Type-Checking Options */
     "strict": true /* Enable all strict type-checking options. */,
+    "resolveJsonModule": true,
     // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */