bus-mj 2.0.1 → 2.2.0

package/index.d.ts

@@ -3,7 +3,7 @@ type Bus = {
   id: number,
   members: Stop[],
   tags: {
-    colour: string,
+    color: string,
     band: string[],
     board: string |null,
     fee: string,
@@ -28,14 +28,12 @@ type Stop = {
   label: string | null,
 }
 
-declare module 'bus-mj' {
-  export function findStopAll(): Stop[];
-  export function findBusByOneStop(stopId: number): Bus[];
-  export function findBusByTwoStop(startStopId: number, endStopId: number): Bus[];
-  export function findBusDetailById(busId: number): Bus;
-  export function findBusAll(): Bus[];
-  export function findOperatorAll(): string[];
-  export function findZoneAll(): string[];
-  export function findBusDetailByOperator(operatorName: string): Bus[];
-  export function findOpenHoursAll(): string[];
-}
+export function findStopAll(): Stop[];
+export function findBusByOneStop(stopId: number): Bus[];
+export function findBusByTwoStop(startStopId: number, endStopId: number): Bus[];
+export function findBusDetailById(busId: number): Bus;
+export function findBusAll(): Bus[];
+export function findOperatorAll(): string[];
+export function findZoneAll(): string[];
+export function findBusDetailByOperator(operatorName: string): Bus[];
+export function findOpenHoursAll(): string[];

package/index.js

@@ -1,4 +1,4 @@
-const {
+import {
   findStopAll,
   findBusByOneStop,
   findBusByTwoStop,
@@ -8,9 +8,9 @@ const {
   findZoneAll,
   findBusDetailByOperator,
   findOpenHoursAll
-} = require("./src/getBus.js");
+} from "./src/getBus.js";
 
-exports = {
+export {
   findStopAll,
   findBusByOneStop,
   findBusByTwoStop,
@@ -20,4 +20,4 @@ exports = {
   findZoneAll,
   findBusDetailByOperator,
   findOpenHoursAll
-};
+};

package/package.json

@@ -1,20 +1,50 @@
 {
   "name": "bus-mj",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "package for BUS station in Mahajanga",
   "type": "module",
   "main": "index.js",
-  "typings": "index.d.ts",
+  "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
+    }
+  },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node -e \"const {findBusAll, findStopAll} = require('./index.js'); console.log('✓ Module loaded successfully'); console.log('✓ Buses found:', findBusAll().length); console.log('✓ Stops found:', findStopAll().length);\""
   },
+  "files": [
+    "index.js",
+    "index.d.ts",
+    "src/",
+    "data/"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/selestinohajaniaina/bus-mahajanga-api.git"
   },
   "keywords": [
     "api",
-    "bus-mahajanga"
+    "bus-mahajanga",
+    "bus mahajanga",
+    "bus-mahajanga-api",
+    "bus mahajanga api",
+    "api bus mahajanga",
+    "api-bus-mahajanga",
+    "mahajanga",
+    "bus",
+    "mahajanga bus",
+    "mahajanga-bus",
+    "transport",
+    "public-transport",
+    "public transport",
+    "madagascar",
+    "bus-api",
+    "bus api",
+    "bus-api-mahajanga",
+    "bus api mahajanga"
   ],
   "author": "selestino",
   "license": "ISC",

package/src/getBus.js

@@ -1,7 +1,10 @@
-let relations = require("../data/relations");
-const nodes = require("../data/nodes");
+// src/getBus.js
+import relationsData from "../data/relations.js";
+import nodesData from "../data/nodes.js";
 
-relations = relations.map((relation) => {
+const nodes = nodesData;
+
+let relations = relationsData.map((relation) => {
   relation.members = relation.members.map((member) =>
     findStopByRef(member.ref)
   );
@@ -13,7 +16,7 @@ relations = relations.map((relation) => {
  * @param {number} ref id of node
  * @returns { Stop } detail of bus'stop
  */
-function findStopByRef(ref) {
+export function findStopByRef(ref) {
   return nodes.find((e) => e.id === ref);
 }
 
@@ -21,7 +24,7 @@ function findStopByRef(ref) {
  * list all STOPS in data
  * @returns { Stop[] }
  */
-function findStopAll() {
+export function findStopAll() {
   return nodes.filter((node) => node.label != undefined);
 }
 
@@ -30,7 +33,7 @@ function findStopAll() {
  * @param {number} bus_id id of bus ...
  * @returns { Bus }
  */
-function findBusDetailById(bus_id) {
+export function findBusDetailById(bus_id) {
   return relations.find((bus) => bus.id == bus_id);
 }
 
@@ -39,9 +42,20 @@ function findBusDetailById(bus_id) {
  * @param {number} stop_id id of stop
  * @returns { Bus[] }
  */
-function findBusByOneStop(stop_id) {
+export function findBusByOneStop(stop_id) {
   return relations.filter((relation) => {
-    return relation.members.some((member) => member.ref === stop_id);
+    return relation.members.some((member) => member.ref == stop_id);
+  });
+}
+
+/**
+ * find Bus that have a one stop asked
+ * @param {number} stop_label label of stop
+ * @returns { Bus[] }
+ */
+export function findBusByStopLabel(stop_label) {
+  return relations.filter((relation) => {
+    return relation.members.some((member) => member.label && member.label.toUpperCase() == stop_label.toUpperCase());
   });
 }
 
@@ -51,19 +65,38 @@ function findBusByOneStop(stop_id) {
  * @param {number} end STOP_ID - end of Road
  * @returns { Bus[] }
  */
-function findBusByTwoStop(begin, end) {
+export function findBusByTwoStop(begin, end) {
   let firstRelationsFound = findBusByOneStop(begin);
   return firstRelationsFound.filter((relation) => {
     return relation.members.some((member) => member.ref === end);
   });
 }
 
+/**
+ * find the right bus of trajet giving
+ * @param {string} begin STOP_LABEL - begin of Road
+ * @param {string} end STOP_LABEL - end of Road
+ * @returns { Bus[] }
+ */
+export function findBusByTwoStopLabel(begin, end) {
+  let firstRelationsFound = findBusByStopLabel(begin);
+  return firstRelationsFound.filter((relation) => {
+    const beginIndex = relation.members.findIndex(
+      (member) => member.label && member.label.toUpperCase() == begin.toUpperCase()
+    );
+    const endIndex = relation.members.findIndex(
+      (member) => member.label && member.label.toUpperCase() == end.toUpperCase()
+    );
+    return beginIndex != -1 && endIndex != -1 && beginIndex < endIndex;
+  });
+}
+
 /**
  * list all bus detail of Operator
  * @param {string} operator_name id of operator ...
  * @returns { Bus[] }
  */
-function findBusDetailByOperator(operator_name) {
+export function findBusDetailByOperator(operator_name) {
   return relations.filter(
     (bus) =>
       bus.tags.operator &&
@@ -75,7 +108,7 @@ function findBusDetailByOperator(operator_name) {
  * fetch all bus
  * @returns { Bus[] }
  */
-function findBusAll() {
+export function findBusAll() {
   return relations;
 }
 
@@ -83,7 +116,7 @@ function findBusAll() {
  * fetch all operator
  * @returns { string[] }
  */
-function findOperatorAll() {
+export function findOperatorAll() {
   return relations
     .map((relation) => relation.tags.operator)
     .filter(
@@ -96,7 +129,7 @@ function findOperatorAll() {
  * fetch all opennning hours
  * @returns { string[] }
  */
-function findOpenHoursAll() {
+export function findOpenHoursAll() {
   return relations.map((relation) => relation.tags.opening_hours);
 }
 
@@ -104,23 +137,11 @@ function findOpenHoursAll() {
  * fetch all zone
  * @returns { string[] }
  */
-function findZoneAll() {
+export function findZoneAll() {
   return relations
     .map((relation) => relation.tags.network)
     .filter(
       (value, index, self) =>
         self.indexOf(value) === index && value != undefined
     );
-}
-
-module.exports = {
-  findStopAll,
-  findBusByOneStop,
-  findBusByTwoStop,
-  findBusDetailById,
-  findBusAll,
-  findOperatorAll,
-  findZoneAll,
-  findBusDetailByOperator,
-  findOpenHoursAll
-};
+}