Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tsconfig for core packages #6285

Merged
merged 19 commits into from
Nov 21, 2019
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sdk/core/abort-controller/src/AbortSignal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,12 @@ export class AbortSignal implements AbortSignalLike {
}

/**
* Dispatches a synthetic event to the AbortSignal.
*/
dispatchEvent(event: Event): boolean {
throw new Error("This is a stub dispatchEvent implementation that should not be used. It only exists for type-checking purposes.")
* Dispatches a synthetic event to the AbortSignal.
*/
dispatchEvent(_event: Event): boolean {
throw new Error(
"This is a stub dispatchEvent implementation that should not be used. It only exists for type-checking purposes."
);
}
}

Expand Down
29 changes: 4 additions & 25 deletions sdk/core/abort-controller/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
{
"extends": "../../../tsconfig.package",
"compilerOptions": {
/* Basic Options */
"target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "es6" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
"lib": [] /* lib dependencies are triple-slash directives in lib/index.ts */,
"declaration": true /* Generates corresponding '.d.ts' file. */,
"declarationMap": true /* Generates a sourcemap for each corresponding '.d.ts' file. */,
"sourceMap": true /* Generates corresponding '.map' file. */,
"outDir": "./dist-esm" /* Redirect output structure to the directory. */,
"stripInternal": true /* Do not emit declarations for code with @internal annotation*/,
"declarationDir": "./types" /* Output directory for generated declaration files.*/,
"importHelpers": true /* Import emit helpers from 'tslib'. */,
/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
/* Additional Checks */
"noUnusedLocals": true /* Report errors on unused locals. */,
/* Module Resolution Options */
"moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
/* Experimental Options */
"forceConsistentCasingInFileNames": true,
/* Other options */
"newLine": "LF" /* Use the specified end of line sequence to be used when emitting files: "crlf" (windows) or "lf" (unix).”*/,
"allowJs": false /* Don't allow JavaScript files to be compiled.*/
"target": "es5",
"declarationDir": "./types",
"outDir": "./dist-esm"
},
"compileOnSave": true,
"exclude": ["node_modules", "./types/**/*.d.ts", "./samples/**/*.ts"],
Expand Down
6 changes: 2 additions & 4 deletions sdk/core/core-amqp/src/requestResponseLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ export class RequestResponseLink implements ReqResLink {
* @returns {Promise<Message>} Promise<Message> The AMQP (response) message.
*/
sendRequest(request: AmqpMessage, options: SendRequestOptions = {}): Promise<AmqpMessage> {
if (!options.timeoutInMs) {
options.timeoutInMs = Constants.defaultOperationTimeoutInMs;
}
const timeoutInMs = options.timeoutInMs || Constants.defaultOperationTimeoutInMs;

const aborter: AbortSignalLike | undefined = options.abortSignal;

Expand Down Expand Up @@ -214,7 +212,7 @@ export class RequestResponseLink implements ReqResLink {
return reject(translate(e));
};

waitTimer = setTimeout(actionAfterTimeout, options.timeoutInMs);
waitTimer = setTimeout(actionAfterTimeout, timeoutInMs);
this.receiver.on(ReceiverEvents.message, messageCallback);

log.reqres(
Expand Down
2 changes: 2 additions & 0 deletions sdk/core/core-amqp/src/shims.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ interface Window {
readonly navigator: Navigator;
}
declare var navigator: Navigator;

declare var window: Window;
35 changes: 4 additions & 31 deletions sdk/core/core-amqp/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,9 @@
{
"extends": "../../../tsconfig.package",
"compilerOptions": {
/* Basic Options */
"target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "es6" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,

"declaration": true /* Generates corresponding '.d.ts' file. */,
"declarationMap": true /* Generates a sourcemap for each corresponding '.d.ts' file. */,
"sourceMap": true /* Generates corresponding '.map' file. */,

"outDir": "./dist-esm" /* Redirect output structure to the directory. */,
"declarationDir": "./typings" /* Output directory for generated declaration files.*/,

"importHelpers": true /* Import emit helpers from 'tslib'. */,

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitReturns": true /* Report error when not all code paths in function return a value. */,

/* Additional Checks */
"noUnusedLocals": true /* Report errors on unused locals. */,

/* Module Resolution Options */
"moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,

/* Experimental Options */
"forceConsistentCasingInFileNames": true,

/* Other options */
"newLine": "LF" /* Use the specified end of line sequence to be used when emitting files: "crlf" (windows) or "lf" (unix).”*/,
"allowJs": false /* Don't allow JavaScript files to be compiled.*/,
"target": "es6",
"outDir": "./dist-esm",
"declarationDir": "./typings",
"resolveJsonModule": true
},
"compileOnSave": true,
Expand Down
1 change: 0 additions & 1 deletion sdk/core/core-arm/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package-lock.json
.nyc_output/
coverage/
dist/
*.d.ts
*.d.ts.map
*.js
*.js.map
Expand Down
13 changes: 13 additions & 0 deletions sdk/core/core-arm/lib/shims.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

// d.ts shims provide types for things we use internally but are not part
// of this package's surface area.

interface RequestInit {}

interface RequestInfo {}

interface Response {}

interface Headers {}
2 changes: 1 addition & 1 deletion sdk/core/core-arm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
"build": "run-p build:lib",
"build:lib": "run-s build:tsc build:rollup build:minify",
"build:tsc": "tsc -p tsconfig.es.json",
"build:tsc": "tsc -p tsconfig.json",
"build:rollup": "rollup -c rollup.config.js 2>&1",
"build:minify": "uglifyjs -c -m --comments --source-map \"content='./dist/coreArm.js.map'\" -o ./dist/coreArm.min.js ./dist/coreArm.js",
"build:test": "npm run build",
Expand Down
7 changes: 0 additions & 7 deletions sdk/core/core-arm/tsconfig.es.json

This file was deleted.

35 changes: 4 additions & 31 deletions sdk/core/core-arm/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,11 @@
{
"extends": "../../../tsconfig.package",
"compilerOptions": {
"module": "commonjs",
"preserveConstEnums": true,
"sourceMap": true,
"newLine": "LF",
"target": "es5",
"moduleResolution": "node",
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "dist",
"strict": true,
"declaration": true,
"declarationMap": true,
"importHelpers": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"lib": [
"dom",
"dom.iterable",
"es5",
"es6",
"es7",
"esnext",
"esnext.asynciterable",
"es2015.iterable"
]
"outDir": "es"
},
"compileOnSave": true,
"exclude": [
"node_modules"
],
"include": [
"./lib/**/*.ts",
"./test/**/*.ts"
]
"exclude": ["node_modules"],
"include": ["./lib/**/*.ts", "./test/**/*.ts"]
}
26 changes: 2 additions & 24 deletions sdk/core/core-asynciterator-polyfill/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,8 @@
{
"extends": "../../../tsconfig.package",
"compilerOptions": {
"module": "commonjs",
"sourceMap": true,
"newLine": "LF",
"target": "es5",
"moduleResolution": "node",
"noImplicitReturns": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "./dist-esm",
"strict": true,
"declaration": true,
"declarationMap": true,
"importHelpers": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"lib": [
"dom",
"dom.iterable",
"es5",
"es6",
"es7",
"esnext",
"esnext.asynciterable",
"es2015.iterable"
]
"outDir": "./dist-esm"
},
"compileOnSave": true,
"exclude": ["node_modules"],
Expand Down
4 changes: 1 addition & 3 deletions sdk/core/core-auth/src/tokenCredential.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import { AbortSignalLike } from "@azure/abort-controller";
import { OperationOptions } from "./operationOptions";

/**
Expand All @@ -21,8 +20,7 @@ export interface TokenCredential {
/**
* Defines options for TokenCredential.getToken.
*/
export interface GetTokenOptions extends OperationOptions {
}
export interface GetTokenOptions extends OperationOptions {}

/**
* Represents an access token with an expiration time.
Expand Down
68 changes: 41 additions & 27 deletions sdk/core/core-auth/test/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,57 @@
import assert from "assert";
import { isTokenCredential } from "../src/tokenCredential";

describe("isTokenCredential", function () {
describe("isTokenCredential", function() {
it("should return true for an object that resembles a TokenCredential", () => {
assert.ok(isTokenCredential({
getToken() {
return Promise.resolve({
token: "secret",
expiresOnTimestamp: 12345
});
}
}));
assert.ok(
isTokenCredential({
getToken() {
return Promise.resolve({
token: "secret",
expiresOnTimestamp: 12345
});
}
})
);
});

it("should return false for an object that does not resemble a TokenCredential", () => {
assert.strictEqual(isTokenCredential({
doStuff() {
return false;
}
}), false);
assert.strictEqual(
isTokenCredential({
doStuff() {
return false;
}
}),
false
);
});

it("should return false for an object that has a non-function field named 'getToken'", () => {
assert.strictEqual(isTokenCredential({
getToken: true
}), false);
assert.strictEqual(
isTokenCredential({
getToken: true
}),
false
);
});

it("should return false for an object that has a 'signRequest' field and getToken that takes no parameters", () => {
assert.strictEqual(isTokenCredential({
getToken: function () { },
signRequest: function() { },
}), false);
})
assert.strictEqual(
isTokenCredential({
getToken: function() {},
signRequest: function() {}
}),
false
);
});

it("should return true for an object that has a 'signRequest' field and getToken that takes parameters", () => {
assert.strictEqual(isTokenCredential({
getToken: function (scope: string) { },
signRequest: function() { },
}), true);
})
assert.strictEqual(
isTokenCredential({
getToken: function(_scope: string) {},
signRequest: function() {}
}),
true
);
});
});
Loading