From c97483759d03afa625899bd15987e94d5f888bbd Mon Sep 17 00:00:00 2001 From: Jinwoo Lee Date: Wed, 15 Nov 2017 11:28:24 -0800 Subject: [PATCH 1/2] Add new packages: spdx-satisfies & spdx-correct --- types/spdx-correct/index.d.ts | 10 +++++++++ types/spdx-correct/spdx-correct-tests.ts | 3 +++ types/spdx-correct/tsconfig.json | 23 ++++++++++++++++++++ types/spdx-correct/tslint.json | 1 + types/spdx-satisfies/index.d.ts | 10 +++++++++ types/spdx-satisfies/spdx-satisfies-tests.ts | 3 +++ types/spdx-satisfies/tsconfig.json | 23 ++++++++++++++++++++ types/spdx-satisfies/tslint.json | 1 + 8 files changed, 74 insertions(+) create mode 100644 types/spdx-correct/index.d.ts create mode 100644 types/spdx-correct/spdx-correct-tests.ts create mode 100644 types/spdx-correct/tsconfig.json create mode 100644 types/spdx-correct/tslint.json create mode 100644 types/spdx-satisfies/index.d.ts create mode 100644 types/spdx-satisfies/spdx-satisfies-tests.ts create mode 100644 types/spdx-satisfies/tsconfig.json create mode 100644 types/spdx-satisfies/tslint.json diff --git a/types/spdx-correct/index.d.ts b/types/spdx-correct/index.d.ts new file mode 100644 index 0000000000..b4a6a4b97d --- /dev/null +++ b/types/spdx-correct/index.d.ts @@ -0,0 +1,10 @@ +// Type definitions for spdx-correct 2.0 +// Project: https://github.com/jslicense/spdx-correct.js#readme +// Definitions by: Jinwoo Lee +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +declare function spdxCorrect(identifier: string): string|null; +declare namespace spdxCorrect { + // empty +} +export = spdxCorrect; diff --git a/types/spdx-correct/spdx-correct-tests.ts b/types/spdx-correct/spdx-correct-tests.ts new file mode 100644 index 0000000000..067308d37b --- /dev/null +++ b/types/spdx-correct/spdx-correct-tests.ts @@ -0,0 +1,3 @@ +import * as spdxCorrect from 'spdx-correct'; + +spdxCorrect('BSD'); diff --git a/types/spdx-correct/tsconfig.json b/types/spdx-correct/tsconfig.json new file mode 100644 index 0000000000..a7c8604db7 --- /dev/null +++ b/types/spdx-correct/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "spdx-correct-tests.ts" + ] +} diff --git a/types/spdx-correct/tslint.json b/types/spdx-correct/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/spdx-correct/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } diff --git a/types/spdx-satisfies/index.d.ts b/types/spdx-satisfies/index.d.ts new file mode 100644 index 0000000000..23e022a722 --- /dev/null +++ b/types/spdx-satisfies/index.d.ts @@ -0,0 +1,10 @@ +// Type definitions for spdx-satisfies 0.1 +// Project: https://github.com/kemitchell/spdx-satisfies.js#readme +// Definitions by: Jinwoo Lee +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +declare function spdxSatisfies(first: string, second: string): boolean; +declare namespace spdxSatisfies { + // empty +} +export = spdxSatisfies; diff --git a/types/spdx-satisfies/spdx-satisfies-tests.ts b/types/spdx-satisfies/spdx-satisfies-tests.ts new file mode 100644 index 0000000000..5a5b0dfe00 --- /dev/null +++ b/types/spdx-satisfies/spdx-satisfies-tests.ts @@ -0,0 +1,3 @@ +import * as spdxSatisfies from 'spdx-satisfies'; + +spdxSatisfies('BSD-2-Clause', '(BSD-2-Clause OR MIT)'); diff --git a/types/spdx-satisfies/tsconfig.json b/types/spdx-satisfies/tsconfig.json new file mode 100644 index 0000000000..7aff811650 --- /dev/null +++ b/types/spdx-satisfies/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "spdx-satisfies-tests.ts" + ] +} diff --git a/types/spdx-satisfies/tslint.json b/types/spdx-satisfies/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/spdx-satisfies/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From 39ba56691fcdc1e172ab06b921fb587d04726550 Mon Sep 17 00:00:00 2001 From: Jinwoo Lee Date: Wed, 15 Nov 2017 15:01:41 -0800 Subject: [PATCH 2/2] change to `import foo = require('foo')` style --- types/spdx-correct/index.d.ts | 3 --- types/spdx-correct/spdx-correct-tests.ts | 2 +- types/spdx-satisfies/index.d.ts | 3 --- types/spdx-satisfies/spdx-satisfies-tests.ts | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/types/spdx-correct/index.d.ts b/types/spdx-correct/index.d.ts index b4a6a4b97d..bbdfa6af31 100644 --- a/types/spdx-correct/index.d.ts +++ b/types/spdx-correct/index.d.ts @@ -4,7 +4,4 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped declare function spdxCorrect(identifier: string): string|null; -declare namespace spdxCorrect { - // empty -} export = spdxCorrect; diff --git a/types/spdx-correct/spdx-correct-tests.ts b/types/spdx-correct/spdx-correct-tests.ts index 067308d37b..c28729c22b 100644 --- a/types/spdx-correct/spdx-correct-tests.ts +++ b/types/spdx-correct/spdx-correct-tests.ts @@ -1,3 +1,3 @@ -import * as spdxCorrect from 'spdx-correct'; +import spdxCorrect = require('spdx-correct'); spdxCorrect('BSD'); diff --git a/types/spdx-satisfies/index.d.ts b/types/spdx-satisfies/index.d.ts index 23e022a722..e576305571 100644 --- a/types/spdx-satisfies/index.d.ts +++ b/types/spdx-satisfies/index.d.ts @@ -4,7 +4,4 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped declare function spdxSatisfies(first: string, second: string): boolean; -declare namespace spdxSatisfies { - // empty -} export = spdxSatisfies; diff --git a/types/spdx-satisfies/spdx-satisfies-tests.ts b/types/spdx-satisfies/spdx-satisfies-tests.ts index 5a5b0dfe00..6b2e7f78c4 100644 --- a/types/spdx-satisfies/spdx-satisfies-tests.ts +++ b/types/spdx-satisfies/spdx-satisfies-tests.ts @@ -1,3 +1,3 @@ -import * as spdxSatisfies from 'spdx-satisfies'; +import spdxSatisfies = require('spdx-satisfies'); spdxSatisfies('BSD-2-Clause', '(BSD-2-Clause OR MIT)');