Skip to content

Commit 8fd910a

Browse files
committed
fix imports, add build, add docker compose file for db
1 parent e3a6af0 commit 8fd910a

20 files changed

Lines changed: 70 additions & 24 deletions

.github/workflows/publish.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Publish to NPM
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
- name: Use Node.js
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: 22.x
18+
registry-url: 'https://registry.npmjs.org'
19+
- run: npm install
20+
- run: npm test
21+
- name: Configure git
22+
run: |
23+
git config --global user.name 'github-actions[bot]'
24+
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
25+
- name: Bump version and publish
26+
run: |
27+
npm version patch -m "Bump version to %s [skip ci]"
28+
git push
29+
git push --tags
30+
npm publish
31+
env:
32+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

config/timetable/file/ALF.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {DateField} from "../../../src/feed/field/DateField";
66
import {SingleRecordFile} from "../../../src/feed/file/SingleRecordFile";
77
import {BooleanField} from "../../../src/feed/field/BooleanField";
88

9-
import * as memoize from "memoized-class-decorator";
9+
import memoize from "memoized-class-decorator";
1010
import {Record, FieldMap, ParsedRecord, RecordAction} from "../../../src/feed/record/Record";
1111
import {FieldValue} from "../../../src/feed/field/Field";
1212

docker-compose.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
services:
2+
mariadb:
3+
image: mariadb:latest
4+
container_name: dtd2mysql-db
5+
environment:
6+
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
7+
MYSQL_DATABASE: dtd2mysql
8+
MYSQL_ROOT_HOST: "%"
9+
ports:
10+
- "3306:3306"
11+
volumes:
12+
- mariadb_data:/var/lib/mysql
13+
14+
volumes:
15+
mariadb_data:

src/cli/CleanFaresCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
import {CLICommand} from "./CLICommand";
33
import {DatabaseConnection} from "../database/DatabaseConnection";
4-
import * as moment from "moment";
4+
import moment from "moment";
55
import {Moment} from "moment";
66

77
export class CleanFaresCommand implements CLICommand {

src/cli/Container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as memoize from "memoized-class-decorator";
1+
import memoize from "memoized-class-decorator";
22
import * as fs from 'node:fs';
33
import * as os from 'node:os';
44
import * as path from 'node:path';

src/cli/ImportFeedCommand.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as AdmZip from "adm-zip";
1+
import AdmZip from "adm-zip";
22
import * as fs from 'fs';
33
import {CLICommand} from "./CLICommand";
44
import {FeedConfig} from "../../config";
@@ -7,12 +7,12 @@ import {MySQLSchema} from "../database/MySQLSchema";
77
import {DatabaseConnection} from "../database/DatabaseConnection";
88
import * as path from "path";
99
import {MySQLTable} from "../database/MySQLTable";
10-
import * as memoize from "memoized-class-decorator";
10+
import memoize from "memoized-class-decorator";
1111
import {MultiRecordFile} from "../feed/file/MultiRecordFile";
1212
import {RecordWithManualIdentifier} from "../feed/record/FixedWidthRecord";
1313
import {MySQLStream, TableIndex} from "../database/MySQLStream";
14-
import * as byline from "byline";
15-
import * as streamToPromise from "stream-to-promise";
14+
import byline from "byline";
15+
import streamToPromise from "stream-to-promise";
1616

1717
const getExt = filename => path.extname(filename).slice(1).toUpperCase();
1818
const readFile = filename => byline.createStream(fs.createReadStream(filename, "utf8"));

src/cli/OutputGTFSCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {ScheduleResults} from "../gtfs/repository/ScheduleBuilder";
1111
import {GTFSOutput} from "../gtfs/output/GTFSOutput";
1212
import * as fs from "fs";
1313
import {addLateNightServices} from "../gtfs/command/AddLateNightServices";
14-
import * as streamToPromise from "stream-to-promise";
14+
import streamToPromise from "stream-to-promise";
1515

1616
export class OutputGTFSCommand implements CLICommand {
1717
private baseDir: string;

src/feed/field/Field.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import * as memoize from "memoized-class-decorator";
2+
import memoize from "memoized-class-decorator";
33

44
/**
55
* Parent class for all fields

src/feed/record/CSVRecord.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
import {Field, FieldValue} from "../field/Field";
33
import {FieldMap, ParsedRecord, Record, RecordAction} from "./Record";
4-
import * as memoize from "memoized-class-decorator";
4+
import memoize from "memoized-class-decorator";
55

66
export class CSVRecord implements Record {
77

src/gtfs/native/Association.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import {Schedule} from "./Schedule";
33
import {NO_DAYS, OverlapType, ScheduleCalendar} from "./ScheduleCalendar";
44
import {CRS, Stop} from "../file/Stop";
5-
import {Duration, Moment} from "moment";
5+
import moment, {Duration, Moment} from "moment";
66
import {IdGenerator, OverlayRecord, STP, TUID} from "./OverlayRecord";
77
import {StopTime} from "../file/StopTime";
8-
import * as moment from "moment";
98
import {formatDuration} from "./Duration";
109

1110
export class Association implements OverlayRecord {

0 commit comments

Comments
 (0)