From 5d433c72b8d4425e5453bc617b4cc0ef5cd48b72 Mon Sep 17 00:00:00 2001
From: Wolfgang Faust <wolfgang42@git>
Date: Sat, 13 May 2017 19:30:01 -0400
Subject: [PATCH] Integrate type definitions.
---
package.json | 8 ++++++--
types/index.d.ts | 2 --
types/tsconfig.json | 14 ++++----------
types/tslint.json | 2 +-
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/package.json b/package.json
index f6703bd..fe56335 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
"xlsx": "./bin/xlsx.njs"
},
"main": "./xlsx",
+ "types": "types",
"browser": {
"node": false,
"crypto": false,
@@ -27,12 +28,15 @@
"devDependencies": {
"mocha":"",
"xlsjs":"",
- "@sheetjs/uglify-js":""
+ "@sheetjs/uglify-js":"",
+ "dtslint": "^0.1.2",
+ "typescript": "^2.2.0"
},
"repository": { "type":"git", "url":"git://github.com/SheetJS/js-xlsx.git" },
"scripts": {
"pretest": "git submodule init && git submodule update",
- "test": "make travis"
+ "test": "make travis",
+ "dtslint": "dtslint types"
},
"config": {
"blanket": {
diff --git a/types/index.d.ts b/types/index.d.ts
index 2a10a7a..aca494b 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,7 +1,5 @@
-// Type definitions for xlsx
// Project: https://github.com/SheetJS/js-xlsx
// Definitions by: themauveavenger <https://github.com/themauveavenger/>, Wolfgang Faust <https://github.com/wolfgang42>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
/** Attempts to read filename and parse */
export function readFile(filename: string, opts?: IParsingOptions): IWorkBook;
diff --git a/types/tsconfig.json b/types/tsconfig.json
index c202db1..2924045 100644
--- a/types/tsconfig.json
+++ b/types/tsconfig.json
@@ -8,16 +8,10 @@
"noImplicitAny": true,
"noImplicitThis": true,
"strictNullChecks": false,
- "baseUrl": "../",
- "typeRoots": [
- "../"
- ],
+ "baseUrl": ".",
+ "paths": { "xlsx": ["."] },
"types": [],
"noEmit": true,
"forceConsistentCasingInFileNames": true
- },
- "files": [
- "index.d.ts",
- "xlsx-tests.ts"
- ]
-}
\ No newline at end of file
+ }
+}
diff --git a/types/tslint.json b/types/tslint.json
index 5107fb4..3d5daec 100644
--- a/types/tslint.json
+++ b/types/tslint.json
@@ -1,5 +1,5 @@
{
- "extends": "dtslint/dt.json",
+ "extends": "dtslint/dtslint.json",
"rules": {
"interface-name": [true, "always-prefix"]
}