vinmonopolet-ts 2.1.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 #Changelog
 
+## [3.0.0]
+
+### Changed
+
+- getAllStores now uses the vinmonopolet api instead of the stream api.
+- Adjusted BaseStore and PopulatedStore to match the new api.
+
+### Breaking changes
+
+- Removed stream package. Vinmonopolet no longer maintains a csv of products and stores.
+- getStores now returns BaseStore instead of PopulatedStore. You will need to call .populate() on the BaseStore if you want a PopulatedStore.
+- Adjusted BaseStore and PopulatedStore:
+  - StreetZip is now called zip
+  - StreetCity is now called city
+  - Removed phoneNumber, weekNumber, weekNumberNext postalAddress postalZip and postalCity
+  - openingHours are now in an array called openingHours instead of individual properties.
+
+## [2.1.1]
+
+### Changed
+
+- Made UpcomingProduct a FacetValue object
+
 ## [2.1.0]
 
 #### Added

package/dist/cjs/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stream = exports.getProductReleases = exports.getStore = exports.searchProducts = exports.searchStores = exports.getAllStores = exports.getProductsByIds = exports.getProductsByStore = exports.getProductByBarcode = exports.getFacets = exports.getProduct = exports.getProductCount = exports.getProducts = exports.BaseStore = exports.PopulatedStore = exports.RawMaterial = exports.ProductStatus = exports.ProductImage = exports.StreamProduct = exports.PopulatedProduct = exports.BaseProduct = exports.Pagination = exports.FoodPairing = exports.FacetCategory = exports.FacetValue = exports.Facet = void 0;
+exports.getProductReleases = exports.getStore = exports.searchProducts = exports.searchStores = exports.getAllStores = exports.getProductsByIds = exports.getProductsByStore = exports.getProductByBarcode = exports.getFacets = exports.getProduct = exports.getProductCount = exports.getProducts = exports.BaseStore = exports.PopulatedStore = exports.RawMaterial = exports.ProductStatus = exports.ProductImage = exports.StreamProduct = exports.PopulatedProduct = exports.BaseProduct = exports.Pagination = exports.FoodPairing = exports.FacetCategory = exports.FacetValue = exports.Facet = void 0;
 require("reflect-metadata");
 var Facet_1 = require("./models/Facet");
 Object.defineProperty(exports, "Facet", { enumerable: true, get: function () { return __importDefault(Facet_1).default; } });
@@ -72,5 +72,3 @@ var getStore_1 = require("./retrievers/getStore");
 Object.defineProperty(exports, "getStore", { enumerable: true, get: function () { return __importDefault(getStore_1).default; } });
 var getProductReleases_1 = require("./retrievers/getProductReleases");
 Object.defineProperty(exports, "getProductReleases", { enumerable: true, get: function () { return __importDefault(getProductReleases_1).default; } });
-var stream_1 = require("./stream");
-Object.defineProperty(exports, "stream", { enumerable: true, get: function () { return __importDefault(stream_1).default; } });

package/dist/cjs/models/Facet.js

@@ -118,5 +118,8 @@ class Facet {
     }
 }
 Facet.Category = (0, exports.FacetCategoryMapping)();
-Facet.UpcomingProduct = "upcomingProduct:true";
+Facet.UpcomingProduct = new FacetValue_1.default({
+    name: "Upcoming product",
+    query: { query: { value: "upcomingProduct:true" } },
+});
 exports.default = Facet;

package/dist/cjs/models/Store.js

