Skip to content

Commit

Permalink
use typescript and remove unused stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
fumiichan committed Apr 19, 2023
1 parent f727c1c commit dfa2647
Show file tree
Hide file tree
Showing 28 changed files with 1,079 additions and 3,629 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["@babel/preset-env"]
"presets": ["@babel/preset-env", "@babel/preset-typescript"]
}
5 changes: 0 additions & 5 deletions .idea/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/doujin-event-viewer.iml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

4,087 changes: 794 additions & 3,293 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
{
"name": "event-viewer",
"version": "1.5.11",
"version": "1.5.12",
"description": "A event viewer script to modify dates in event stores such as suruga-ya to indicate event names",
"main": "./src/index.js",
"repository": "https://github.com/aikoofujimotoo/event-viewer",
"author": "Aiko Fujimoto",
"license": "MIT",
"private": true,
"dependencies": {
"cash-dom": "^8.1.0",
"luxon": "^2.0.1",
"replaceall": "^0.1.6"
"luxon": "^3.3.0"
},
"devDependencies": {
"@babel/core": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"babel-loader": "^8.2.2",
"@babel/preset-typescript": "^7.21.4",
"@types/luxon": "^3.3.0",
"babel-loader": "^9.1.2",
"typescript": "^5.0.4",
"webpack": "^5.49.0",
"webpack-cli": "^4.6.0"
"webpack-cli": "^5.0.1"
},
"scripts": {
"build": "node ./scripts/prebuild.js && webpack && node ./scripts/postbuild.js"
"build": "node ./scripts/prebuild.js && webpack --stats-error-details --config ./webpack.config.js && node ./scripts/postbuild.js",
"build:script-only": "webpack --config ./webpack.config.js"
}
}
6 changes: 3 additions & 3 deletions scripts/postbuild.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ============================================================================
// Event Viewer
// Copyright (C) 2021 Aiko Fujimoto
// Copyright (C) 2023 Aiko Fujimoto & Contributors
//
// Licensed under MIT
// ============================================================================
Expand All @@ -15,7 +15,7 @@ const header =
'// ==UserScript==\n' +
'// @name Doujin Event Viewer\n' +
'// @namespace Doujin Event Viewer\n' +
'// @author Aiko Fujimoto\n' +
'// @author Aiko Fujimoto & Contributors\n' +
'// @description Adds Viewable Events to specific event dates\n' +
'// @match *://*/*\n' +
'// @version ' + pkg.version + '\n' +
Expand All @@ -26,7 +26,7 @@ const filename = `doujin-event-viewer-${pkg.version}.stable.user.js`
fs.writeFileSync(path.join(buildRoot, `./${filename}`), `${header}${code}`, 'utf-8')

// Reset event.json after build
fs.writeFileSync(path.join(__dirname, '../src/common/events.json'), '[]\n', 'utf-8')
fs.writeFileSync(path.join(__dirname, '../src/events.json'), '[]\n', 'utf-8')

// Cleanup files generated by webpack
fs.readdirSync(buildRoot)
Expand Down
4 changes: 2 additions & 2 deletions scripts/prebuild.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ============================================================================
// Event Viewer
// Copyright (C) 2021 Aiko Fujimoto
// Copyright (C) 2023 Aiko Fujimoto & Contributors
//
// Licensed under MIT
// ============================================================================
Expand Down Expand Up @@ -42,7 +42,7 @@ const data = fs.readFileSync(eventTextPath, 'utf-8')
})

fs.writeFileSync(
path.join(__dirname, '../src/common/events.json'),
path.join(__dirname, '../src/events.json'),
JSON.stringify(data, null, 2),
'utf-8'
)
44 changes: 0 additions & 44 deletions src/common/eventRename.js

This file was deleted.

56 changes: 56 additions & 0 deletions src/dateSupportHandler.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// ============================================================================
// Event Viewer
// Copyright (C) 2023 Aiko Fujimoto & Contributors
//
// Licensed under MIT
// ============================================================================

import { DateTime, Settings, Interval } from 'luxon';
import events from './events.json';
import { DateSupportType } from './support/dateSupportType';

type EventValueType = {
evt: string;
value: {
from: string,
to: string
} | string;
};

function updateContent(element: HTMLElement, obj: DateSupportType) {
// If locale is specified, then set the default date locale.
if (obj.locale) Settings.defaultLocale = obj.locale;

// If regex fails, quit.
const date = element.innerText.match(obj.date);
if (!date) return;

const dateFormat = obj.formatting || 'yyyy/MM/dd';

element.innerText += ' ' + events.filter((event: EventValueType) => {
if (typeof event.value === 'object') {
const from = DateTime.fromFormat(event.value.from, 'yyyy/MM/dd');
const to = DateTime.fromFormat(event.value.to, 'yyyy/MM/dd').plus(1);
const current = DateTime.fromFormat(date[0], dateFormat);

return Interval.fromDateTimes(from, to).contains(current);
}

const current = DateTime.fromFormat(date[0], dateFormat);
const eventDate = DateTime.fromFormat(event.value, 'yyyy/MM/dd');

return current.equals(eventDate);
}).map((event: EventValueType) => event.evt).join(' ');
}

export default function dateSupportHandler(obj: DateSupportType) {
if (!window.location.href.match(obj.url)) return;
obj.el.forEach(value => {
const elements = document.querySelectorAll(value);

for (const element of elements) {
if (!(element as HTMLElement).innerText || !(element instanceof Element)) continue;
updateContent(element as HTMLElement, obj);
}
})
}
File renamed without changes.
36 changes: 0 additions & 36 deletions src/index.js

This file was deleted.

22 changes: 22 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// ============================================================================
// Event Viewer
// Copyright (C) 2023 Aiko Fujimoto & Contributors
//
// Licensed under MIT
// ============================================================================

import dateSupportHandler from './dateSupportHandler';
import surugaya from './support/dates/surugaya';
import melonbooks from './support/dates/melonbooks';
import discogs from './support/dates/discogs';
import { DateSupportType } from './support/dateSupportType';

function init(eventHandler: (obj: DateSupportType) => void, events: DateSupportType[]) {
events.forEach(event => eventHandler(event));
}

init(dateSupportHandler, [
...surugaya,
...melonbooks,
...discogs
]);
76 changes: 0 additions & 76 deletions src/lib/addEventsToDates.js

This file was deleted.

36 changes: 0 additions & 36 deletions src/lib/renameEvents.js

This file was deleted.

Loading

0 comments on commit dfa2647

Please sign in to comment.