Merge branch 'master' into make_function

UselessPickles · May 24, 2018 · e385ce9 · e385ce9
2 parents b8521c2 + e03c2dc
commit e385ce9
Show file tree

Hide file tree

Showing 9 changed files with 1,539 additions and 2,008 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,7 @@
 {
     "name": "ts-string-visitor",
     "version": "2.1.3",
-    "description":
-        "Generic TypeScript Visitor and Mapper for String Enums and String Literal Union Types",
+    "description": "Generic TypeScript Visitor and Mapper for String Enums and String Literal Union Types",
     "repository": {
         "type": "git",
         "url": "https://github.com/UselessPickles/ts-string-visitor.git"
@@ -11,7 +10,10 @@
     "bugs": {
         "url": "https://github.com/UselessPickles/ts-string-visitor/issues"
     },
-    "files": ["dist", "src"],
+    "files": [
+        "dist",
+        "src"
+    ],
     "main": "dist/commonjs/index.js",
     "jsnext:main": "dist/es/index.js",
     "module": "dist/es/index.js",
@@ -20,34 +22,25 @@
         "clean:dist": "rimraf dist",
         "clean:coverage": "rimraf coverage",
         "clean:pack": "rimraf ts-string-visitor-*.tgz",
-        "compile":
-            "tsc --project tsconfig.json --noEmit --pretty --noErrorTruncation",
+        "compile": "tsc --project tsconfig.json --noEmit --pretty --noErrorTruncation",
         "lint": "tslint --config tslint.json --project tsconfig.json",
         "lint:fix": "npm run lint -- --fix",
-        "prettier:test":
-            "prettier --list-different \"{src,tests,type_tests}/**/*.ts\"",
+        "prettier:test": "prettier --list-different \"{src,tests,type_tests}/**/*.ts\"",
         "prettier:fix": "prettier --write \"{src,tests,type_tests}/**/*.ts\"",
-        "build:types":
-            "tsc --project src/tsconfig.json --pretty --noErrorTruncation --emitDeclarationOnly true --outDir dist/types",
-        "build:commonjs":
-            "tsc --project src/tsconfig.json --pretty --noErrorTruncation --declaration false --outDir dist/commonjs",
-        "build:es":
-            "tsc --project src/tsconfig.json --pretty --noErrorTruncation --declaration false -m es6 --outDir dist/es",
-        "build":
-            "npm run clean:dist && run-p build:types build:es build:commonjs",
+        "build:types": "tsc --project src/tsconfig.json --pretty --noErrorTruncation --emitDeclarationOnly true --outDir dist/types",
+        "build:commonjs": "tsc --project src/tsconfig.json --pretty --noErrorTruncation --declaration false --outDir dist/commonjs",
+        "build:es": "tsc --project src/tsconfig.json --pretty --noErrorTruncation --declaration false -m es6 --outDir dist/es",
+        "build": "npm run clean:dist && run-p build:types build:es build:commonjs",
         "pack": "run-p clean:pack build && npm pack",
         "jest": "jest",
         "jest:coverage": "npm run clean:coverage && jest --coverage",
         "dtslint:v2_4_plus": "dtslint type_tests/v2_4_plus",
         "dtslint:v2_6_plus": "dtslint type_tests/v2_6_plus",
         "dtslint:v2_7_plus": "dtslint type_tests/v2_7_plus",
-        "dtslint":
-            "run-s dtslint:v2_4_plus dtslint:v2_6_plus dtslint:v2_7_plus",
+        "dtslint": "run-s dtslint:v2_4_plus dtslint:v2_6_plus dtslint:v2_7_plus",
         "test": "run-s compile lint prettier:test dtslint jest",
-        "test:coverage":
-            "run-s compile lint prettier:test dtslint jest:coverage",
-        "build:travis":
-            "run-p test:coverage build && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
+        "test:coverage": "run-s compile lint prettier:test dtslint jest:coverage",
+        "build:travis": "run-p test:coverage build && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
     },
     "author": {
         "name": "Jeff Lau",
@@ -57,16 +50,16 @@
     "license": "MIT",
     "devDependencies": {
         "@types/jest": "22.2.3",
-        "@types/node": "9.6.6",
-        "coveralls": "3.0.0",
-        "dtslint": "0.2.0",
-        "jest": "22.4.3",
-        "npm-run-all": "4.1.2",
+        "@types/node": "10.1.2",
+        "coveralls": "3.0.1",
+        "dtslint": "0.3.0",
+        "jest": "22.4.4",
+        "npm-run-all": "4.1.3",
         "prettier": "1.12.1",
         "rimraf": "2.6.2",
-        "ts-jest": "22.4.4",
-        "tslint": "5.9.1",
-        "tslint-config-prettier": "1.12.0",
+        "ts-jest": "22.4.6",
+        "tslint": "5.10.0",
+        "tslint-config-prettier": "1.13.0",
         "typescript": "2.8.3"
     },
     "peerDependencies": {
@@ -85,8 +78,14 @@
         "transform": {
             "^.+\\.ts$": "ts-jest"
         },
-        "collectCoverageFrom": ["src/**/*.{js,ts}", "!**/node_modules/**"],
+        "collectCoverageFrom": [
+            "src/**/*.{js,ts}",
+            "!**/node_modules/**"
+        ],
         "testRegex": "((\\.|/)(test|spec))\\.(ts|js)$",
-        "moduleFileExtensions": ["ts", "js"]
+        "moduleFileExtensions": [
+            "ts",
+            "js"
+        ]
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,27 +2,23 @@
  * compiler errors, but not for actually building the project distribution.
  * See tsconfig.json in the src/ directory for project distribution build config. */
 {
-  "compilerOptions": {
-    /* Basic Options */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "lib": [
-      "es6"
-    ],
+    "compilerOptions": {
+        /* Basic Options */
+        "target": "es5",
+        "module": "commonjs",
+        "lib": ["es6"],
 
-    /* Strict Type-Checking Options */
-    "strict": true,                            /* Enable all strict type-checking options. */
-    "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-    "noImplicitAny": true,
+        /* Strict Type-Checking Options */
+        "strict": true,
+        "alwaysStrict": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
 
-    /* Module Resolution Options */
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "baseUrl": "./"                       /* Base directory to resolve non-absolute module names. */
-  },
-  "exclude": [
-    "node_modules",
-    "type_tests",
-    "tests/compile_samples/visitString/fail",
-    "tests/compile_samples/mapString/fail"
-  ]
-}
+        /* Module Resolution Options */
+        "moduleResolution": "node",
+        "baseUrl": "./"
+    },
+    "include": ["src", "tests"]
+}
diff --git a/type_tests/v2_4_plus/index.d.ts b/type_tests/v2_4_plus/index.d.ts
@@ -1,4 +1,3 @@
-// tslint:disable:no-useless-files
 // Dummy index.d.ts file for running dtslint.
 // We're not actually linting a .d.ts file; only using dtslint to verify compile time types of ts-string-visitor.
 // TypeScript Version: 2.4
diff --git a/type_tests/v2_4_plus/tslint.json b/type_tests/v2_4_plus/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dtslint.json",
     "rules": {
-        "newline-per-chained-call": false
+        "newline-per-chained-call": false,
+        "no-useless-files": false
     }
 }
diff --git a/type_tests/v2_6_plus/index.d.ts b/type_tests/v2_6_plus/index.d.ts
@@ -1,4 +1,3 @@
-// tslint:disable:no-useless-files
 // Dummy index.d.ts file for running dtslint.
 // We're not actually linting a .d.ts file; only using dtslint to verify compile time types of ts-string-visitor.
 // TypeScript Version: 2.6
diff --git a/type_tests/v2_6_plus/tslint.json b/type_tests/v2_6_plus/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dtslint.json",
     "rules": {
-        "newline-per-chained-call": false
+        "newline-per-chained-call": false,
+        "no-useless-files": false
     }
 }
diff --git a/type_tests/v2_7_plus/index.d.ts b/type_tests/v2_7_plus/index.d.ts
@@ -1,4 +1,3 @@
-// tslint:disable:no-useless-files
 // Dummy index.d.ts file for running dtslint.
 // We're not actually linting a .d.ts file; only using dtslint to verify compile time types of ts-string-visitor.
 // TypeScript Version: 2.7
diff --git a/type_tests/v2_7_plus/tslint.json b/type_tests/v2_7_plus/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dtslint.json",
     "rules": {
-        "newline-per-chained-call": false
+        "newline-per-chained-call": false,
+        "no-useless-files": false
     }
 }