@@ -24,56 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseStore = void 0;
-const getOpeningHours = (weekday, store) => {
-    try {
-        let weekDayOpening = store["Apn_" + weekday.toLowerCase().replace("ø", "o")];
-        weekDayOpening = weekDayOpening ?? store.openingTimes;
-        if (Array.isArray(weekDayOpening)) {
-            const weekDayEntry = weekDayOpening.find((entry) => entry.weekDay.toLowerCase() === weekday.toLowerCase());
-            if (weekDayEntry.closed || !weekDayEntry)
-                return null;
-            return {
-                opens: weekDayEntry?.openingTime,
-                closes: weekDayEntry?.closingTime,
-            };
-        }
-        if (weekDayOpening && weekDayOpening != "Stengt") {
-            weekDayOpening = weekDayOpening;
-            let [opening, closing] = weekDayOpening.split("-");
-            opening = opening.trim();
-            closing = closing.trim();
-            return {
-                opens: {
-                    hour: Number(opening?.slice(0, 3)),
-                    minute: Number(opening?.slice(2, opening.length)),
-                },
-                closes: {
-                    hour: Number(closing?.slice(0, 3)),
-                    minute: Number(closing?.slice(2, opening.length)),
-                },
-            };
-        }
-        return null;
-    }
-    catch (e) {
-        return null;
-    }
-};
 class BaseStore {
-    constructor(store) {
-        this.name = store?.Butikknavn ?? store?.displayName;
-        this.streetAddress = store.Gateadresse ?? store.address.line1;
-        this.streetZip = store?.Gate_postnummer ?? store.address.postalCode;
-        this.streetCity = store?.Gate_poststed ?? store.address.town;
-        this.postalAddress = store?.Postadresse ?? store.address.line2;
-        this.postalZip = store?.Post_postnummer ?? store.address.postalCode;
-        this.postalCity = store?.Post_poststed ?? store.address.town;
-        this.phoneNumber = store?.Telefonnummer ?? store.address.phone;
-        this.gpsCoordinates = [
-            store?.GPS_breddegrad ?? store?.geoPoint.latitude,
-            store?.GPS_lengdegrad ?? store?.geoPoint.longitude,
-        ];
-        this.storeNumber = store?.Butikknummer ?? store?.name;
+    constructor(storeNumber, name, streetAddress, zip, city, latitude, longitude) {
+        this.storeNumber = storeNumber;
+        this.name = name;
+        this.streetAddress = streetAddress;
+        this.zip = zip;
+        this.city = city;
+        this.gpsCoordinates = [latitude, longitude];
     }
     /**
      * Returns a new instance of PopulatedStore, with more fields.
@@ -90,23 +48,10 @@ class BaseStore {
 }
 exports.BaseStore = BaseStore;
 class PopulatedStore extends BaseStore {
-    constructor(store) {
-        super(store);
-        this.category = store?.Kategori ?? store?.assortment;
-        this.weekNumber = store?.Ukenummer;
-        this.openingHoursMonday = getOpeningHours("mandag", store);
-        this.openingHoursTuesday = getOpeningHours("tirsdag", store);
-        this.openingHoursWednesday = getOpeningHours("onsdag", store);
-        this.openingHoursThursday = getOpeningHours("torsdag", store);
-        this.openingHoursFriday = getOpeningHours("fredag", store);
-        this.openingHoursSaturday = getOpeningHours("lørdag", store);
-        this.weekNumberNext = store?.Ukenummer_neste;
-        this.openingHoursNextMonday = store?.Apn_neste_mandag;
-        this.openingHoursNextTuesday = store?.Apn_neste_tirsdag;
-        this.openingHoursNextWednesday = store?.Apn_neste_onsdag;
-        this.openingHoursNextThursday = store?.Apn_neste_torsdag;
-        this.openingHoursNextFriday = store?.Apn_neste_fredag;
-        this.openingHoursNextSaturday = store?.Apn_neste_lordag;
+    constructor(storeNumber, name, streetAddress, zip, city, latitude, longitude, category, openingHours) {
+        super(storeNumber, name, streetAddress, zip, city, latitude, longitude);
+        this.category = category;
+        this.openingHours = openingHours;
     }
     populate() {
         return Promise.resolve(this);

package/dist/cjs/retrievers/getStore.js

@@ -10,6 +10,16 @@ const getStore = async (store_id) => {
         baseUrl: "https://www.vinmonopolet.no",
         query: { fields: "FULL" },
     });
-    return new Store_1.default(res);
+    return toPopulatedStore(res);
 };
+function toPopulatedStore(storeDTO) {
+    return new Store_1.default(storeDTO.name, storeDTO.displayName, storeDTO.address.line1, storeDTO.address.postalCode, storeDTO.address.town, storeDTO.geoPoint.latitude, storeDTO.geoPoint.longitude, storeDTO.assortment, storeDTO.openingTimes.map(toOpeningHours));
+}
+function toOpeningHours(openingTimeDTO) {
+    return {
+        closes: openingTimeDTO.closingTime,
+        opens: openingTimeDTO.openingTime,
+        weekDay: openingTimeDTO.weekDay,
+    };
+}
 exports.default = getStore;

package/dist/cjs/retrievers/getStores.js

@@ -7,7 +7,6 @@ exports.searchStores = void 0;
 const Store_1 = require("../models/Store");
 const Pagination_1 = __importDefault(require("../models/Pagination"));
 const request_1 = __importDefault(require("../util/request"));
-const stream_1 = __importDefault(require("../stream"));
 const defaults = {
     latitude: 59.9126054,
     longitude: 10.7515334,
@@ -30,7 +29,7 @@ function searchByQuery(querystring) {
         query,
     });
     return req.then((res) => ({
-        stores: (res.stores || []).map((i) => new Store_1.BaseStore(i)),
+        stores: res.stores.map(toBaseStore),
     }));
 }
 function searchByLocation(lat, lon, currentPage = 1, pageSize = 10) {
@@ -46,7 +45,7 @@ function searchByLocation(lat, lon, currentPage = 1, pageSize = 10) {
         query,
     });
     return req.then((res) => ({
-        stores: (res.stores || []).map((i) => new Store_1.BaseStore(i)),
+        stores: (res.stores || []).map(toBaseStore),
         pagination: new Pagination_1.default(getPagination(query.currentPage, pageSize, res.pagination), { nearLocation: { lat, lon } }, searchStores),
     }));
 }
@@ -59,22 +58,49 @@ function getPagination(currentPage, pageSize, res) {
     };
 }
 async function getAllStores() {
-    const readableStream = await stream_1.default.getStores();
-    const storeStream = new Promise((resolve, reject) => {
-        const completeResponse = [];
-        const onData = (chunk) => {
-            // console.log(chunk);
-            completeResponse.push(chunk);
-        };
-        readableStream
-            .on("data", onData)
-            .on("end", () => {
-            resolve(completeResponse);
-        })
-            .on("error", (err) => {
-            reject(err);
-        });
+    let allStores = [];
+    let currentPage = 0;
+    let numPages = 2;
+    while (currentPage < numPages) {
+        const { totalPages, stores } = await getPaginatedStores(currentPage);
+        currentPage += 1;
+        numPages = totalPages;
+        allStores = [...allStores, ...stores];
+    }
+    return allStores;
+}
+async function getPaginatedStores(page) {
+    const query = {
+        fields: "BASIC",
+        currentPage: page,
+        pageSize: 50,
+    };
+    const res = await request_1.default.get("/vmpws/v2/vmp/stores", {
+        baseUrl: "https://www.vinmonopolet.no",
+        query,
     });
-    return storeStream;
+    const stores = await Promise.all(res.stores.map(toBaseStore));
+    return {
+        totalPages: res.pagination.totalPages,
+        stores,
+    };
+}
+function toBaseStore(store) {
+    const address = getZipAndCityFromFormattedString(store.address.formattedAddress);
+    return new Store_1.BaseStore(store.id, store.displayName, store.address.line1, address?.zip, address?.city, store.geoPoint.latitude, store.geoPoint.longitude);
+}
+function getZipAndCityFromFormattedString(formattedAddressString) {
+    try {
+        const splitAddress = formattedAddressString.split(",");
+        const city = splitAddress[splitAddress.length - 1].trim();
+        const zip = splitAddress[splitAddress.length - 2].trim();
+        return {
+            zip,
+            city,
+        };
+    }
+    catch (error) {
+        console.warn("Unable to get zip and city from string: " + formattedAddressString);
+    }
 }
 exports.default = getAllStores;

package/dist/esm/index.js

@@ -19,4 +19,3 @@ export { default as getAllStores, searchStores } from "./retrievers/getStores";
 export { default as searchProducts } from "./retrievers/searchProducts";
 export { default as getStore } from "./retrievers/getStore";
 export { default as getProductReleases } from "./retrievers/getProductReleases";
-export { default as stream } from "./stream";

package/dist/esm/models/Facet.js

@@ -93,6 +93,9 @@ class Facet {
         this.values = facet.values.map((val) => new FacetValue(val, valueFilter));
     }
     static Category = FacetCategoryMapping();
-    static UpcomingProduct = "upcomingProduct:true";
+    static UpcomingProduct = new FacetValue({
+        name: "Upcoming product",
+        query: { query: { value: "upcomingProduct:true" } },
+    });
 }
 export default Facet;

package/dist/esm/models/Store.js

@@ -1,38 +1,3 @@
-const getOpeningHours = (weekday, store) => {
-    try {
-        let weekDayOpening = store["Apn_" + weekday.toLowerCase().replace("ø", "o")];
-        weekDayOpening = weekDayOpening ?? store.openingTimes;
-        if (Array.isArray(weekDayOpening)) {
-            const weekDayEntry = weekDayOpening.find((entry) => entry.weekDay.toLowerCase() === weekday.toLowerCase());
-            if (weekDayEntry.closed || !weekDayEntry)
-                return null;
-            return {
-                opens: weekDayEntry?.openingTime,
-                closes: weekDayEntry?.closingTime,
-            };
-        }
-        if (weekDayOpening && weekDayOpening != "Stengt") {
-            weekDayOpening = weekDayOpening;
-            let [opening, closing] = weekDayOpening.split("-");
-            opening = opening.trim();
-            closing = closing.trim();
-            return {
-                opens: {
-                    hour: Number(opening?.slice(0, 3)),
-                    minute: Number(opening?.slice(2, opening.length)),
-                },
-                closes: {
-                    hour: Number(closing?.slice(0, 3)),
-                    minute: Number(closing?.slice(2, opening.length)),
-                },
-            };
-        }
-        return null;
-    }
-    catch (e) {
-        return null;
-    }
-};
 export class BaseStore {
     /**
      * Unique ID for the store.
@@ -49,45 +14,22 @@ export class BaseStore {
     /**
      * The zip code of the store.
      */
-    streetZip;
+    zip;
     /**
      * The city the store is located in.
      */
-    streetCity;
-    /**
-     * The postal address. Usually just the same as streetAddress.
-     */
-    postalAddress;
-    /**
-     * The zip code of the stores postal address. Usually just the same as streetZip.
-     */
-    postalZip;
-    /**
-     * The postal city of the store. Usually just the same as the streetCity property.
-     */
-    postalCity;
-    /**
-     * The phone number for the store.
-     */
-    phoneNumber;
+    city;
     /**
      * GPS coordinates of the store given as a [lat, lon] array.
      */
     gpsCoordinates;
-    constructor(store) {
-        this.name = store?.Butikknavn ?? store?.displayName;
-        this.streetAddress = store.Gateadresse ?? store.address.line1;
-        this.streetZip = store?.Gate_postnummer ?? store.address.postalCode;
-        this.streetCity = store?.Gate_poststed ?? store.address.town;
-        this.postalAddress = store?.Postadresse ?? store.address.line2;
-        this.postalZip = store?.Post_postnummer ?? store.address.postalCode;
-        this.postalCity = store?.Post_poststed ?? store.address.town;
-        this.phoneNumber = store?.Telefonnummer ?? store.address.phone;
-        this.gpsCoordinates = [
-            store?.GPS_breddegrad ?? store?.geoPoint.latitude,
-            store?.GPS_lengdegrad ?? store?.geoPoint.longitude,
-        ];
-        this.storeNumber = store?.Butikknummer ?? store?.name;
+    constructor(storeNumber, name, streetAddress, zip, city, latitude, longitude) {
+        this.storeNumber = storeNumber;
+        this.name = name;
+        this.streetAddress = streetAddress;
+        this.zip = zip;
+        this.city = city;
+        this.gpsCoordinates = [latitude, longitude];
     }
     /**
      * Returns a new instance of PopulatedStore, with more fields.
@@ -107,79 +49,11 @@ class PopulatedStore extends BaseStore {
      * The category of the store. The category ranges from 1 to 7, where 1 is the lowest possible product selection and 7 is the best possible product selection.
      */
     category;
-    /**
-     * The current week. Usually undefined unless using getAllStores.
-     */
-    weekNumber;
-    /**
-     * An oject representing the opening and closing times of the store on monday this week. Is null if the store is not open that day.
-     */
-    openingHoursMonday;
-    /**
-     * An oject representing the opening and closing times of the store on tuesday this week. Is null if the store is not open that day.
-     */
-    openingHoursTuesday;
-    /**
-     * An oject representing the opening and closing times of the store on wednesday this week. Is null if the store is not open that day.
-     */
-    openingHoursWednesday;
-    /**
-     * An oject representing the opening and closing times of the store on thursday this week. Is null if the store is not open that day.
-     */
-    openingHoursThursday;
-    /**
-     * An oject representing the opening and closing times of the store on friday this week. Is null if the store is not open that day.
-     */
-    openingHoursFriday;
-    /**
-     * An oject representing the opening and closing times of the store on saturday this week. Is null if the store is not open that day.
-     */
-    openingHoursSaturday;
-    /**
-     * The next weeks number.
-     */
-    weekNumberNext;
-    /**
-     * An oject representing the opening and closing times of the store on monday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextMonday;
-    /**
-     * An oject representing the opening and closing times of the store on tuesday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextTuesday;
-    /**
-     * An oject representing the opening and closing times of the store on wendesday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextWednesday;
-    /**
-     * An oject representing the opening and closing times of the store on thursday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextThursday;
-    /**
-     * An oject representing the opening and closing times of the store on friday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextFriday;
-    /**
-     * An oject representing the opening and closing times of the store on saturday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextSaturday;
-    constructor(store) {
-        super(store);
-        this.category = store?.Kategori ?? store?.assortment;
-        this.weekNumber = store?.Ukenummer;
-        this.openingHoursMonday = getOpeningHours("mandag", store);
-        this.openingHoursTuesday = getOpeningHours("tirsdag", store);
-        this.openingHoursWednesday = getOpeningHours("onsdag", store);
-        this.openingHoursThursday = getOpeningHours("torsdag", store);
-        this.openingHoursFriday = getOpeningHours("fredag", store);
-        this.openingHoursSaturday = getOpeningHours("lørdag", store);
-        this.weekNumberNext = store?.Ukenummer_neste;
-        this.openingHoursNextMonday = store?.Apn_neste_mandag;
-        this.openingHoursNextTuesday = store?.Apn_neste_tirsdag;
-        this.openingHoursNextWednesday = store?.Apn_neste_onsdag;
-        this.openingHoursNextThursday = store?.Apn_neste_torsdag;
-        this.openingHoursNextFriday = store?.Apn_neste_fredag;
-        this.openingHoursNextSaturday = store?.Apn_neste_lordag;
+    openingHours;
+    constructor(storeNumber, name, streetAddress, zip, city, latitude, longitude, category, openingHours) {
+        super(storeNumber, name, streetAddress, zip, city, latitude, longitude);
+        this.category = category;
+        this.openingHours = openingHours;
     }
     populate() {
         return Promise.resolve(this);

package/dist/esm/retrievers/getStore.js

@@ -5,6 +5,16 @@ const getStore = async (store_id) => {
         baseUrl: "https://www.vinmonopolet.no",
         query: { fields: "FULL" },
     });
-    return new PopulatedStore(res);
+    return toPopulatedStore(res);
 };
+function toPopulatedStore(storeDTO) {
+    return new PopulatedStore(storeDTO.name, storeDTO.displayName, storeDTO.address.line1, storeDTO.address.postalCode, storeDTO.address.town, storeDTO.geoPoint.latitude, storeDTO.geoPoint.longitude, storeDTO.assortment, storeDTO.openingTimes.map(toOpeningHours));
+}
+function toOpeningHours(openingTimeDTO) {
+    return {
+        closes: openingTimeDTO.closingTime,
+        opens: openingTimeDTO.openingTime,
+        weekDay: openingTimeDTO.weekDay,
+    };
+}
 export default getStore;

package/dist/esm/retrievers/getStores.js

@@ -1,7 +1,6 @@
 import { BaseStore } from "../models/Store";
 import Pagination from "../models/Pagination";
 import request from "../util/request";
-import stream from "../stream";
 const defaults = {
     latitude: 59.9126054,
     longitude: 10.7515334,
@@ -23,7 +22,7 @@ function searchByQuery(querystring) {
         query,
     });
     return req.then((res) => ({
-        stores: (res.stores || []).map((i) => new BaseStore(i)),
+        stores: res.stores.map(toBaseStore),
     }));
 }
 function searchByLocation(lat, lon, currentPage = 1, pageSize = 10) {
@@ -39,7 +38,7 @@ function searchByLocation(lat, lon, currentPage = 1, pageSize = 10) {
         query,
     });
     return req.then((res) => ({
-        stores: (res.stores || []).map((i) => new BaseStore(i)),
+        stores: (res.stores || []).map(toBaseStore),
         pagination: new Pagination(getPagination(query.currentPage, pageSize, res.pagination), { nearLocation: { lat, lon } }, searchStores),
     }));
 }
@@ -52,22 +51,49 @@ function getPagination(currentPage, pageSize, res) {
     };
 }
 async function getAllStores() {
-    const readableStream = await stream.getStores();
-    const storeStream = new Promise((resolve, reject) => {
-        const completeResponse = [];
-        const onData = (chunk) => {
-            // console.log(chunk);
-            completeResponse.push(chunk);
-        };
-        readableStream
-            .on("data", onData)
-            .on("end", () => {
-            resolve(completeResponse);
-        })
-            .on("error", (err) => {
-            reject(err);
-        });
+    let allStores = [];
+    let currentPage = 0;
+    let numPages = 2;
+    while (currentPage < numPages) {
+        const { totalPages, stores } = await getPaginatedStores(currentPage);
+        currentPage += 1;
+        numPages = totalPages;
+        allStores = [...allStores, ...stores];
+    }
+    return allStores;
+}
+async function getPaginatedStores(page) {
+    const query = {
+        fields: "BASIC",
+        currentPage: page,
+        pageSize: 50,
+    };
+    const res = await request.get("/vmpws/v2/vmp/stores", {
+        baseUrl: "https://www.vinmonopolet.no",
+        query,
     });
-    return storeStream;
+    const stores = await Promise.all(res.stores.map(toBaseStore));
+    return {
+        totalPages: res.pagination.totalPages,
+        stores,
+    };
+}
+function toBaseStore(store) {
+    const address = getZipAndCityFromFormattedString(store.address.formattedAddress);
+    return new BaseStore(store.id, store.displayName, store.address.line1, address?.zip, address?.city, store.geoPoint.latitude, store.geoPoint.longitude);
+}
+function getZipAndCityFromFormattedString(formattedAddressString) {
+    try {
+        const splitAddress = formattedAddressString.split(",");
+        const city = splitAddress[splitAddress.length - 1].trim();
+        const zip = splitAddress[splitAddress.length - 2].trim();
+        return {
+            zip,
+            city,
+        };
+    }
+    catch (error) {
+        console.warn("Unable to get zip and city from string: " + formattedAddressString);
+    }
 }
 export default getAllStores;

package/dist/types/index.d.ts

@@ -19,4 +19,3 @@ export { default as getAllStores, searchStores } from "./retrievers/getStores";
 export { default as searchProducts } from "./retrievers/searchProducts";
 export { default as getStore } from "./retrievers/getStore";
 export { default as getProductReleases } from "./retrievers/getProductReleases";
-export { default as stream } from "./stream";

package/dist/types/models/Facet.d.ts

@@ -13,6 +13,6 @@ declare class Facet {
     values: FacetValue[];
     constructor(facet: any);
     static Category: FacetCategory;
-    static UpcomingProduct: string;
+    static UpcomingProduct: FacetValue;
 }
 export default Facet;

package/dist/types/models/Store.d.ts

@@ -1,9 +1,10 @@
-interface IOpeningHours {
-    opens: {
+export interface IOpeningHours {
+    weekDay: string;
+    opens?: {
         hour: number;
         minute: number;
     };
-    closes: {
+    closes?: {
         hour: number;
         minute: number;
     };
@@ -24,32 +25,16 @@ export declare class BaseStore {
     /**
      * The zip code of the store.
      */
-    streetZip: string;
+    zip?: string;
     /**
      * The city the store is located in.
      */
-    streetCity: string;
-    /**
-     * The postal address. Usually just the same as streetAddress.
-     */
-    postalAddress: string;
-    /**
-     * The zip code of the stores postal address. Usually just the same as streetZip.
-     */
-    postalZip: string;
-    /**
-     * The postal city of the store. Usually just the same as the streetCity property.
-     */
-    postalCity: string;
-    /**
-     * The phone number for the store.
-     */
-    phoneNumber: string;
+    city?: string;
     /**
      * GPS coordinates of the store given as a [lat, lon] array.
      */
     gpsCoordinates: [number, number];
-    constructor(store: any);
+    constructor(storeNumber: string, name: string, streetAddress: string, zip: string | undefined, city: string | undefined, latitude: number, longitude: number);
     /**
      * Returns a new instance of PopulatedStore, with more fields.
      * @returns Promise<PopulatedStore>
@@ -61,63 +46,8 @@ declare class PopulatedStore extends BaseStore {
      * The category of the store. The category ranges from 1 to 7, where 1 is the lowest possible product selection and 7 is the best possible product selection.
      */
     category: string;
-    /**
-     * The current week. Usually undefined unless using getAllStores.
-     */
-    weekNumber: number | undefined;
-    /**
-     * An oject representing the opening and closing times of the store on monday this week. Is null if the store is not open that day.
-     */
-    openingHoursMonday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on tuesday this week. Is null if the store is not open that day.
-     */
-    openingHoursTuesday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on wednesday this week. Is null if the store is not open that day.
-     */
-    openingHoursWednesday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on thursday this week. Is null if the store is not open that day.
-     */
-    openingHoursThursday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on friday this week. Is null if the store is not open that day.
-     */
-    openingHoursFriday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on saturday this week. Is null if the store is not open that day.
-     */
-    openingHoursSaturday: IOpeningHours | null;
-    /**
-     * The next weeks number.
-     */
-    weekNumberNext: number;
-    /**
-     * An oject representing the opening and closing times of the store on monday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextMonday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on tuesday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextTuesday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on wendesday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextWednesday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on thursday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextThursday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on friday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextFriday: IOpeningHours | null;
-    /**
-     * An oject representing the opening and closing times of the store on saturday next week. Is null if the store is not open that day.
-     */
-    openingHoursNextSaturday: IOpeningHours | null;
-    constructor(store: any);
+    openingHours: IOpeningHours[];
+    constructor(storeNumber: string, name: string, streetAddress: string, zip: string, city: string, latitude: number, longitude: number, category: string, openingHours: IOpeningHours[]);
     populate(): Promise<PopulatedStore>;
 }
 export default PopulatedStore;

package/dist/types/retrievers/getStores.d.ts

@@ -1,4 +1,4 @@
-import PopulatedStore, { BaseStore } from "../models/Store";
+import { BaseStore } from "../models/Store";
 import Pagination from "../models/Pagination";
 export interface ISearchStoresOptions {
     /**
@@ -31,6 +31,21 @@ export interface ISearchStoreResult {
      */
     pagination?: Pagination<ISearchStoreResult>;
 }
+export interface IStoreDTO {
+    displayName: string;
+    id: string;
+    name: string;
+    formattedDistance: string;
+    geoPoint: {
+        latitude: number;
+        longitude: number;
+    };
+    address: {
+        formattedAddress: string;
+        id: string;
+        line1: string;
+    };
+}
 export declare function searchStores(opts?: ISearchStoresOptions): Promise<ISearchStoreResult>;
-declare function getAllStores(): Promise<PopulatedStore[]>;
+declare function getAllStores(): Promise<BaseStore[]>;
 export default getAllStores;

package/dist/types/util/request.d.ts

@@ -8,9 +8,7 @@ export interface IRequestOptions {
 }
 declare function sendRequest(path: string, options?: IRequestOptions): Promise<Response>;
 declare namespace sendRequest {
-    var get: (path: string, options: IRequestOptions) => Promise<{
-        [prop: string]: any;
-    }>;
+    var get: <T>(path: string, options: IRequestOptions) => Promise<T>;
     var head: (path: any, options: any) => Promise<Response>;
     var raw: (url: string) => Promise<Response>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vinmonopolet-ts",
   "description": "Extracts information on products, categories and stores from Vinmonopolet",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "keywords": [
     "vinmonopolet",
     "beer",

package/dist/cjs/csvUrls.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const products = "https://www.vinmonopolet.no/medias/sys_master/products/products/hbc/hb0/8834253127710/produkter.csv";
-const stores = "https://www.vinmonopolet.no/medias/sys_master/locations/locations/h3c/h4a/8834253946910/8834253946910.csv";
-exports.default = { products, stores };

package/dist/cjs/stream.js

@@ -1,38 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const csvUrls_1 = __importDefault(require("./csvUrls"));
-const csv_parser_1 = __importDefault(require("csv-parser"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const Store_1 = __importDefault(require("./models/Store"));
-const Product_1 = require("./models/Product");
-const stream_1 = require("stream");
-async function getCsvStream(url, transformer) {
-    const { body } = await (0, node_fetch_1.default)(url);
-    return body.pipe((0, csv_parser_1.default)({ separator: ";" })).pipe(transformer);
-}
-const getProducts = () => {
-    const transformProduct = new stream_1.Transform({
-        objectMode: true,
-        transform(chunk, enc, cb) {
-            const product = new Product_1.StreamProduct(chunk);
-            this.push(product);
-            cb();
-        }
-    });
-    return getCsvStream(csvUrls_1.default.products, transformProduct);
-};
-const getStores = () => {
-    const transformStore = new stream_1.Transform({
-        objectMode: true,
-        transform(chunk, enc, cb) {
-            const store = new Store_1.default(chunk);
-            this.push(store);
-            cb();
-        }
-    });
-    return getCsvStream(csvUrls_1.default.stores, transformStore);
-};
-exports.default = { getProducts, getStores };

package/dist/esm/csvUrls.js

@@ -1,3 +0,0 @@
-const products = "https://www.vinmonopolet.no/medias/sys_master/products/products/hbc/hb0/8834253127710/produkter.csv";
-const stores = "https://www.vinmonopolet.no/medias/sys_master/locations/locations/h3c/h4a/8834253946910/8834253946910.csv";
-export default { products, stores };

package/dist/esm/stream.js

@@ -1,33 +0,0 @@
-import csvUrls from "./csvUrls";
-import csv from "csv-parser";
-import fetch from "node-fetch";
-import Store from "./models/Store";
-import { StreamProduct } from "./models/Product";
-import { Transform } from "stream";
-async function getCsvStream(url, transformer) {
-    const { body } = await fetch(url);
-    return body.pipe(csv({ separator: ";" })).pipe(transformer);
-}
-const getProducts = () => {
-    const transformProduct = new Transform({
-        objectMode: true,
-        transform(chunk, enc, cb) {
-            const product = new StreamProduct(chunk);
-            this.push(product);
-            cb();
-        }
-    });
-    return getCsvStream(csvUrls.products, transformProduct);
-};
-const getStores = () => {
-    const transformStore = new Transform({
-        objectMode: true,
-        transform(chunk, enc, cb) {
-            const store = new Store(chunk);
-            this.push(store);
-            cb();
-        }
-    });
-    return getCsvStream(csvUrls.stores, transformStore);
-};
-export default { getProducts, getStores };

package/dist/types/csvUrls.d.ts

@@ -1,5 +0,0 @@
-declare const _default: {
-    products: string;
-    stores: string;
-};
-export default _default;

package/dist/types/stream.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="node" />
-declare const _default: {
-    getProducts: () => Promise<NodeJS.ReadableStream>;
-    getStores: () => Promise<NodeJS.ReadableStream>;
-};
-export default _default;