refactoray

abbr/index.ts

@@ -2,8 +2,9 @@ import fs from "fs";
 import { render } from "template-file";
 
 import { MakerBase } from "../common/classes";
-import { IAbbr, IDictConf } from "../common/interfaces";
+import { IDictConf } from "../common/interfaces";
 import { GeneratorByHand } from "../common/jsonFileGenerator";
+import { IAbbr } from "./interfaces";
 import { FILENAME } from "../config";
 
 export class Maker extends MakerBase {

abbr/interfaces.ts

@@ -0,0 +1,5 @@
+export interface IAbbr {
+  abbr: string;
+  text: string;
+  type: string;
+}

common/interfaces.ts

@@ -1,3 +1,8 @@
+import { IPts } from "../pts/interfaces";
+import { IAbbr } from "../abbr/interfaces";
+import { IDppn } from "../dppn/interfaces";
+import { INcped } from "../ncped/interfaces";
+
 export interface IDictConf {
   jsonUrl?: string;
   fullName: string;
@@ -15,29 +20,6 @@ export interface IFileName {
   mdx: string;            // result mdict file
 }
 
-export interface IPts {
-  word: string;
-  text: string;
-}
-
-export interface INcped {
-  entry: string;
-  grammar?: string;
-  definition?: string | string[];
-  xr?: string | string[]; // cross references
-}
-
-export interface IDppn {
-  word: string;
-  text: string;
-}
-
-export interface IAbbr {
-  abbr: string;
-  text: string;
-  type: string;
-}
-
 export type IEntry = IPts | INcped | IDppn | IAbbr;
 
 export interface IJsonFileGenerator {

config.ts

@@ -1,14 +1,4 @@
-import { IDictConf, IFileName as IFileName } from "./common/interfaces";
-
-export const FILENAME: IFileName = {
-  entryTemplate: 'entry.html',
-  json: "dict.json",
-  css: "dict.css",
-  txt: "dict.txt",
-  title: "title.html",
-  description: "description.html",
-  mdx: "dict.mdx"
-}
+import { IDictConf, IFileName } from "./common/interfaces";
 
 export enum DictEnum {
   PTS = "pts",
@@ -17,9 +7,19 @@ export enum DictEnum {
   ABBR = "abbr"
 };
 
+type dictionary = Record<DictEnum, IDictConf>;
+
 export const ASSETS_DIR = `${__dirname}/assets`;
 
-type dictionary = Record<DictEnum, IDictConf>
+export const FILENAME: IFileName = {
+  entryTemplate: "entry.html",
+  json: "dict.json",
+  css: "dict.css",
+  txt: "dict.txt",
+  title: "title.html",
+  description: "description.html",
+  mdx: "dict.mdx",
+};
 
 export const DICTIONARY: dictionary = {
   [DictEnum.PTS]: {

dppn/index.ts

@@ -2,8 +2,9 @@ import fs from "fs";
 import { render } from "template-file";
 
 import { MakerBase } from "../common/classes"; 
-import { IDppn, IDictConf } from "../common/interfaces";
+import { IDictConf } from "../common/interfaces";
 import { GeneratorByDownload } from "../common/jsonFileGenerator";
+import { IDppn } from "./interfaces";
 import { FILENAME } from "../config";
 
 export class Maker extends MakerBase {

dppn/interfaces.ts

@@ -0,0 +1,4 @@
+export interface IDppn {
+  word: string;
+  text: string;
+}

ncped/index.ts

@@ -2,8 +2,9 @@ import fs from "fs";
 import { render } from "template-file";
 
 import { MakerBase } from "../common/classes";
-import { INcped, IDictConf } from "../common/interfaces";
+import { IDictConf } from "../common/interfaces";
 import { GeneratorByDownload } from "../common/jsonFileGenerator";
+import { INcped } from "./interfaces";
 import { FILENAME } from "../config";
 
 export class Maker extends MakerBase {

ncped/interfaces.ts

@@ -0,0 +1,6 @@
+export interface INcped {
+  entry: string;
+  grammar?: string;
+  definition?: string | string[];
+  xr?: string | string[]; // cross references
+}

pts/index.ts

@@ -2,8 +2,9 @@ import fs from "fs";
 import { render } from "template-file";
 
 import { MakerBase } from "../common/classes";
-import { IPts, IDictConf } from "../common/interfaces";
+import { IDictConf } from "../common/interfaces";
 import { GeneratorByDownload } from "../common/jsonFileGenerator";
+import { IPts } from "./interfaces";
 import { FILENAME } from "../config";
 
 export class Maker extends MakerBase {

pts/interfaces.ts

@@ -0,0 +1,4 @@
+export interface IPts {
+  word: string;
+  text: string;
+}