Refactor typescript interfaces and publishing files

Author: wanasit

.gitignore

@@ -1,4 +1,5 @@
 # Node Modules
+dist/
 node_modules/*
 package-lock.json
 

README.md

@@ -172,7 +172,7 @@ Chrono’s extraction pipeline configuration consists of `parsers: Parser[]` and
 interface Parser {
     pattern: (context: ParsingContext) => RegExp,
     extract: (context: ParsingContext, match: RegExpMatchArray) =>
-        (ParsingComponents | ParsingResult | {[c: Component]: string|number} | null)
+        (ParsingComponents | ParsingResult | {[c in Component]?: number} | null)
 }
 ```
 

dist/chrono.js

@@ -8,69 +8,28 @@
   },
   "jest": {
     "verbose": true,
-    "testURL": "http://localhost/"
+    "testURL": "http://localhost/",
+    "preset": "ts-jest"
   },
   "license": "MIT",
   "version": "2.0.3",
   "directories": {
     "source": "./src",
     "test": "./test"
   },
-  "main": "./dist/chrono.js",
-  "babel": {
-    "presets": [
-      "@babel/preset-env",
-      "@babel/preset-typescript"
-    ],
-    "plugins": [
-      "@babel/plugin-proposal-export-namespace-from"
-    ]
-  },
-  "eslintConfig": {
-    "ignorePatterns": [
-      "webpack.config.js",
-      "dist/*.js"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-      "@typescript-eslint",
-      "jest"
-    ],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended",
-      "plugin:jest/recommended"
-    ],
-    "rules": {
-      "@typescript-eslint/explicit-module-boundary-types": "off",
-      "jest/expect-expect": "off"
-    }
-  },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "devDependencies": {
-    "@babel/core": "^7.10.4",
-    "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@typescript-eslint/eslint-plugin": "^3.5.0",
-    "@typescript-eslint/parser": "^3.5.0",
-    "babel-jest": "^25.5.1",
-    "babel-loader": "^8.0.6",
-    "coveralls": "^3.1.0",
-    "eslint": "^7.4.0",
-    "eslint-plugin-jest": "^23.18.0",
-    "jest": "^25.5.4",
-    "terser-webpack-plugin": "^2.3.7",
-    "typescript": "^3.9.6",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.12"
+    "@types/jest": "^26.0.4",
+    "jest": "^26.1.0",
+    "ts-jest": "^26.1.1",
+    "typescript": "^3.9.6"
   },
   "scripts": {
-    "build": "webpack",
+    "build": "tsc -p tsconfig.build.json",
     "watch": "jest --watch",
-    "pretest": "eslint .",
     "test": "jest --coverage",
-    "coveralls": "npm run test && cat coverage/lcov.info | coveralls",
-    "version": "npm run build && git add -A dist"
+    "coveralls": "npm run test && cat coverage/lcov.info | coveralls"
   },
   "dependencies": {
     "dayjs": "^1.8.29"

dist/chrono.js.map

@@ -9,9 +9,9 @@ export interface Configuration {
 }
 
 export interface Parser {
-    pattern: (context: ParsingContext) => RegExp,
-    extract: (context: ParsingContext, match: RegExpMatchArray) =>
-        (ParsingComponents | ParsingResult | {[c: Component]: string|number} | null)
+    pattern(context: ParsingContext): RegExp,
+    extract(context: ParsingContext, match: RegExpMatchArray):
+        (ParsingComponents | ParsingResult | {[c in Component]?: number} | null)
 }
 
 export interface Refiner {
@@ -28,7 +28,7 @@ export class Chrono {
         this.refiners = [...configuration.refiners];
     }
 
-    parseDate(text, refDate, opt): Date {
+    parseDate(text, refDate?, opt?): Date {
         const results = this.parse(text, refDate, opt);
         return (results.length > 0) ? results[0].start.date() : null;
     }
@@ -113,14 +113,14 @@ export class ParsingContext implements DebugHandler {
         readonly option: ParsingOption
     ) {}
 
-    createParsingComponents(components?: {[c: Component]: string|number}) : ParsingComponents {
+    createParsingComponents(components?: {[c in Component]?: number}) : ParsingComponents {
         return new ParsingComponents(this.refDate, components)
     }
 
     createParsingResult(
         index: number, textOrEndIndex: number | string,
-        startComponents?: {[c: Component]: string|number},
-        endComponents?: {[c: Component]: string|number}
+        startComponents?: {[c in Component]?: number},
+        endComponents?: {[c in Component]?: number}
     ) : ParsingResult {
 
         const text = (typeof textOrEndIndex === 'string') ? textOrEndIndex :

dist/chrono.min.js

@@ -0,0 +1,27 @@
+import {Parser, ParsingContext} from "../../chrono";
+import {ParsingComponents, ParsingResult} from "../../results";
+import {Component} from "../../index";
+
+export abstract class AbstractParserWithWordBoundaryChecking implements Parser {
+
+    abstract innerPattern(context: ParsingContext): RegExp;
+    abstract innerExtract(context: ParsingContext, match: RegExpMatchArray):
+        (ParsingComponents | ParsingResult | {[c in Component]?: number} | null)
+
+    pattern(context: ParsingContext): RegExp {
+        const innerPattern = this.innerPattern(context);
+        return new RegExp(`(\\W|^)${innerPattern.source}`, innerPattern.flags);
+    }
+
+    extract(context: ParsingContext, match: RegExpMatchArray) {
+        const header = match[1]
+        match.index = match.index + header.length
+        match[0] = match[0].substring(header.length)
+        for (let i=2; i<match.length; i++) {
+            match[i-1] = match[i]
+        }
+
+        return this.innerExtract(context, match)
+    }
+}
+