Merge pull request #3 from arnim279/remove-import-map

Remove usages of import map

deno.json

@@ -1,6 +1,4 @@
 {
-  "importMap": "import_map.json",
-
   "lint": {
     "files": { "exclude": ["npm"] },
     "rules": {
@@ -10,7 +8,6 @@
         "explicit-function-return-type",
         "explicit-module-boundary-types",
         "eqeqeq",
-        "no-external-import",
         "ban-untagged-todo"
       ]
     }

deps.ts

@@ -0,0 +1,3 @@
+export * from "https://deno.land/[email protected]/testing/asserts.ts";
+export * from "https://deno.land/[email protected]/datetime/mod.ts";
+export * from "https://deno.land/[email protected]/http/mod.ts";

lib/datetime/Time.ts

@@ -1,5 +1,5 @@
 import { TimeUnits } from "./TimeUnits.ts";
-import { assert } from "std/testing/asserts.ts";
+import { assert } from "../../deps.ts";
 
 /** Helper for comparing the start and end times of lessons. By no means a replacement for {@link Date}. */
 export class Time {

lib/datetime/Time_test.ts

@@ -1,4 +1,4 @@
-import { assert } from "std/testing/asserts.ts";
+import { assert } from "../../deps.ts";
 import { Time } from "./mod.ts";
 
 Deno.test("Time.selectEarlier() - should work with different hours", () => {

lib/datetime/untis.ts

@@ -1,4 +1,4 @@
-import { format, parse } from "std/datetime/mod.ts";
+import { format, parse } from "../../deps.ts";
 import { Time } from "./Time.ts";
 
 /** Parse a date from the WebUntis API into a JS Date object using local time. */

lib/jsonrpc/RpcClient.ts

@@ -1,4 +1,4 @@
-import { getSetCookies } from "std/http/mod.ts";
+import { getSetCookies } from "../../deps.ts";
 import { log } from "./requestLogger.ts";
 
 type RpcRequest = {

mod.ts

@@ -3,7 +3,7 @@ export {
   type requestLogger,
   RpcError,
   setRequestLogger,
-} from "lib/jsonrpc/mod.ts";
+} from "./lib/jsonrpc/mod.ts";
 export * from "./src/wrappers/mod.ts";
 export * from "./src/searchSchools.ts";
 export * from "./src/UntisClient.ts";

scripts/build_npm.ts

@@ -17,7 +17,8 @@ await build({
 
   // Needed for fetch() and other modern APIs
   compilerOptions: {
-    lib: ["dom", "dom.iterable"],
+    target: "ES2021",
+    lib: ["esnext", "dom", "dom.iterable"],
   },
 
   // Technically not needed
@@ -41,6 +42,9 @@ await build({
     engines: {
       node: ">=18",
     },
+    devDependencies: {
+      "@types/node": "^17",
+    },
   },
 });
 

src/UntisClient.ts

@@ -1,7 +1,7 @@
-import { RpcClient, RpcError } from "lib/jsonrpc/mod.ts";
-import { formatUntisDate } from "lib/datetime/untis.ts";
-import * as requests from "webuntis/requests";
-import { ElementType } from "webuntis/resources";
+import { RpcClient, RpcError } from "../lib/jsonrpc/mod.ts";
+import { formatUntisDate } from "../lib/datetime/untis.ts";
+import * as requests from "./webuntis/requests/mod.ts";
+import { ElementType } from "./webuntis/resources/mod.ts";
 import {
   Class,
   Holiday,

src/searchSchools.ts

@@ -1,5 +1,5 @@
-import { RpcClient, RpcError } from "lib/jsonrpc/mod.ts";
-import { ErrorCode, searchSchool } from "webuntis/requests";
+import { RpcClient, RpcError } from "../lib/jsonrpc/mod.ts";
+import { ErrorCode, searchSchool } from "./webuntis/requests/mod.ts";
 import { School } from "./wrappers/mod.ts";
 
 const rpcClient = new RpcClient("https://mobile.webuntis.com/ms/schoolquery2");

src/webuntis/requests/authenticate.ts

@@ -1,4 +1,4 @@
-import { ElementType } from "webuntis/resources";
+import { ElementType } from "../resources/mod.ts";
 
 export const method = "authenticate";
 

src/webuntis/requests/getClasses.ts

@@ -1,4 +1,4 @@
-import { schoolClass } from "webuntis/resources";
+import { schoolClass } from "../resources/mod.ts";
 
 export const method = "getKlassen";
 

src/webuntis/requests/getCurrentSchoolyear.ts

@@ -1,4 +1,4 @@
-import { schoolyear } from "webuntis/resources";
+import { schoolyear } from "../resources/mod.ts";
 
 export const method = "getCurrentSchoolyear";
 

src/webuntis/requests/getHolidays.ts

@@ -1,4 +1,4 @@
-import { holiday } from "webuntis/resources";
+import { holiday } from "../resources/mod.ts";
 
 export const method = "getHolidays";
 

src/webuntis/requests/getRooms.ts

@@ -1,4 +1,4 @@
-import { room } from "webuntis/resources";
+import { room } from "../resources/mod.ts";
 
 export const method = "getRooms";
 

src/webuntis/requests/getSchoolyears.ts

@@ -1,4 +1,4 @@
-import { schoolyear } from "webuntis/resources";
+import { schoolyear } from "../resources/mod.ts";
 
 export const method = "getSchoolyears";
 

src/webuntis/requests/getStudents.ts

@@ -1,4 +1,4 @@
-import { student } from "webuntis/resources";
+import { student } from "../resources/mod.ts";
 
 export const method = "getStudents";
 

src/webuntis/requests/getSubjects.ts

@@ -1,4 +1,4 @@
-import { subject } from "webuntis/resources";
+import { subject } from "../resources/mod.ts";
 
 export const method = "getSubjects";
 

src/webuntis/requests/getTeachers.ts

@@ -1,4 +1,4 @@
-import { teacher } from "webuntis/resources";
+import { teacher } from "../resources/mod.ts";
 
 export const method = "getTeachers";
 

src/webuntis/requests/getTimetable.ts

@@ -1,4 +1,4 @@
-import { ElementType, lesson } from "webuntis/resources";
+import { ElementType, lesson } from "../resources/mod.ts";
 
 export const method = "getTimetable";
 

src/webuntis/requests/searchSchool.ts

@@ -1,4 +1,4 @@
-import { school } from "webuntis/resources";
+import { school } from "../resources/mod.ts";
 
 export const method = "searchSchool";
 

src/wrappers/Holiday.ts

@@ -1,5 +1,5 @@
-import { holiday } from "webuntis/resources";
-import { parseUntisDate } from "lib/datetime/untis.ts";
+import { parseUntisDate } from "../../lib/datetime/untis.ts";
+import { holiday } from "../webuntis/resources/mod.ts";
 
 /** Wrapper around the holiday object. */
 export class Holiday {

src/wrappers/Lesson.ts

@@ -1,5 +1,9 @@
-import { parseUntisDate, parseUntisTime, Time } from "lib/datetime/mod.ts";
-import { lesson } from "webuntis/resources";
+import {
+  parseUntisDate,
+  parseUntisTime,
+  Time,
+} from "../../lib/datetime/mod.ts";
+import { lesson } from "../webuntis/resources/mod.ts";
 import { LessonElementCollection } from "./LessonElementCollection.ts";
 import { Schedule } from "./Schedule.ts";
 

src/wrappers/LessonElement.ts

@@ -1,4 +1,4 @@
-import { lessonElement } from "webuntis/resources";
+import { lessonElement } from "../webuntis/resources/mod.ts";
 
 /** Wrapper around an element included in a {@link Lesson}. */
 export class LessonElement {

src/wrappers/LessonElementCollection.ts

@@ -1,4 +1,4 @@
-import { lesson } from "webuntis/resources";
+import { lesson } from "../webuntis/resources/mod.ts";
 import { LessonElement } from "./LessonElement.ts";
 
 /** Represents a collection of elements included in a lesson. */

src/wrappers/Schedule.ts

@@ -1,4 +1,4 @@
-import { Time } from "lib/datetime/mod.ts";
+import { Time } from "../../lib/datetime/mod.ts";
 import { Lesson } from "./Lesson.ts";
 
 /**

src/wrappers/ScheduleCollection_test.ts

@@ -1,5 +1,5 @@
-import { assert } from "std/testing/asserts.ts";
-import { Time } from "lib/datetime/mod.ts";
+import { assert } from "../../deps.ts";
+import { Time } from "../../lib/datetime/mod.ts";
 import {
   Lesson,
   LessonElement,

src/wrappers/School.ts

@@ -1,4 +1,4 @@
-import { school } from "webuntis/resources";
+import { school } from "../webuntis/resources/mod.ts";
 import { UntisClient } from "../UntisClient.ts";
 
 /** Wrapper around the school object. */

src/wrappers/Schoolyear.ts

@@ -1,5 +1,5 @@
-import { schoolyear } from "webuntis/resources";
-import { parseUntisDate } from "lib/datetime/mod.ts";
+import { schoolyear } from "../webuntis/resources/mod.ts";
+import { parseUntisDate } from "../../lib/datetime/mod.ts";
 
 /** Wrapper around the schoolyear object. */
 export class Schoolyear {

src/wrappers/mod.ts

@@ -5,7 +5,7 @@ export type {
   student as Student,
   subject as Subject,
   teacher as Teacher,
-} from "webuntis/resources";
+} from "../webuntis/resources/mod.ts";
 export * from "./Holiday.ts";
 export * from "./LoginStatus.ts";
 export * from "./Lesson.ts";