Changed module to commonjs

Marcel-Tronco · Dec 3, 2021 · fa63afb · fa63afb
1 parent 1d9ea23
commit fa63afb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/node-packstation.js b/node-packstation.js
@@ -1,4 +1,4 @@
-import fetch from "node-fetch"
+const fetch = require("node-fetch")
 
 /**
  * Checks if a given string is numerical
@@ -17,7 +17,7 @@ const isAllNum = (str) => {
  * @param { string } packstationNumber
  * @returns { boolean }
  */
-export const isValidPackstationNumber = (packstationNumber) => {
+const isValidPackstationNumber = (packstationNumber) => {
   return (
     isAllNum(packstationNumber) &&
     packstationNumber.length === 3
@@ -30,7 +30,7 @@ export const isValidPackstationNumber = (packstationNumber) => {
  * @returns { boolean }
  */
 
-export const isValidZipCode = (zipCode) => {
+const isValidZipCode = (zipCode) => {
   return (
     isAllNum(zipCode) &&
     zipCode.length === 5
@@ -89,7 +89,9 @@ const isValidAddress = async (zipCode, packstationNumber) => {
   }
 }
 
-export default {
+module.exports = {
   listAddresses: getAddressList,
-  isValidAddress
+  isValidAddress,
+  isValidZipCode,
+  isValidPackstationNumber
 }
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.2",
   "description": "This package validates addresses of a DHL Packstation or lists the nearby DHL Packstation close to an zip code.",
   "main": "node-packstation.js",
-  "type": "module",
+  "type": "commonjs",
   "directories": {
     "test": "test"
   },

diff --git a/test/test.js b/test/test.js
@@ -1,46 +1,45 @@
-import assert from "assert"
-import expect from 'expect.js'
-import nodePackstation, {isValidZipCode, isValidPackstationNumber} from "../node-packstation.js"
+const assert = require('assert')
+const expect = require('expect.js')
+const { isValidZipCode, isValidPackstationNumber, isValidAddress, listAddresses } = require('../node-packstation')
+console.log(isValidZipCode)
 
-const isValidAddress = nodePackstation.isValidAddress
-const listAddresses = nodePackstation.listAddresses
 
 describe('Test all functions', function() {
   this.timeout(10000)
   describe('Test list retrieval', function() {
     it('Simple list can be gathered and has expected form', async function() {
-      const result = await listAddresses("10115")
+      const result = await listAddresses('10115')
       expect(result).to.have.key('pfLocations');
-      expect(result.pfLocations[0]).to.have.keys("zipCode", "primaryKeyZipRegion")
+      expect(result.pfLocations[0]).to.have.keys('zipCode', 'primaryKeyZipRegion')
     })
    })
   describe('basic validity checks', function(){
     it('ZipCode: 5 characters, all digits', function(){
-      assert.strictEqual(isValidZipCode("10000"), true)
-      assert.strictEqual(isValidZipCode("100000"), false)
-      assert.strictEqual(isValidZipCode("1000"), false)
-      assert.strictEqual(isValidZipCode("1000!"), false)
-      assert.strictEqual(isValidZipCode("1000a"), false)
-      assert.strictEqual(isValidZipCode("asdf"), false)
+      assert.strictEqual(isValidZipCode('10000'), true)
+      assert.strictEqual(isValidZipCode('100000'), false)
+      assert.strictEqual(isValidZipCode('1000'), false)
+      assert.strictEqual(isValidZipCode('1000!'), false)
+      assert.strictEqual(isValidZipCode('1000a'), false)
+      assert.strictEqual(isValidZipCode('asdf'), false)
     })
     it('PackstationNumber: all digits', function(){
-      assert.strictEqual(isValidPackstationNumber("200"), true)
-      assert.strictEqual(isValidPackstationNumber("asd"), false)
-      assert.strictEqual(isValidPackstationNumber("20a"), false)
-      assert.strictEqual(isValidPackstationNumber("20!"), false)
+      assert.strictEqual(isValidPackstationNumber('200'), true)
+      assert.strictEqual(isValidPackstationNumber('asd'), false)
+      assert.strictEqual(isValidPackstationNumber('20a'), false)
+      assert.strictEqual(isValidPackstationNumber('20!'), false)
     })
   })
   describe('Test address validation', function() {
     it('Simple address can be verified', async function() {
-      const result = await isValidAddress("10115", "535")
+      const result = await isValidAddress('10115', '535')
       assert.strictEqual(result, true)
     })
     it('Wrong address pair can be falsified', async function() {
-      const result = await isValidAddress("10117", "535")
+      const result = await isValidAddress('10117', '535')
       assert.strictEqual(result, false)
      })
     it('Faulty format returns false', async function() {
-      const result = await isValidAddress("asdf", "535")
+      const result = await isValidAddress('asdf', '535')
       assert.strictEqual(result, false)
     })
   })