norikae-mcp 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -1
- package/dist/index.js +41 -24
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +58 -7
- package/dist/index.test.js.map +1 -1
- package/dist/test.js +45 -4
- package/dist/test.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -102,8 +102,9 @@ npx norikae-mcp
|
|
|
102
102
|
|
|
103
103
|
| パラメータ | 型 | デフォルト | 説明 / Description |
|
|
104
104
|
|-----------|------|----------|---------------------|
|
|
105
|
-
| `timeType` | `departure` \| `arrival` | `departure` | 時刻指定タイプ / Time type |
|
|
105
|
+
| `timeType` | `departure` \| `arrival` \| `first_train` \| `last_train` \| `unspecified` | `departure` | 時刻指定タイプ / Time type |
|
|
106
106
|
| `ticket` | `ic` \| `cash` | `ic` | 運賃タイプ / Fare type |
|
|
107
|
+
| `seatPreference` | `non_reserved` \| `reserved` \| `green` | `non_reserved` | 座席指定 / Seat preference |
|
|
107
108
|
| `walkSpeed` | `fast` \| `slightly_fast` \| `slightly_slow` \| `slow` | `slightly_slow` | 歩く速度 / Walking speed |
|
|
108
109
|
| `sortBy` | `time` \| `transfer` \| `fare` | `time` | 並び順 / Sort order |
|
|
109
110
|
|
|
@@ -162,6 +163,29 @@ AIに以下のように話しかけると、自動的に適切なオプション
|
|
|
162
163
|
| "I want to arrive by 6 PM" | `timeType: arrival`, `hour: 18` |
|
|
163
164
|
| "Need to be there for a 9 AM meeting" | `timeType: arrival`, `hour: 9` |
|
|
164
165
|
|
|
166
|
+
### 始発・終電 / First/Last Train (timeType)
|
|
167
|
+
|
|
168
|
+
| あなたの質問 / Your Question | 認識されるオプション / Recognized Options |
|
|
169
|
+
|------------------------------|------------------------------------------|
|
|
170
|
+
| 「始発で」 | `timeType: first_train` |
|
|
171
|
+
| 「一番早い電車」 | `timeType: first_train` |
|
|
172
|
+
| 「終電で帰りたい」 | `timeType: last_train` |
|
|
173
|
+
| 「最終電車は？」 | `timeType: last_train` |
|
|
174
|
+
| "First train of the day" | `timeType: first_train` |
|
|
175
|
+
| "Last train home" | `timeType: last_train` |
|
|
176
|
+
|
|
177
|
+
### 座席指定 / Seat Preference (seatPreference)
|
|
178
|
+
|
|
179
|
+
| あなたの質問 / Your Question | 認識されるオプション / Recognized Options |
|
|
180
|
+
|------------------------------|------------------------------------------|
|
|
181
|
+
| 「自由席で」 | `seatPreference: non_reserved` (default) |
|
|
182
|
+
| 「指定席で」 | `seatPreference: reserved` |
|
|
183
|
+
| 「グリーン車で」 | `seatPreference: green` |
|
|
184
|
+
| 「贅沢にグリーン車で」 | `seatPreference: green` |
|
|
185
|
+
| "Non-reserved seat" | `seatPreference: non_reserved` |
|
|
186
|
+
| "Reserved seat please" | `seatPreference: reserved` |
|
|
187
|
+
| "Green car / first class" | `seatPreference: green` |
|
|
188
|
+
|
|
165
189
|
### 運賃タイプ / Fare Type (ticket)
|
|
166
190
|
|
|
167
191
|
| あなたの質問 / Your Question | 認識されるオプション / Recognized Options |
|
package/dist/index.js
CHANGED
|
@@ -8,24 +8,25 @@ const server = new McpServer({
|
|
|
8
8
|
});
|
|
9
9
|
// input schema for search_route
|
|
10
10
|
const searchRouteSchema = {
|
|
11
|
-
from: z.string().describe('
|
|
12
|
-
to: z.string().describe('
|
|
13
|
-
via: z.array(z.string()).optional().describe('経由駅名の配列（最大3
|
|
14
|
-
year: z.number().optional().describe('
|
|
15
|
-
month: z.number().optional().describe('
|
|
16
|
-
day: z.number().optional().describe('
|
|
17
|
-
hour: z.number().optional().describe('
|
|
18
|
-
minute: z.number().optional().describe('
|
|
19
|
-
timeType: z.enum(['departure', 'arrival']).optional().describe('
|
|
20
|
-
ticket: z.enum(['ic', 'cash']).optional().describe('
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
11
|
+
from: z.string().describe('出発駅名 / Departure station (例: 東京, Shinjuku)'),
|
|
12
|
+
to: z.string().describe('到着駅名 / Arrival station (例: 横浜, Shibuya)'),
|
|
13
|
+
via: z.array(z.string()).optional().describe('経由駅名の配列（最大3駅）/ Via stations array (max 3)'),
|
|
14
|
+
year: z.number().optional().describe('出発年 / Year (例: 2026)'),
|
|
15
|
+
month: z.number().optional().describe('出発月 / Month (1-12)'),
|
|
16
|
+
day: z.number().optional().describe('出発日 / Day (1-31)'),
|
|
17
|
+
hour: z.number().optional().describe('出発時刻の時 / Hour (0-23)'),
|
|
18
|
+
minute: z.number().optional().describe('出発時刻の分 / Minute (0-59)'),
|
|
19
|
+
timeType: z.enum(['departure', 'arrival', 'first_train', 'last_train', 'unspecified']).optional().describe('時刻指定タイプ / Time type: departure=出発時刻、arrival=到着時刻、first_train=始発、last_train=終電、unspecified=指定なし'),
|
|
20
|
+
ticket: z.enum(['ic', 'cash']).optional().describe('運賃タイプ / Fare type: ic=IC運賃、cash=きっぷ運賃'),
|
|
21
|
+
seatPreference: z.enum(['non_reserved', 'reserved', 'green']).optional().describe('座席指定 / Seat preference: non_reserved=自由席優先、reserved=指定席優先、green=グリーン車優先'),
|
|
22
|
+
walkSpeed: z.enum(['fast', 'slightly_fast', 'slightly_slow', 'slow']).optional().describe('歩く速度 / Walking speed'),
|
|
23
|
+
sortBy: z.enum(['time', 'transfer', 'fare']).optional().describe('並び順 / Sort by: time=到着が早い順、transfer=乗換回数順、fare=料金安い順'),
|
|
24
|
+
useAirline: z.boolean().optional().describe('空路を使う / Use airlines'),
|
|
25
|
+
useShinkansen: z.boolean().optional().describe('新幹線を使う / Use Shinkansen'),
|
|
26
|
+
useExpress: z.boolean().optional().describe('有料特急を使う / Use express trains'),
|
|
27
|
+
useHighwayBus: z.boolean().optional().describe('高速バスを使う / Use highway buses'),
|
|
28
|
+
useLocalBus: z.boolean().optional().describe('路線バスを使う / Use local buses'),
|
|
29
|
+
useFerry: z.boolean().optional().describe('フェリーを使う / Use ferries'),
|
|
29
30
|
};
|
|
30
31
|
// register prompt for usage instructions
|
|
31
32
|
server.registerPrompt('norikae-usage', {
|
|
@@ -99,7 +100,15 @@ Note: Japanese kanji may differ from Chinese hanzi (e.g., 渋 vs 涩/澀, 横 vs
|
|
|
99
100
|
Examples:
|
|
100
101
|
- "Tokyo to Shinjuku" → from: "東京", to: "新宿"
|
|
101
102
|
- "从东京到新宿" → from: "東京", to: "新宿"
|
|
102
|
-
- "Shibuya to Ikebukuro via Harajuku" → from: "渋谷", to: "池袋", via: ["原宿"]
|
|
103
|
+
- "Shibuya to Ikebukuro via Harajuku" → from: "渋谷", to: "池袋", via: ["原宿"]
|
|
104
|
+
|
|
105
|
+
Options summary:
|
|
106
|
+
- timeType: departure(出発), arrival(到着), first_train(始発), last_train(終電), unspecified(指定なし)
|
|
107
|
+
- ticket: ic(ICカード), cash(きっぷ)
|
|
108
|
+
- seatPreference: non_reserved(自由席), reserved(指定席), green(グリーン車)
|
|
109
|
+
- walkSpeed: fast(急いで), slightly_fast(少し急いで), slightly_slow(少しゆっくり), slow(ゆっくり)
|
|
110
|
+
- sortBy: time(到着が早い順), transfer(乗換回数順), fare(料金安い順)
|
|
111
|
+
- useAirline, useShinkansen, useExpress, useHighwayBus, useLocalBus, useFerry: true/false`;
|
|
103
112
|
server.registerTool('search_route', {
|
|
104
113
|
title: '乗り換え検索',
|
|
105
114
|
description: toolDescription,
|
|
@@ -109,7 +118,7 @@ server.registerTool('search_route', {
|
|
|
109
118
|
openWorldHint: true, // interacts with external service (Yahoo)
|
|
110
119
|
},
|
|
111
120
|
}, async (args) => {
|
|
112
|
-
const { from, to, via, year, month, day, hour, minute, timeType, ticket, walkSpeed, sortBy, useAirline, useShinkansen, useExpress, useHighwayBus, useLocalBus, useFerry, } = args;
|
|
121
|
+
const { from, to, via, year, month, day, hour, minute, timeType, ticket, seatPreference, walkSpeed, sortBy, useAirline, useShinkansen, useExpress, useHighwayBus, useLocalBus, useFerry, } = args;
|
|
113
122
|
// default to current time if not specified
|
|
114
123
|
const now = new Date();
|
|
115
124
|
const y = year ?? now.getFullYear();
|
|
@@ -122,6 +131,7 @@ server.registerTool('search_route', {
|
|
|
122
131
|
const options = {
|
|
123
132
|
timeType: timeType ?? 'departure',
|
|
124
133
|
ticket: ticket ?? 'ic',
|
|
134
|
+
seatPreference: seatPreference ?? 'non_reserved',
|
|
125
135
|
walkSpeed: walkSpeed ?? 'slightly_slow',
|
|
126
136
|
sortBy: sortBy ?? 'time',
|
|
127
137
|
useAirline: useAirline ?? true,
|
|
@@ -149,9 +159,16 @@ server.registerTool('search_route', {
|
|
|
149
159
|
});
|
|
150
160
|
function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, options) {
|
|
151
161
|
// map options to Yahoo URL parameters
|
|
152
|
-
|
|
162
|
+
// type: 1=出発, 4=到着, 3=始発, 2=終電, 5=指定なし
|
|
163
|
+
const timeTypeMap = { departure: '1', arrival: '4', first_train: '3', last_train: '2', unspecified: '5' };
|
|
164
|
+
// ticket: ic=ICカード優先, normal=現金（きっぷ）優先
|
|
165
|
+
const ticketMap = { ic: 'ic', cash: 'normal' };
|
|
166
|
+
// expkind: 1=自由席優先, 2=指定席優先, 3=グリーン車優先
|
|
167
|
+
const seatPreferenceMap = { non_reserved: '1', reserved: '2', green: '3' };
|
|
168
|
+
// ws: 1=急いで, 2=少し急いで, 3=少しゆっくり, 4=ゆっくり
|
|
153
169
|
const walkSpeedMap = { fast: '1', slightly_fast: '2', slightly_slow: '3', slow: '4' };
|
|
154
|
-
|
|
170
|
+
// s: 0=到着が早い順, 1=料金が安い順, 2=乗換回数順
|
|
171
|
+
const sortByMap = { time: '0', fare: '1', transfer: '2' };
|
|
155
172
|
const params = new URLSearchParams({
|
|
156
173
|
from: from,
|
|
157
174
|
to: to,
|
|
@@ -162,8 +179,8 @@ function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, opt
|
|
|
162
179
|
m1: Math.floor(minute / 10).toString(),
|
|
163
180
|
m2: (minute % 10).toString(),
|
|
164
181
|
type: timeTypeMap[options.timeType],
|
|
165
|
-
ticket: options.ticket,
|
|
166
|
-
expkind:
|
|
182
|
+
ticket: ticketMap[options.ticket],
|
|
183
|
+
expkind: seatPreferenceMap[options.seatPreference],
|
|
167
184
|
ws: walkSpeedMap[options.walkSpeed],
|
|
168
185
|
s: sortByMap[options.sortBy],
|
|
169
186
|
al: options.useAirline ? '1' : '0',
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;IAC3B,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AAEH,gCAAgC;AAChC,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.test.js
CHANGED
|
@@ -4,9 +4,16 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { describe, it, expect } from 'vitest';
|
|
6
6
|
function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, options) {
|
|
7
|
-
|
|
7
|
+
// type: 1=出発, 4=到着, 3=始発, 2=終電, 5=指定なし
|
|
8
|
+
const timeTypeMap = { departure: '1', arrival: '4', first_train: '3', last_train: '2', unspecified: '5' };
|
|
9
|
+
// ticket: ic=ICカード優先, normal=現金（きっぷ）優先
|
|
10
|
+
const ticketMap = { ic: 'ic', cash: 'normal' };
|
|
11
|
+
// expkind: 1=自由席優先, 2=指定席優先, 3=グリーン車優先
|
|
12
|
+
const seatPreferenceMap = { non_reserved: '1', reserved: '2', green: '3' };
|
|
13
|
+
// ws: 1=急いで, 2=少し急いで, 3=少しゆっくり, 4=ゆっくり
|
|
8
14
|
const walkSpeedMap = { fast: '1', slightly_fast: '2', slightly_slow: '3', slow: '4' };
|
|
9
|
-
|
|
15
|
+
// s: 0=到着が早い順, 1=料金が安い順, 2=乗換回数順
|
|
16
|
+
const sortByMap = { time: '0', fare: '1', transfer: '2' };
|
|
10
17
|
const params = new URLSearchParams({
|
|
11
18
|
from: from,
|
|
12
19
|
to: to,
|
|
@@ -17,8 +24,8 @@ function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, opt
|
|
|
17
24
|
m1: Math.floor(minute / 10).toString(),
|
|
18
25
|
m2: (minute % 10).toString(),
|
|
19
26
|
type: timeTypeMap[options.timeType],
|
|
20
|
-
ticket: options.ticket,
|
|
21
|
-
expkind:
|
|
27
|
+
ticket: ticketMap[options.ticket],
|
|
28
|
+
expkind: seatPreferenceMap[options.seatPreference],
|
|
22
29
|
ws: walkSpeedMap[options.walkSpeed],
|
|
23
30
|
s: sortByMap[options.sortBy],
|
|
24
31
|
al: options.useAirline ? '1' : '0',
|
|
@@ -36,6 +43,7 @@ function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, opt
|
|
|
36
43
|
const defaultOptions = {
|
|
37
44
|
timeType: 'departure',
|
|
38
45
|
ticket: 'ic',
|
|
46
|
+
seatPreference: 'non_reserved',
|
|
39
47
|
walkSpeed: 'slightly_slow',
|
|
40
48
|
sortBy: 'time',
|
|
41
49
|
useAirline: true,
|
|
@@ -69,7 +77,28 @@ describe('buildYahooTransitUrl', () => {
|
|
|
69
77
|
...defaultOptions,
|
|
70
78
|
timeType: 'arrival',
|
|
71
79
|
});
|
|
72
|
-
expect(url).toContain('type=
|
|
80
|
+
expect(url).toContain('type=4'); // arrival
|
|
81
|
+
});
|
|
82
|
+
it('should set first_train type', () => {
|
|
83
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 5, 0, {
|
|
84
|
+
...defaultOptions,
|
|
85
|
+
timeType: 'first_train',
|
|
86
|
+
});
|
|
87
|
+
expect(url).toContain('type=3'); // 始発
|
|
88
|
+
});
|
|
89
|
+
it('should set last_train type', () => {
|
|
90
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 23, 0, {
|
|
91
|
+
...defaultOptions,
|
|
92
|
+
timeType: 'last_train',
|
|
93
|
+
});
|
|
94
|
+
expect(url).toContain('type=2'); // 終電
|
|
95
|
+
});
|
|
96
|
+
it('should set unspecified type', () => {
|
|
97
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 12, 0, {
|
|
98
|
+
...defaultOptions,
|
|
99
|
+
timeType: 'unspecified',
|
|
100
|
+
});
|
|
101
|
+
expect(url).toContain('type=5'); // 指定なし
|
|
73
102
|
});
|
|
74
103
|
it('should disable shinkansen when specified', () => {
|
|
75
104
|
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 30, {
|
|
@@ -83,7 +112,14 @@ describe('buildYahooTransitUrl', () => {
|
|
|
83
112
|
...defaultOptions,
|
|
84
113
|
sortBy: 'fare',
|
|
85
114
|
});
|
|
86
|
-
expect(url).toContain('s=
|
|
115
|
+
expect(url).toContain('s=1'); // fare
|
|
116
|
+
});
|
|
117
|
+
it('should set sort by transfer', () => {
|
|
118
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 30, {
|
|
119
|
+
...defaultOptions,
|
|
120
|
+
sortBy: 'transfer',
|
|
121
|
+
});
|
|
122
|
+
expect(url).toContain('s=2'); // transfer
|
|
87
123
|
});
|
|
88
124
|
it('should set walk speed to fast', () => {
|
|
89
125
|
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 30, {
|
|
@@ -97,7 +133,21 @@ describe('buildYahooTransitUrl', () => {
|
|
|
97
133
|
...defaultOptions,
|
|
98
134
|
ticket: 'cash',
|
|
99
135
|
});
|
|
100
|
-
expect(url).toContain('ticket=
|
|
136
|
+
expect(url).toContain('ticket=normal'); // cash maps to 'normal'
|
|
137
|
+
});
|
|
138
|
+
it('should set reserved seat preference', () => {
|
|
139
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 30, {
|
|
140
|
+
...defaultOptions,
|
|
141
|
+
seatPreference: 'reserved',
|
|
142
|
+
});
|
|
143
|
+
expect(url).toContain('expkind=2'); // 指定席優先
|
|
144
|
+
});
|
|
145
|
+
it('should set green car preference', () => {
|
|
146
|
+
const url = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 30, {
|
|
147
|
+
...defaultOptions,
|
|
148
|
+
seatPreference: 'green',
|
|
149
|
+
});
|
|
150
|
+
expect(url).toContain('expkind=3'); // グリーン車優先
|
|
101
151
|
});
|
|
102
152
|
it('should include single via station', () => {
|
|
103
153
|
const url = buildYahooTransitUrl('東京', '新宿', ['表参道'], 2026, 1, 22, 10, 30, defaultOptions);
|
|
@@ -130,6 +180,7 @@ describe('SearchOptions defaults', () => {
|
|
|
130
180
|
it('should have correct default values', () => {
|
|
131
181
|
expect(defaultOptions.timeType).toBe('departure');
|
|
132
182
|
expect(defaultOptions.ticket).toBe('ic');
|
|
183
|
+
expect(defaultOptions.seatPreference).toBe('non_reserved');
|
|
133
184
|
expect(defaultOptions.walkSpeed).toBe('slightly_slow');
|
|
134
185
|
expect(defaultOptions.sortBy).toBe('time');
|
|
135
186
|
expect(defaultOptions.useShinkansen).toBe(true);
|
package/dist/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
package/dist/test.js
CHANGED
|
@@ -4,9 +4,16 @@
|
|
|
4
4
|
* Run: npx ts-node src/test.ts
|
|
5
5
|
*/
|
|
6
6
|
function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, options) {
|
|
7
|
-
|
|
7
|
+
// type: 1=出発, 4=到着, 3=始発, 2=終電, 5=指定なし
|
|
8
|
+
const timeTypeMap = { departure: '1', arrival: '4', first_train: '3', last_train: '2', unspecified: '5' };
|
|
9
|
+
// ticket: ic=ICカード優先, normal=現金（きっぷ）優先
|
|
10
|
+
const ticketMap = { ic: 'ic', cash: 'normal' };
|
|
11
|
+
// expkind: 1=自由席優先, 2=指定席優先, 3=グリーン車優先
|
|
12
|
+
const seatPreferenceMap = { non_reserved: '1', reserved: '2', green: '3' };
|
|
13
|
+
// ws: 1=急いで, 2=少し急いで, 3=少しゆっくり, 4=ゆっくり
|
|
8
14
|
const walkSpeedMap = { fast: '1', slightly_fast: '2', slightly_slow: '3', slow: '4' };
|
|
9
|
-
|
|
15
|
+
// s: 0=到着が早い順, 1=料金が安い順, 2=乗換回数順
|
|
16
|
+
const sortByMap = { time: '0', fare: '1', transfer: '2' };
|
|
10
17
|
const params = new URLSearchParams({
|
|
11
18
|
from: from,
|
|
12
19
|
to: to,
|
|
@@ -17,8 +24,8 @@ function buildYahooTransitUrl(from, to, via, year, month, day, hour, minute, opt
|
|
|
17
24
|
m1: Math.floor(minute / 10).toString(),
|
|
18
25
|
m2: (minute % 10).toString(),
|
|
19
26
|
type: timeTypeMap[options.timeType],
|
|
20
|
-
ticket: options.ticket,
|
|
21
|
-
expkind:
|
|
27
|
+
ticket: ticketMap[options.ticket],
|
|
28
|
+
expkind: seatPreferenceMap[options.seatPreference],
|
|
22
29
|
ws: walkSpeedMap[options.walkSpeed],
|
|
23
30
|
s: sortByMap[options.sortBy],
|
|
24
31
|
al: options.useAirline ? '1' : '0',
|
|
@@ -67,6 +74,7 @@ async function testUrlBuilder() {
|
|
|
67
74
|
const defaultOptions = {
|
|
68
75
|
timeType: 'departure',
|
|
69
76
|
ticket: 'ic',
|
|
77
|
+
seatPreference: 'non_reserved',
|
|
70
78
|
walkSpeed: 'slightly_slow',
|
|
71
79
|
sortBy: 'time',
|
|
72
80
|
useAirline: true,
|
|
@@ -108,12 +116,45 @@ async function testUrlBuilder() {
|
|
|
108
116
|
console.log('Test 5 - Multiple via stations:');
|
|
109
117
|
console.log(` From: 東京 → Via: 表参道, 飯田橋, 広尾 → To: 新宿`);
|
|
110
118
|
console.log(` URL: ${url5}\n`);
|
|
119
|
+
// test 6: first train (始発)
|
|
120
|
+
const url6 = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 5, 0, {
|
|
121
|
+
...defaultOptions,
|
|
122
|
+
timeType: 'first_train',
|
|
123
|
+
});
|
|
124
|
+
console.log('Test 6 - First train (始発):');
|
|
125
|
+
console.log(` From: 東京 → To: 大阪`);
|
|
126
|
+
console.log(` URL: ${url6}\n`);
|
|
127
|
+
// test 7: last train (終電)
|
|
128
|
+
const url7 = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 23, 0, {
|
|
129
|
+
...defaultOptions,
|
|
130
|
+
timeType: 'last_train',
|
|
131
|
+
});
|
|
132
|
+
console.log('Test 7 - Last train (終電):');
|
|
133
|
+
console.log(` From: 東京 → To: 大阪`);
|
|
134
|
+
console.log(` URL: ${url7}\n`);
|
|
135
|
+
// test 8: green car preference
|
|
136
|
+
const url8 = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 0, {
|
|
137
|
+
...defaultOptions,
|
|
138
|
+
seatPreference: 'green',
|
|
139
|
+
});
|
|
140
|
+
console.log('Test 8 - Green car preference:');
|
|
141
|
+
console.log(` From: 東京 → To: 大阪`);
|
|
142
|
+
console.log(` URL: ${url8}\n`);
|
|
143
|
+
// test 9: cash ticket
|
|
144
|
+
const url9 = buildYahooTransitUrl('東京', '大阪', [], 2026, 1, 22, 10, 0, {
|
|
145
|
+
...defaultOptions,
|
|
146
|
+
ticket: 'cash',
|
|
147
|
+
});
|
|
148
|
+
console.log('Test 9 - Cash ticket (きっぷ):');
|
|
149
|
+
console.log(` From: 東京 → To: 大阪`);
|
|
150
|
+
console.log(` URL: ${url9}\n`);
|
|
111
151
|
}
|
|
112
152
|
async function testFetchAndParse() {
|
|
113
153
|
console.log('=== Test: Fetch and Parse ===\n');
|
|
114
154
|
const defaultOptions = {
|
|
115
155
|
timeType: 'departure',
|
|
116
156
|
ticket: 'ic',
|
|
157
|
+
seatPreference: 'non_reserved',
|
|
117
158
|
walkSpeed: 'slightly_slow',
|
|
118
159
|
sortBy: 'time',
|
|
119
160
|
useAirline: true,
|
package/dist/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";AAEA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|