config2ts 2.0.0 → 2.1.2

package/.vscode/tasks.json

@@ -1,10 +1,31 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "0.1.0",
-    "command": "tsc",
-    "isShellCommand": true,
-    "args": ["-p", ".", "--outDir", "dist"],
-    "showOutput": "always",
-    "problemMatcher": "$tsc"
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "command": "tsc",
+    "args": [
+        "-p",
+        ".",
+        "--outDir",
+        "dist"
+    ],
+    "problemMatcher": "$tsc",
+    "tasks": [
+        {
+            "label": "tsc",
+            "type": "shell",
+            "command": "tsc",
+            "args": [
+                "-p",
+                ".",
+                "--outDir",
+                "dist"
+            ],
+            "problemMatcher": "$tsc",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
+        }
+    ]
 }

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2016 huanming li
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2016 huanming li
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,21 +1,21 @@
-# config2ts
-convert config to ts file.
-
-# install
-run command: `npm install -g config2ts`
-
-# how to use
-config2ts folder contains csv
-
-## Usage
-```
-  Options:
-
-    -h, --help             output usage information
-    -V, --version          output the version number
-    -d, --dir <path>       set convert path. default: ./
-    -o, --outDir <path>    set outDir path. default: same as dir
-    -p, --prefix <prefix>  set interface prefix. default: ""
-    -s, --suffix <suffix>  set interface suffix. default: "Csv"
-    -m, --merge <name>     merge all to one ts file. default: csv.ts
+# config2ts
+convert config to ts file.
+
+# install
+run command: `npm install -g config2ts`
+
+# how to use
+config2ts folder contains csv
+
+## Usage
+```
+  Options:
+
+    -h, --help             output usage information
+    -V, --version          output the version number
+    -d, --dir <path>       set convert path. default: ./
+    -o, --outDir <path>    set outDir path. default: same as dir
+    -p, --prefix <prefix>  set interface prefix. default: ""
+    -s, --suffix <suffix>  set interface suffix. default: "Csv"
+    -m, --merge <name>     merge all to one ts file. default: csv.ts
 ```

package/bin/config2ts

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 require('../dist/main');

package/config/data.csv

@@ -1,5 +1,5 @@
-id,name,bool,num
-Number,String,Boolean,Number
-1,"xxx",1,111
-2,"xxx",,222
+id,name,bool,num
+String,String,Boolean,Number
+1,"xxx",1,111
+2,"xxx",,222
 3,333,,

package/config/data.csv.ts

@@ -1,34 +1,34 @@
-export namespace DataCsv {
-
-    export interface Record {
-        id: number;
-        name: string;
-        bool: boolean;
-        num: number;
-    };
-
-    export const List: Record[] = [
-        {
-            "id": 1,
-            "name": "xxx",
-            "bool": true,
-            "num": 111
-        },
-        {
-            "id": 2,
-            "name": "xxx",
-            "bool": false,
-            "num": 222
-        },
-        {
-            "id": 3,
-            "name": "333",
-            "bool": false,
-            "num": 0
-        }
-    ];
-
-    export const Map: { [id: number]: Record } = {};
-    for (const v of List) { Map[v.id] = v; };
-
+export namespace DataCsv {
+
+    export interface Record {
+        id: string;
+        name: string;
+        bool: boolean;
+        num: number;
+    };
+
+    export const List: Record[] = [
+        {
+            "id": "1",
+            "name": "xxx",
+            "bool": true,
+            "num": 111
+        },
+        {
+            "id": "2",
+            "name": "xxx",
+            "bool": false,
+            "num": 222
+        },
+        {
+            "id": "3",
+            "name": "333",
+            "bool": false,
+            "num": 0
+        }
+    ];
+
+    export const Map: { [id: string]: Record } = {};
+    for (const v of List) { Map[v.id] = v; };
+
 };

package/config/ini-file.ini

@@ -1,7 +1,9 @@
-num = 1
-
-str = "string"
-
-[ItemType]
-book = 1
-fruit = 2
+num = 1
+
+str = "string"
+
+bool = true
+
+[ItemType]
+book = 1
+fruit = 2

package/config/ini-file.ini.ts

@@ -1,8 +1,9 @@
-export const IniFileIni = {
-    "num": "1",
-    "str": "string",
-    "ItemType": {
-        "book": "1",
-        "fruit": "2"
-    }
+export const IniFileIni = {
+    "num": 1,
+    "str": "string",
+    "bool": true,
+    "ItemType": {
+        "book": 1,
+        "fruit": 2
+    }
 };

package/config/no-id.csv

@@ -1,5 +1,5 @@
-name,bool,num
-String,Boolean,Number
-"xxx",1,111
-"xxx",,222
+name,bool,num
+String,Boolean,Number
+"xxx",1,111
+"xxx",,222
 333,,

package/config/no-id.csv.ts

@@ -1,27 +1,27 @@
-export namespace NoIdCsv {
-
-    export interface Record {
-        name: string;
-        bool: boolean;
-        num: number;
-    };
-
-    export const List: Record[] = [
-        {
-            "name": "xxx",
-            "bool": true,
-            "num": 111
-        },
-        {
-            "name": "xxx",
-            "bool": false,
-            "num": 222
-        },
-        {
-            "name": "333",
-            "bool": false,
-            "num": 0
-        }
-    ];
-
+export namespace NoIdCsv {
+
+    export interface Record {
+        name: string;
+        bool: boolean;
+        num: number;
+    };
+
+    export const List: Record[] = [
+        {
+            "name": "xxx",
+            "bool": true,
+            "num": 111
+        },
+        {
+            "name": "xxx",
+            "bool": false,
+            "num": 222
+        },
+        {
+            "name": "333",
+            "bool": false,
+            "num": 0
+        }
+    ];
+
 };

package/config/toml_file.toml

@@ -0,0 +1,7 @@
+num = 1
+
+str = "test"
+
+[ItemType]
+book = 1
+fruit = 2

package/config/toml_file.toml.ts

@@ -0,0 +1,8 @@
+export const TomlFileToml = {
+    "num": 1,
+    "str": "test",
+    "ItemType": {
+        "book": 1,
+        "fruit": 2
+    }
+};

package/config/total.ts

@@ -1,62 +1,62 @@
-export namespace DataCsv {
-
-    export interface Record {
-        id: number;
-        name: string;
-        bool: boolean;
-        num: number;
-    };
-
-    export const List: Record[] = [
-        {
-            "id": 1,
-            "name": "xxx",
-            "bool": true,
-            "num": 111
-        },
-        {
-            "id": 2,
-            "name": "xxx",
-            "bool": false,
-            "num": 222
-        },
-        {
-            "id": 3,
-            "name": "333",
-            "bool": false,
-            "num": 0
-        }
-    ];
-
-    export const Map: { [id: number]: Record } = {};
-    for (const v of List) { Map[v.id] = v; };
-
-};
-
-export namespace NoIdCsv {
-
-    export interface Record {
-        name: string;
-        bool: boolean;
-        num: number;
-    };
-
-    export const List: Record[] = [
-        {
-            "name": "xxx",
-            "bool": true,
-            "num": 111
-        },
-        {
-            "name": "xxx",
-            "bool": false,
-            "num": 222
-        },
-        {
-            "name": "333",
-            "bool": false,
-            "num": 0
-        }
-    ];
-
+export namespace DataCsv {
+
+    export interface Record {
+        id: string;
+        name: string;
+        bool: boolean;
+        num: number;
+    };
+
+    export const List: Record[] = [
+        {
+            "id": "1",
+            "name": "xxx",
+            "bool": true,
+            "num": 111
+        },
+        {
+            "id": "2",
+            "name": "xxx",
+            "bool": false,
+            "num": 222
+        },
+        {
+            "id": "3",
+            "name": "333",
+            "bool": false,
+            "num": 0
+        }
+    ];
+
+    export const Map: { [id: string]: Record } = {};
+    for (const v of List) { Map[v.id] = v; };
+
+};
+
+export namespace NoIdCsv {
+
+    export interface Record {
+        name: string;
+        bool: boolean;
+        num: number;
+    };
+
+    export const List: Record[] = [
+        {
+            "name": "xxx",
+            "bool": true,
+            "num": 111
+        },
+        {
+            "name": "xxx",
+            "bool": false,
+            "num": 222
+        },
+        {
+            "name": "333",
+            "bool": false,
+            "num": 0
+        }
+    ];
+
 };

package/dist/config2ts.js

@@ -1,92 +1,96 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const fs = require("fs");
-const d3 = require("d3");
-const changeCase = require("change-case");
-const ini = require("ini");
-let packageJson = require('../package.json');
-exports.Convert = {
-    ini: function (str, moduleName) {
-        let obj = ini.parse(str);
-        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
-    },
-    csv: function (str, moduleName) {
-        return csv2ts(str, moduleName);
-    }
-};
-function csv2ts(csvString, moduleName) {
-    let convert = {};
-    let result = d3.csvParse(csvString, (d, i) => {
-        if (i === 0) {
-            convert = d;
-            return null;
-        }
-        else {
-            for (let k in d) {
-                if (global[convert[k]] instanceof Function) {
-                    d[k] = global[convert[k]](d[k]);
-                }
-            }
-            return d;
-        }
-    });
-    // 删除columns属性
-    delete result.columns;
-    if (result.length <= 0) {
-        return "";
-    }
-    let template = `export namespace ${moduleName} {\n\n`;
-    // generate interface
-    template += `    export interface Record {\n`;
-    for (let field in convert) {
-        let fieldType = convert[field] !== '' ? convert[field].toLowerCase() : 'string';
-        template += `        ${field}: ${fieldType};\n`;
-    }
-    template += '    };\n\n';
-    // generate table
-    template += `    export const List: Record[] = `;
-    // console.log(prettyFormat(result, op));
-    template += JSON.stringify(result, null, 4).replace(/\n/g, '\n    ');
-    template += ';\n\n';
-    if (convert['id'] === 'Number') {
-        template += `    export const Map: { [id: number]: Record } = {};\n`;
-        template += `    for (const v of List) { Map[v.id] = v; };\n\n`;
-    }
-    template += "};";
-    return template;
-}
-function GetFileExt(filePath) {
-    let pathObject = path.parse(filePath);
-    return pathObject.ext.slice(1);
-}
-function GetTsString(filePath) {
-    let pathObject = path.parse(filePath);
-    let handle = exports.Convert[GetFileExt(filePath)];
-    if (handle) {
-        let moduleName = changeCase.pascalCase(pathObject.base);
-        return handle(fs.readFileSync(filePath).toString(), moduleName);
-    }
-    else {
-        return '';
-    }
-}
-exports.GetTsString = GetTsString;
-function GetTsStringFromFileList(fileList) {
-    return fileList.map((filePath) => {
-        return GetTsString(filePath);
-    }).join('\n\n');
-}
-exports.GetTsStringFromFileList = GetTsStringFromFileList;
-function GetHeaderInfo() {
-    let header = `export let config2ts_version = "${packageJson.version}";\n\n`;
-    header += `export let config2ts_build_timestamp = ${Date.now()};\n\n`;
-    return header;
-}
-exports.GetHeaderInfo = GetHeaderInfo;
-function GetValidFileList(fileList) {
-    return fileList.filter((filePath) => {
-        return exports.Convert[GetFileExt(filePath)] != null;
-    });
-}
-exports.GetValidFileList = GetValidFileList;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const fs = require("fs");
+const d3 = require("d3");
+const changeCase = require("change-case");
+let toml = require('toml');
+let packageJson = require('../package.json');
+exports.Convert = {
+    ini: function (str, moduleName) {
+        let obj = toml.parse(str);
+        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
+    },
+    csv: function (str, moduleName) {
+        return csv2ts(str, moduleName);
+    },
+    toml: function (str, moduleName) {
+        let obj = toml.parse(str);
+        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
+    }
+};
+function csv2ts(csvString, moduleName) {
+    let convert = {};
+    let result = d3.csvParse(csvString, (d, i) => {
+        if (i === 0) {
+            convert = d;
+            return null;
+        }
+        else {
+            for (let k in d) {
+                if (global[convert[k]] instanceof Function) {
+                    d[k] = global[convert[k]](d[k]);
+                }
+            }
+            return d;
+        }
+    });
+    // 删除columns属性
+    delete result.columns;
+    if (result.length <= 0) {
+        return "";
+    }
+    let template = `export namespace ${moduleName} {\n\n`;
+    // generate interface
+    template += `    export interface Record {\n`;
+    for (let field in convert) {
+        let fieldType = convert[field] !== '' ? convert[field].toLowerCase() : 'string';
+        template += `        ${field}: ${fieldType};\n`;
+    }
+    template += '    };\n\n';
+    // generate table
+    template += `    export const List: Record[] = `;
+    // console.log(prettyFormat(result, op));
+    template += JSON.stringify(result, null, 4).replace(/\n/g, '\n    ');
+    template += ';\n\n';
+    if (convert['id'] === 'Number') {
+        template += `    export const Map: { [id: number]: Record } = {};\n`;
+        template += `    for (const v of List) { Map[v.id] = v; };\n\n`;
+    }
+    template += "};";
+    return template;
+}
+function GetFileExt(filePath) {
+    let pathObject = path.parse(filePath);
+    return pathObject.ext.slice(1);
+}
+function GetTsString(filePath) {
+    let pathObject = path.parse(filePath);
+    let handle = exports.Convert[GetFileExt(filePath)];
+    if (handle) {
+        let moduleName = changeCase.pascalCase(pathObject.base);
+        return handle(fs.readFileSync(filePath).toString(), moduleName);
+    }
+    else {
+        return '';
+    }
+}
+exports.GetTsString = GetTsString;
+function GetTsStringFromFileList(fileList) {
+    return fileList.map((filePath) => {
+        return GetTsString(filePath);
+    }).join('\n\n');
+}
+exports.GetTsStringFromFileList = GetTsStringFromFileList;
+function GetHeaderInfo() {
+    let header = `export let config2ts_version = "${packageJson.version}";\n\n`;
+    header += `export let config2ts_build_timestamp = ${Date.now()};\n\n`;
+    return header;
+}
+exports.GetHeaderInfo = GetHeaderInfo;
+function GetValidFileList(fileList) {
+    return fileList.filter((filePath) => {
+        return exports.Convert[GetFileExt(filePath)] != null;
+    });
+}
+exports.GetValidFileList = GetValidFileList;

package/dist/main.js

@@ -1,32 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path = require("path");
-const program = require("commander");
-const config2ts_1 = require("./config2ts");
-program.version(require(path.join(__dirname, '..', 'package.json'))['version']);
-program
-    .option('-d, --dir <path>', 'set convert path. default: ./')
-    .option('-o, --outDir <path>', 'set outDir path. default: same as dir')
-    .option('-m, --merge <name>', 'merge all to one ts file.')
-    .parse(process.argv);
-let dir = program['dir'] || '.';
-let outDir = program['outDir'] || dir;
-let merge = program['merge'];
-let fileList = fs.readdirSync(dir);
-if (merge) {
-    fileList = config2ts_1.GetValidFileList(fileList).map((filename) => {
-        return path.join(dir, filename);
-    });
-    let mergeFile = path.join(outDir, merge);
-    fs.writeFileSync(mergeFile, config2ts_1.GetHeaderInfo() + config2ts_1.GetTsStringFromFileList(fileList));
-    console.log(`config2ts, ${fileList.length} config files, merge into: ${mergeFile}`);
-}
-else {
-    config2ts_1.GetValidFileList(fileList).forEach((filename) => {
-        let target = path.join(outDir, `${filename}.ts`);
-        fs.writeFileSync(target, config2ts_1.GetTsString(path.join(dir, filename)));
-        console.log(`config2ts, convert: ${filename} , to: ${target}`);
-    });
-    console.log('config2ts convert done!');
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const program = require("commander");
+const config2ts_1 = require("./config2ts");
+program.version(require(path.join(__dirname, '..', 'package.json'))['version']);
+program
+    .option('-d, --dir <path>', 'set convert path. default: ./')
+    .option('-o, --outDir <path>', 'set outDir path. default: same as dir')
+    .option('-m, --merge <name>', 'merge all to one ts file.')
+    .parse(process.argv);
+let dir = program['dir'] || '.';
+let outDir = program['outDir'] || dir;
+let merge = program['merge'];
+let fileList = fs.readdirSync(dir);
+if (merge) {
+    fileList = config2ts_1.GetValidFileList(fileList).map((filename) => {
+        return path.join(dir, filename);
+    });
+    let mergeFile = path.join(outDir, merge);
+    fs.writeFileSync(mergeFile, config2ts_1.GetHeaderInfo() + config2ts_1.GetTsStringFromFileList(fileList));
+    console.log(`config2ts, ${fileList.length} config files, merge into: ${mergeFile}`);
+}
+else {
+    config2ts_1.GetValidFileList(fileList).forEach((filename) => {
+        let target = path.join(outDir, `${filename}.ts`);
+        fs.writeFileSync(target, config2ts_1.GetTsString(path.join(dir, filename)));
+        console.log(`config2ts, convert: ${filename} , to: ${target}`);
+    });
+    console.log('config2ts convert done!');
+}

package/jest.config.js

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  moduleNameMapper: {
+    'd3': '<rootDir>/node_modules/d3/dist/d3.min.js',
+  }
+};

package/package.json

@@ -1,53 +1,42 @@
-{
-  "name": "config2ts",
-  "version": "2.0.0",
-  "description": "convert config to ts file.",
-  "main": "index.js",
-  "directories": {
-    "test": "test"
-  },
-  "bin": {
-    "config2ts": "./bin/config2ts"
-  },
-  "scripts": {
-    "test": "node_modules/.bin/jest",
-    "watch-test": "node_modules/.bin/jest --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/livingyang/config2ts.git"
-  },
-  "author": "livingyang",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/livingyang/config2ts/issues"
-  },
-  "homepage": "https://github.com/livingyang/config2ts#readme",
-  "dependencies": {
-    "change-case": "^3.0.1",
-    "commander": "^2.9.0",
-    "d3": "^4.12.2",
-    "ini": "^1.3.5"
-  },
-  "devDependencies": {
-    "@types/d3": "^4.12.0",
-    "@types/ini": "^1.3.29",
-    "@types/jest": "^22.0.1",
-    "@types/node": "^9.3.0",
-    "jest": "^22.0.6",
-    "ts-jest": "^22.0.1",
-    "typescript": "^2.6.2"
-  },
-  "jest": {
-    "transform": {
-      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
-    },
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "json"
-    ]
-  }
-}
+{
+  "name": "config2ts",
+  "version": "2.1.2",
+  "description": "convert config to ts file.",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "bin": {
+    "config2ts": "./bin/config2ts"
+  },
+  "scripts": {
+    "test": "jest",
+    "watch-test": "node_modules/.bin/jest --watch"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/livingyang/config2ts.git"
+  },
+  "author": "livingyang",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/livingyang/config2ts/issues"
+  },
+  "homepage": "https://github.com/livingyang/config2ts#readme",
+  "dependencies": {
+    "change-case": "^4.1.2",
+    "commander": "^9.4.1",
+    "d3": "^7.8.4",
+    "ini": "^3.0.1",
+    "toml": "^3.0.0"
+  },
+  "devDependencies": {
+    "@types/d3": "^7.4.0",
+    "@types/ini": "^1.3.31",
+    "@types/jest": "^29.1.2",
+    "@types/node": "^18.8.5",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.9.5"
+  }
+}

package/src/config2ts.ts

@@ -1,104 +1,110 @@
-import * as path from 'path';
-import * as fs from 'fs';
-import * as d3 from 'd3';
-import * as changeCase from 'change-case';
-import * as ini from 'ini';
-
-let packageJson = require('../package.json');
-
-export const Convert = {
-    ini: function(str: string, moduleName: string) {
-        let obj = ini.parse(str);
-        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
-    },
-
-    csv: function(str: string, moduleName: string) {
-        return csv2ts(str, moduleName);
-    }
-};
-
-function csv2ts(csvString: string, moduleName: string) {
-    let convert = {};
-    let result = d3.csvParse(csvString, (d, i) => {
-        if (i === 0) {
-            convert = d;
-            return null;
-        }
-        else {
-            for (let k in d) {
-                if (global[convert[k]] instanceof Function) {
-                    d[k] = global[convert[k]](d[k]);
-                }
-            }
-            return d;
-        }
-    });
-
-    // 删除columns属性
-    delete result.columns;
-
-    if (result.length <= 0) {
-        return "";
-    }
-    
-    let template = `export namespace ${moduleName} {\n\n`;
-
-    // generate interface
-    template += `    export interface Record {\n`;
-
-    for (let field in convert) {
-        let fieldType = convert[field] !== '' ? convert[field].toLowerCase() : 'string';
-        template += `        ${field}: ${fieldType};\n`;
-    }
-    template += '    };\n\n';
-
-    // generate table
-    template += `    export const List: Record[] = `;
-    // console.log(prettyFormat(result, op));
-    template += JSON.stringify(result, null, 4).replace(/\n/g, '\n    ');
-    template += ';\n\n';
-
-    if (convert['id'] === 'Number') {
-        template += `    export const Map: { [id: number]: Record } = {};\n`;
-        template += `    for (const v of List) { Map[v.id] = v; };\n\n`;
-    }
-
-    template += "};"
-
-    return template;
-}
-
-function GetFileExt(filePath: string) {
-    let pathObject = path.parse(filePath);
-    return pathObject.ext.slice(1);
-}
-
-export function GetTsString(filePath: string) {
-    let pathObject = path.parse(filePath);
-    let handle = Convert[GetFileExt(filePath)];
-    if (handle) {
-        let moduleName = changeCase.pascalCase(pathObject.base);
-        return handle(fs.readFileSync(filePath).toString(), moduleName);
-    }
-    else {
-        return '';
-    }
-}
-
-export function GetTsStringFromFileList(fileList: string[]) {
-    return fileList.map((filePath) => {
-        return GetTsString(filePath);
-    }).join('\n\n');
-}
-
-export function GetHeaderInfo() {
-    let header = `export let config2ts_version = "${packageJson.version}";\n\n`;
-    header += `export let config2ts_build_timestamp = ${Date.now()};\n\n`;
-    return header;
-}
-
-export function GetValidFileList(fileList: string[]) {
-    return fileList.filter((filePath) => {
-        return Convert[GetFileExt(filePath)] != null;
-    })
-}
+import * as path from 'path';
+import * as fs from 'fs';
+import * as d3 from 'd3';
+import * as changeCase from 'change-case';
+import * as ini from 'ini';
+let toml = require('toml');
+
+let packageJson = require('../package.json');
+
+export const Convert = {
+    ini: function(str: string, moduleName: string) {
+        let obj = toml.parse(str);
+        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
+    },
+
+    csv: function(str: string, moduleName: string) {
+        return csv2ts(str, moduleName);
+    },
+
+    toml: function(str: string, moduleName: string) {
+        let obj = toml.parse(str);
+        return `export const ${moduleName} = ${JSON.stringify(obj, null, 4)};`;
+    }
+};
+
+function csv2ts(csvString: string, moduleName: string) {
+    let convert = {};
+    let result = d3.csvParse(csvString, (d, i) => {
+        if (i === 0) {
+            convert = d;
+            return null;
+        }
+        else {
+            for (let k in d) {
+                if (global[convert[k]] instanceof Function) {
+                    d[k] = global[convert[k]](d[k]);
+                }
+            }
+            return d;
+        }
+    });
+
+    // 删除columns属性
+    delete result.columns;
+
+    if (result.length <= 0) {
+        return "";
+    }
+    
+    let template = `export namespace ${moduleName} {\n\n`;
+
+    // generate interface
+    template += `    export interface Record {\n`;
+
+    for (let field in convert) {
+        let fieldType = convert[field] !== '' ? convert[field].toLowerCase() : 'string';
+        template += `        ${field}: ${fieldType};\n`;
+    }
+    template += '    };\n\n';
+
+    // generate table
+    template += `    export const List: Record[] = `;
+    // console.log(prettyFormat(result, op));
+    template += JSON.stringify(result, null, 4).replace(/\n/g, '\n    ');
+    template += ';\n\n';
+
+    if (convert['id'] === 'String') {
+        template += `    export const Map: { [id: string]: Record } = {};\n`;
+        template += `    for (const v of List) { Map[v.id] = v; };\n\n`;
+    }
+
+    template += "};"
+
+    return template;
+}
+
+function GetFileExt(filePath: string) {
+    let pathObject = path.parse(filePath);
+    return pathObject.ext.slice(1);
+}
+
+export function GetTsString(filePath: string) {
+    let pathObject = path.parse(filePath);
+    let handle = Convert[GetFileExt(filePath)];
+    if (handle) {
+        let moduleName = changeCase.pascalCase(pathObject.base);
+        return handle(fs.readFileSync(filePath).toString(), moduleName);
+    }
+    else {
+        return '';
+    }
+}
+
+export function GetTsStringFromFileList(fileList: string[]) {
+    return fileList.map((filePath) => {
+        return GetTsString(filePath);
+    }).join('\n\n');
+}
+
+export function GetHeaderInfo() {
+    let header = `export let config2ts_version = "${packageJson.version}";\n\n`;
+    header += `export let config2ts_build_timestamp = ${Date.now()};\n\n`;
+    return header;
+}
+
+export function GetValidFileList(fileList: string[]) {
+    return fileList.filter((filePath) => {
+        return Convert[GetFileExt(filePath)] != null;
+    })
+}

package/src/main.ts

@@ -1,35 +1,35 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as program from 'commander';
-import {GetTsString, GetHeaderInfo, GetValidFileList, GetTsStringFromFileList} from './config2ts';
-
-program.version(require(path.join(__dirname, '..', 'package.json'))['version']);
-
-program
-  .option('-d, --dir <path>', 'set convert path. default: ./')
-  .option('-o, --outDir <path>', 'set outDir path. default: same as dir')
-  .option('-m, --merge <name>', 'merge all to one ts file.')
-  .parse(process.argv);
-
-let dir = program['dir'] || '.';
-let outDir = program['outDir'] || dir;
-let merge = program['merge'];
-
-let fileList = fs.readdirSync(dir);
-
-if (merge) {
-    fileList = GetValidFileList(fileList).map((filename) => {
-        return path.join(dir, filename);
-    });
-    let mergeFile = path.join(outDir, merge);
-    fs.writeFileSync(mergeFile, GetHeaderInfo() + GetTsStringFromFileList(fileList));
-    console.log(`config2ts, ${fileList.length} config files, merge into: ${mergeFile}`);
-}
-else {
-    GetValidFileList(fileList).forEach((filename) => {
-        let target = path.join(outDir, `${filename}.ts`);
-        fs.writeFileSync(target, GetTsString(path.join(dir, filename)));
-        console.log(`config2ts, convert: ${filename} , to: ${target}`);
-    });
-    console.log('config2ts convert done!');
-}
+import * as fs from 'fs';
+import * as path from 'path';
+import * as program from 'commander';
+import {GetTsString, GetHeaderInfo, GetValidFileList, GetTsStringFromFileList} from './config2ts';
+
+program.version(require(path.join(__dirname, '..', 'package.json'))['version']);
+
+program
+  .option('-d, --dir <path>', 'set convert path. default: ./')
+  .option('-o, --outDir <path>', 'set outDir path. default: same as dir')
+  .option('-m, --merge <name>', 'merge all to one ts file.')
+  .parse(process.argv);
+
+let dir = program['dir'] || '.';
+let outDir = program['outDir'] || dir;
+let merge = program['merge'];
+
+let fileList = fs.readdirSync(dir);
+
+if (merge) {
+    fileList = GetValidFileList(fileList).map((filename) => {
+        return path.join(dir, filename);
+    });
+    let mergeFile = path.join(outDir, merge);
+    fs.writeFileSync(mergeFile, GetHeaderInfo() + GetTsStringFromFileList(fileList));
+    console.log(`config2ts, ${fileList.length} config files, merge into: ${mergeFile}`);
+}
+else {
+    GetValidFileList(fileList).forEach((filename) => {
+        let target = path.join(outDir, `${filename}.ts`);
+        fs.writeFileSync(target, GetTsString(path.join(dir, filename)));
+        console.log(`config2ts, convert: ${filename} , to: ${target}`);
+    });
+    console.log('config2ts convert done!');
+}

package/tests/config2ts.spec.ts

@@ -1,34 +1,36 @@
-import * as fs from 'fs';
-import * as assert from 'assert';
-import * as ini from 'ini';
-
-import {NoIdCsv} from '../ttt/total';
-
-import {
-    Convert,
-    GetTsString,
-    GetHeaderInfo,
-    GetTsStringFromFileList,
-    GetValidFileList} from '../src/config2ts';
-
-test('convert csv file with id', () => {
-    expect(GetTsString('./config/data.csv')).toBe(fs.readFileSync('./config/data.csv.ts').toString());
-});
-
-test('convert csv file without id', () => {
-    expect(GetTsString('./config/no-id.csv')).toBe(fs.readFileSync('./config/no-id.csv.ts').toString());
-});
-
-test('convert ini file', () => {
-    expect(GetTsString('./config/ini-file.ini')).toBe(fs.readFileSync('./config/ini-file.ini.ts').toString());
-});
-
-test('config2ts merge csv file list', () => {
-    expect(GetTsStringFromFileList(["./config/data.csv", "./config/no-id.csv"])).toBe(fs.readFileSync('./config/total.ts').toString());
-});
-
-
-test('config2ts merge csv file list', () => {
-    expect(GetValidFileList(['a.csv', 'b.ini', 'c.xxx'])).toEqual(['a.csv', 'b.ini']);
-});
+import * as fs from 'fs';
+import * as assert from 'assert';
+import * as ini from 'ini';
+
+import {
+    Convert,
+    GetTsString,
+    GetHeaderInfo,
+    GetTsStringFromFileList,
+    GetValidFileList} from '../src/config2ts';
+
+test('convert csv file with id', () => {
+    expect(GetTsString('./config/data.csv')).toBe(fs.readFileSync('./config/data.csv.ts').toString());
+});
+
+test('convert csv file without id', () => {
+    expect(GetTsString('./config/no-id.csv')).toBe(fs.readFileSync('./config/no-id.csv.ts').toString());
+});
+
+test('convert ini file', () => {
+    expect(GetTsString('./config/ini-file.ini')).toBe(fs.readFileSync('./config/ini-file.ini.ts').toString());
+});
+
+test('convert toml file', () => { 
+    // console.log(toml.parse(fs.readFileSync('./config/toml_file.toml')));
+    expect(GetTsString('./config/toml_file.toml')).toBe(fs.readFileSync('./config/toml_file.toml.ts').toString());
+});
+
+test('config2ts merge csv file list', () => {
+    expect(GetTsStringFromFileList(["./config/data.csv", "./config/no-id.csv"])).toBe(fs.readFileSync('./config/total.ts').toString());
+});
+
+test('config2ts merge csv file list', () => {
+    expect(GetValidFileList(['a.csv', 'b.ini', 'c.xxx'])).toEqual(['a.csv', 'b.ini']);
+});
     

package/tsconfig.json

@@ -1,13 +1,14 @@
-{
-    "compileOnSave": true,
-    "compilerOptions": {
-        "target": "es6",
-        "module": "commonjs",
-        "watch": false,
-        "sourceMap": false,
-        "outDir": "./dist"
-    },
-    "include": [
-        "./src/**/*"
-    ]
+{
+    "compileOnSave": true,
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "watch": false,
+        "sourceMap": false,
+        "allowJs": true,
+        "outDir": "./dist"
+    },
+    "include": [
+        "./src/**/*"
+    ]
 }