From 5ac9ed06f9e9d569d30b5683bcfd975281390da3 Mon Sep 17 00:00:00 2001 From: KarishmaGhiya Date: Wed, 26 Feb 2020 13:26:03 -0800 Subject: [PATCH] renamed lib to src for core-http (#7507) --- sdk/core/core-http/package.json | 36 +++++++++---------- sdk/core/core-http/rollup.base.config.js | 2 +- sdk/core/core-http/samples/node-sample.ts | 2 +- .../{lib => src}/browserFetchHttpClient.ts | 0 sdk/core/core-http/{lib => src}/coreHttp.ts | 0 .../credentials/accessTokenCache.ts | 0 .../credentials/apiKeyCredentials.ts | 0 .../basicAuthenticationCredentials.ts | 0 .../{lib => src}/credentials/credentials.ts | 0 .../credentials/serviceClientCredentials.ts | 0 .../credentials/topicCredentials.ts | 0 .../{lib => src}/defaultHttpClient.browser.ts | 0 .../{lib => src}/defaultHttpClient.ts | 0 sdk/core/core-http/{lib => src}/dom.d.ts | 0 .../core-http/{lib => src}/fetchHttpClient.ts | 0 sdk/core/core-http/{lib => src}/httpClient.ts | 0 .../core-http/{lib => src}/httpHeaders.ts | 0 .../{lib => src}/httpOperationResponse.ts | 0 .../{lib => src}/httpPipelineLogLevel.ts | 0 .../{lib => src}/httpPipelineLogger.ts | 0 sdk/core/core-http/{lib => src}/log.ts | 0 .../{lib => src}/nodeFetchHttpClient.ts | 0 .../{lib => src}/operationArguments.ts | 0 .../{lib => src}/operationOptions.ts | 0 .../{lib => src}/operationParameter.ts | 0 .../{lib => src}/operationResponse.ts | 0 .../core-http/{lib => src}/operationSpec.ts | 0 .../core-http/{lib => src}/pipelineOptions.ts | 0 .../bearerTokenAuthenticationPolicy.ts | 0 .../policies/deserializationPolicy.ts | 0 .../policies/exponentialRetryPolicy.ts | 0 .../policies/generateClientRequestIdPolicy.ts | 0 .../{lib => src}/policies/keepAlivePolicy.ts | 0 .../{lib => src}/policies/logPolicy.ts | 0 .../policies/msRestUserAgentPolicy.browser.ts | 0 .../policies/msRestUserAgentPolicy.ts | 0 .../policies/proxyPolicy.browser.ts | 0 .../{lib => src}/policies/proxyPolicy.ts | 0 .../{lib => src}/policies/redirectPolicy.ts | 0 .../{lib => src}/policies/requestPolicy.ts | 0 .../policies/rpRegistrationPolicy.ts | 0 .../{lib => src}/policies/signingPolicy.ts | 0 .../policies/systemErrorRetryPolicy.ts | 0 .../policies/throttlingRetryPolicy.ts | 0 .../{lib => src}/policies/tracingPolicy.ts | 0 .../{lib => src}/policies/userAgentPolicy.ts | 0 sdk/core/core-http/{lib => src}/proxyAgent.ts | 0 .../{lib => src}/queryCollectionFormat.ts | 0 sdk/core/core-http/{lib => src}/restError.ts | 0 sdk/core/core-http/{lib => src}/serializer.ts | 0 .../core-http/{lib => src}/serviceClient.ts | 0 sdk/core/core-http/{lib => src}/url.ts | 0 .../{lib => src}/util/base64.browser.ts | 0 .../core-http/{lib => src}/util/base64.ts | 0 .../core-http/{lib => src}/util/constants.ts | 0 .../{lib => src}/util/inspect.browser.ts | 0 .../core-http/{lib => src}/util/inspect.ts | 0 .../core-http/{lib => src}/util/sanitizer.ts | 0 sdk/core/core-http/{lib => src}/util/utils.ts | 0 .../{lib => src}/util/xml.browser.ts | 0 sdk/core/core-http/{lib => src}/util/xml.ts | 0 .../core-http/{lib => src}/webResource.ts | 0 .../core-http/{lib => src}/xhrHttpClient.ts | 0 sdk/core/core-http/test/credentialTests.ts | 4 +-- .../TestClient/{lib => src}/models/mappers.ts | 0 .../TestClient/{lib => src}/testClient.ts | 2 +- .../test/defaultHttpClientTests.browser.ts | 4 +-- .../test/defaultHttpClientTests.node.ts | 6 ++-- .../core-http/test/defaultHttpClientTests.ts | 6 ++-- .../test/expiringAccessTokenCacheTests.ts | 2 +- sdk/core/core-http/test/logFilterTests.ts | 10 +++--- sdk/core/core-http/test/mockHttp.ts | 2 +- .../msRestUserAgentPolicyTests.browser.ts | 8 ++--- .../test/msRestUserAgentPolicyTests.node.ts | 10 +++--- .../core-http/test/operationParameterTests.ts | 2 +- .../bearerTokenAuthenticationPolicyTests.ts | 16 ++++----- .../policies/deserializationPolicyTests.ts | 12 +++---- .../test/policies/proxyPolicyTests.browser.ts | 10 +++--- .../test/policies/proxyPolicyTests.node.ts | 12 +++---- .../policies/throttlingRetryPolicyTests.ts | 8 ++--- .../test/policies/tracingPolicyTests.ts | 4 +-- sdk/core/core-http/test/proxyAgent.node.ts | 10 +++--- sdk/core/core-http/test/restError.node.ts | 8 ++--- .../core-http/test/serializationTests.node.ts | 4 +-- sdk/core/core-http/test/serializationTests.ts | 6 ++-- sdk/core/core-http/test/serviceClientTests.ts | 14 ++++---- sdk/core/core-http/test/urlTests.ts | 2 +- sdk/core/core-http/test/utilsTests.ts | 4 +-- sdk/core/core-http/test/xhrTests.browser.ts | 4 +-- sdk/core/core-http/test/xmlTests.ts | 2 +- sdk/core/core-http/tsconfig.json | 2 +- 91 files changed, 107 insertions(+), 107 deletions(-) rename sdk/core/core-http/{lib => src}/browserFetchHttpClient.ts (100%) rename sdk/core/core-http/{lib => src}/coreHttp.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/accessTokenCache.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/apiKeyCredentials.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/basicAuthenticationCredentials.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/credentials.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/serviceClientCredentials.ts (100%) rename sdk/core/core-http/{lib => src}/credentials/topicCredentials.ts (100%) rename sdk/core/core-http/{lib => src}/defaultHttpClient.browser.ts (100%) rename sdk/core/core-http/{lib => src}/defaultHttpClient.ts (100%) rename sdk/core/core-http/{lib => src}/dom.d.ts (100%) rename sdk/core/core-http/{lib => src}/fetchHttpClient.ts (100%) rename sdk/core/core-http/{lib => src}/httpClient.ts (100%) rename sdk/core/core-http/{lib => src}/httpHeaders.ts (100%) rename sdk/core/core-http/{lib => src}/httpOperationResponse.ts (100%) rename sdk/core/core-http/{lib => src}/httpPipelineLogLevel.ts (100%) rename sdk/core/core-http/{lib => src}/httpPipelineLogger.ts (100%) rename sdk/core/core-http/{lib => src}/log.ts (100%) rename sdk/core/core-http/{lib => src}/nodeFetchHttpClient.ts (100%) rename sdk/core/core-http/{lib => src}/operationArguments.ts (100%) rename sdk/core/core-http/{lib => src}/operationOptions.ts (100%) rename sdk/core/core-http/{lib => src}/operationParameter.ts (100%) rename sdk/core/core-http/{lib => src}/operationResponse.ts (100%) rename sdk/core/core-http/{lib => src}/operationSpec.ts (100%) rename sdk/core/core-http/{lib => src}/pipelineOptions.ts (100%) rename sdk/core/core-http/{lib => src}/policies/bearerTokenAuthenticationPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/deserializationPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/exponentialRetryPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/generateClientRequestIdPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/keepAlivePolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/logPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/msRestUserAgentPolicy.browser.ts (100%) rename sdk/core/core-http/{lib => src}/policies/msRestUserAgentPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/proxyPolicy.browser.ts (100%) rename sdk/core/core-http/{lib => src}/policies/proxyPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/redirectPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/requestPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/rpRegistrationPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/signingPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/systemErrorRetryPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/throttlingRetryPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/tracingPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/policies/userAgentPolicy.ts (100%) rename sdk/core/core-http/{lib => src}/proxyAgent.ts (100%) rename sdk/core/core-http/{lib => src}/queryCollectionFormat.ts (100%) rename sdk/core/core-http/{lib => src}/restError.ts (100%) rename sdk/core/core-http/{lib => src}/serializer.ts (100%) rename sdk/core/core-http/{lib => src}/serviceClient.ts (100%) rename sdk/core/core-http/{lib => src}/url.ts (100%) rename sdk/core/core-http/{lib => src}/util/base64.browser.ts (100%) rename sdk/core/core-http/{lib => src}/util/base64.ts (100%) rename sdk/core/core-http/{lib => src}/util/constants.ts (100%) rename sdk/core/core-http/{lib => src}/util/inspect.browser.ts (100%) rename sdk/core/core-http/{lib => src}/util/inspect.ts (100%) rename sdk/core/core-http/{lib => src}/util/sanitizer.ts (100%) rename sdk/core/core-http/{lib => src}/util/utils.ts (100%) rename sdk/core/core-http/{lib => src}/util/xml.browser.ts (100%) rename sdk/core/core-http/{lib => src}/util/xml.ts (100%) rename sdk/core/core-http/{lib => src}/webResource.ts (100%) rename sdk/core/core-http/{lib => src}/xhrHttpClient.ts (100%) rename sdk/core/core-http/test/data/TestClient/{lib => src}/models/mappers.ts (100%) rename sdk/core/core-http/test/data/TestClient/{lib => src}/testClient.ts (96%) diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json index 13b1cd6321a1..5337877cdcd9 100644 --- a/sdk/core/core-http/package.json +++ b/sdk/core/core-http/package.json @@ -27,27 +27,27 @@ "clientruntime" ], "main": "./dist/coreHttp.node.js", - "module": "./es/lib/coreHttp.js", - "types": "./es/lib/coreHttp.d.ts", + "module": "./es/src/coreHttp.js", + "types": "./es/src/coreHttp.d.ts", "files": [ "dist/**/*.node.js", "dist/**/*.node.js.map", "dom-shim.d.ts", - "es/lib/**/*.js", - "es/lib/**/*.js.map", - "es/lib/**/*.d.ts", - "es/lib/**/*.d.ts.map", - "lib/**/*.ts", + "es/src/**/*.js", + "es/src/**/*.js.map", + "es/src/**/*.d.ts", + "es/src/**/*.d.ts.map", + "src/**/*.ts", "LICENSE", "README.md" ], "browser": { - "./es/lib/policies/msRestUserAgentPolicy.js": "./es/lib/policies/msRestUserAgentPolicy.browser.js", - "./es/lib/policies/proxyPolicy.js": "./es/lib/policies/proxyPolicy.browser.js", - "./es/lib/util/base64.js": "./es/lib/util/base64.browser.js", - "./es/lib/util/xml.js": "./es/lib/util/xml.browser.js", - "./es/lib/defaultHttpClient.js": "./es/lib/defaultHttpClient.browser.js", - "./es/lib/util/inspect.js": "./es/lib/util/inspect.browser.js" + "./es/src/policies/msRestUserAgentPolicy.js": "./es/src/policies/msRestUserAgentPolicy.browser.js", + "./es/src/policies/proxyPolicy.js": "./es/src/policies/proxyPolicy.browser.js", + "./es/src/util/base64.js": "./es/src/util/base64.browser.js", + "./es/src/util/xml.js": "./es/src/util/xml.browser.js", + "./es/src/defaultHttpClient.js": "./es/src/defaultHttpClient.browser.js", + "./es/src/util/inspect.js": "./es/src/util/inspect.browser.js" }, "license": "MIT", "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/core/core-http", @@ -66,15 +66,15 @@ "build:tsc": "tsc -p tsconfig.es.json", "build:rollup": "rollup -c 2>&1", "build:test-browser": "rollup -c rollup.test.config.js 2>&1", - "check-format": "prettier --list-different --config ../../.prettierrc.json \"lib/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", + "check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", "clean": "rimraf ./es ./dist ./dist-test", "execute:samples": "echo skipped", - "format": "prettier --write --config ../../.prettierrc.json \"lib/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", + "format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"", "integration-test:browser": "echo skipped", "integration-test:node": "echo skipped", "integration-test": "npm run integration-test:node && npm run integration-test:browser", - "lint:fix": "eslint package.json tsconfig.json \"lib/**/*.ts\" \"test/**/*.ts\" --fix --fix-type [problem,suggestion]", - "lint": "eslint package.json tsconfig.json lib test --ext .ts -f html -o core-http-lintReport.html || exit 0", + "lint:fix": "eslint package.json tsconfig.json \"src/**/*.ts\" \"test/**/*.ts\" --fix --fix-type [problem,suggestion]", + "lint": "eslint package.json tsconfig.json src test --ext .ts -f html -o core-http-lintReport.html || exit 0", "pack": "npm pack 2>&1", "prebuild": "npm run clean", "test:browser": "npm run build:test && npm run unit-test:browser && npm run integration-test:browser", @@ -112,7 +112,7 @@ "//metadata": { "constantPaths": [ { - "path": "lib/util/constants.ts", + "path": "src/util/constants.ts", "prefix": "coreHttpVersion" } ] diff --git a/sdk/core/core-http/rollup.base.config.js b/sdk/core/core-http/rollup.base.config.js index 7a9937e85b2d..c1bba3ccc692 100644 --- a/sdk/core/core-http/rollup.base.config.js +++ b/sdk/core/core-http/rollup.base.config.js @@ -10,7 +10,7 @@ import viz from "rollup-plugin-visualizer"; const pkg = require("./package.json"); const depNames = Object.keys(pkg.dependencies); const devDepNames = Object.keys(pkg.devDependencies); -const input = "./es/lib/coreHttp.js"; +const input = "./es/src/coreHttp.js"; const production = process.env.NODE_ENV === "production"; export function nodeConfig(test = false) { diff --git a/sdk/core/core-http/samples/node-sample.ts b/sdk/core/core-http/samples/node-sample.ts index 8e15f1708616..3ef11a465415 100644 --- a/sdk/core/core-http/samples/node-sample.ts +++ b/sdk/core/core-http/samples/node-sample.ts @@ -3,7 +3,7 @@ "use strict"; -import * as coreHttp from "../lib/coreHttp"; +import * as coreHttp from "../src/coreHttp"; const clientOptions: coreHttp.ServiceClientOptions = { requestPolicyFactories: [coreHttp.logPolicy()] }; diff --git a/sdk/core/core-http/lib/browserFetchHttpClient.ts b/sdk/core/core-http/src/browserFetchHttpClient.ts similarity index 100% rename from sdk/core/core-http/lib/browserFetchHttpClient.ts rename to sdk/core/core-http/src/browserFetchHttpClient.ts diff --git a/sdk/core/core-http/lib/coreHttp.ts b/sdk/core/core-http/src/coreHttp.ts similarity index 100% rename from sdk/core/core-http/lib/coreHttp.ts rename to sdk/core/core-http/src/coreHttp.ts diff --git a/sdk/core/core-http/lib/credentials/accessTokenCache.ts b/sdk/core/core-http/src/credentials/accessTokenCache.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/accessTokenCache.ts rename to sdk/core/core-http/src/credentials/accessTokenCache.ts diff --git a/sdk/core/core-http/lib/credentials/apiKeyCredentials.ts b/sdk/core/core-http/src/credentials/apiKeyCredentials.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/apiKeyCredentials.ts rename to sdk/core/core-http/src/credentials/apiKeyCredentials.ts diff --git a/sdk/core/core-http/lib/credentials/basicAuthenticationCredentials.ts b/sdk/core/core-http/src/credentials/basicAuthenticationCredentials.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/basicAuthenticationCredentials.ts rename to sdk/core/core-http/src/credentials/basicAuthenticationCredentials.ts diff --git a/sdk/core/core-http/lib/credentials/credentials.ts b/sdk/core/core-http/src/credentials/credentials.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/credentials.ts rename to sdk/core/core-http/src/credentials/credentials.ts diff --git a/sdk/core/core-http/lib/credentials/serviceClientCredentials.ts b/sdk/core/core-http/src/credentials/serviceClientCredentials.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/serviceClientCredentials.ts rename to sdk/core/core-http/src/credentials/serviceClientCredentials.ts diff --git a/sdk/core/core-http/lib/credentials/topicCredentials.ts b/sdk/core/core-http/src/credentials/topicCredentials.ts similarity index 100% rename from sdk/core/core-http/lib/credentials/topicCredentials.ts rename to sdk/core/core-http/src/credentials/topicCredentials.ts diff --git a/sdk/core/core-http/lib/defaultHttpClient.browser.ts b/sdk/core/core-http/src/defaultHttpClient.browser.ts similarity index 100% rename from sdk/core/core-http/lib/defaultHttpClient.browser.ts rename to sdk/core/core-http/src/defaultHttpClient.browser.ts diff --git a/sdk/core/core-http/lib/defaultHttpClient.ts b/sdk/core/core-http/src/defaultHttpClient.ts similarity index 100% rename from sdk/core/core-http/lib/defaultHttpClient.ts rename to sdk/core/core-http/src/defaultHttpClient.ts diff --git a/sdk/core/core-http/lib/dom.d.ts b/sdk/core/core-http/src/dom.d.ts similarity index 100% rename from sdk/core/core-http/lib/dom.d.ts rename to sdk/core/core-http/src/dom.d.ts diff --git a/sdk/core/core-http/lib/fetchHttpClient.ts b/sdk/core/core-http/src/fetchHttpClient.ts similarity index 100% rename from sdk/core/core-http/lib/fetchHttpClient.ts rename to sdk/core/core-http/src/fetchHttpClient.ts diff --git a/sdk/core/core-http/lib/httpClient.ts b/sdk/core/core-http/src/httpClient.ts similarity index 100% rename from sdk/core/core-http/lib/httpClient.ts rename to sdk/core/core-http/src/httpClient.ts diff --git a/sdk/core/core-http/lib/httpHeaders.ts b/sdk/core/core-http/src/httpHeaders.ts similarity index 100% rename from sdk/core/core-http/lib/httpHeaders.ts rename to sdk/core/core-http/src/httpHeaders.ts diff --git a/sdk/core/core-http/lib/httpOperationResponse.ts b/sdk/core/core-http/src/httpOperationResponse.ts similarity index 100% rename from sdk/core/core-http/lib/httpOperationResponse.ts rename to sdk/core/core-http/src/httpOperationResponse.ts diff --git a/sdk/core/core-http/lib/httpPipelineLogLevel.ts b/sdk/core/core-http/src/httpPipelineLogLevel.ts similarity index 100% rename from sdk/core/core-http/lib/httpPipelineLogLevel.ts rename to sdk/core/core-http/src/httpPipelineLogLevel.ts diff --git a/sdk/core/core-http/lib/httpPipelineLogger.ts b/sdk/core/core-http/src/httpPipelineLogger.ts similarity index 100% rename from sdk/core/core-http/lib/httpPipelineLogger.ts rename to sdk/core/core-http/src/httpPipelineLogger.ts diff --git a/sdk/core/core-http/lib/log.ts b/sdk/core/core-http/src/log.ts similarity index 100% rename from sdk/core/core-http/lib/log.ts rename to sdk/core/core-http/src/log.ts diff --git a/sdk/core/core-http/lib/nodeFetchHttpClient.ts b/sdk/core/core-http/src/nodeFetchHttpClient.ts similarity index 100% rename from sdk/core/core-http/lib/nodeFetchHttpClient.ts rename to sdk/core/core-http/src/nodeFetchHttpClient.ts diff --git a/sdk/core/core-http/lib/operationArguments.ts b/sdk/core/core-http/src/operationArguments.ts similarity index 100% rename from sdk/core/core-http/lib/operationArguments.ts rename to sdk/core/core-http/src/operationArguments.ts diff --git a/sdk/core/core-http/lib/operationOptions.ts b/sdk/core/core-http/src/operationOptions.ts similarity index 100% rename from sdk/core/core-http/lib/operationOptions.ts rename to sdk/core/core-http/src/operationOptions.ts diff --git a/sdk/core/core-http/lib/operationParameter.ts b/sdk/core/core-http/src/operationParameter.ts similarity index 100% rename from sdk/core/core-http/lib/operationParameter.ts rename to sdk/core/core-http/src/operationParameter.ts diff --git a/sdk/core/core-http/lib/operationResponse.ts b/sdk/core/core-http/src/operationResponse.ts similarity index 100% rename from sdk/core/core-http/lib/operationResponse.ts rename to sdk/core/core-http/src/operationResponse.ts diff --git a/sdk/core/core-http/lib/operationSpec.ts b/sdk/core/core-http/src/operationSpec.ts similarity index 100% rename from sdk/core/core-http/lib/operationSpec.ts rename to sdk/core/core-http/src/operationSpec.ts diff --git a/sdk/core/core-http/lib/pipelineOptions.ts b/sdk/core/core-http/src/pipelineOptions.ts similarity index 100% rename from sdk/core/core-http/lib/pipelineOptions.ts rename to sdk/core/core-http/src/pipelineOptions.ts diff --git a/sdk/core/core-http/lib/policies/bearerTokenAuthenticationPolicy.ts b/sdk/core/core-http/src/policies/bearerTokenAuthenticationPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/bearerTokenAuthenticationPolicy.ts rename to sdk/core/core-http/src/policies/bearerTokenAuthenticationPolicy.ts diff --git a/sdk/core/core-http/lib/policies/deserializationPolicy.ts b/sdk/core/core-http/src/policies/deserializationPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/deserializationPolicy.ts rename to sdk/core/core-http/src/policies/deserializationPolicy.ts diff --git a/sdk/core/core-http/lib/policies/exponentialRetryPolicy.ts b/sdk/core/core-http/src/policies/exponentialRetryPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/exponentialRetryPolicy.ts rename to sdk/core/core-http/src/policies/exponentialRetryPolicy.ts diff --git a/sdk/core/core-http/lib/policies/generateClientRequestIdPolicy.ts b/sdk/core/core-http/src/policies/generateClientRequestIdPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/generateClientRequestIdPolicy.ts rename to sdk/core/core-http/src/policies/generateClientRequestIdPolicy.ts diff --git a/sdk/core/core-http/lib/policies/keepAlivePolicy.ts b/sdk/core/core-http/src/policies/keepAlivePolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/keepAlivePolicy.ts rename to sdk/core/core-http/src/policies/keepAlivePolicy.ts diff --git a/sdk/core/core-http/lib/policies/logPolicy.ts b/sdk/core/core-http/src/policies/logPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/logPolicy.ts rename to sdk/core/core-http/src/policies/logPolicy.ts diff --git a/sdk/core/core-http/lib/policies/msRestUserAgentPolicy.browser.ts b/sdk/core/core-http/src/policies/msRestUserAgentPolicy.browser.ts similarity index 100% rename from sdk/core/core-http/lib/policies/msRestUserAgentPolicy.browser.ts rename to sdk/core/core-http/src/policies/msRestUserAgentPolicy.browser.ts diff --git a/sdk/core/core-http/lib/policies/msRestUserAgentPolicy.ts b/sdk/core/core-http/src/policies/msRestUserAgentPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/msRestUserAgentPolicy.ts rename to sdk/core/core-http/src/policies/msRestUserAgentPolicy.ts diff --git a/sdk/core/core-http/lib/policies/proxyPolicy.browser.ts b/sdk/core/core-http/src/policies/proxyPolicy.browser.ts similarity index 100% rename from sdk/core/core-http/lib/policies/proxyPolicy.browser.ts rename to sdk/core/core-http/src/policies/proxyPolicy.browser.ts diff --git a/sdk/core/core-http/lib/policies/proxyPolicy.ts b/sdk/core/core-http/src/policies/proxyPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/proxyPolicy.ts rename to sdk/core/core-http/src/policies/proxyPolicy.ts diff --git a/sdk/core/core-http/lib/policies/redirectPolicy.ts b/sdk/core/core-http/src/policies/redirectPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/redirectPolicy.ts rename to sdk/core/core-http/src/policies/redirectPolicy.ts diff --git a/sdk/core/core-http/lib/policies/requestPolicy.ts b/sdk/core/core-http/src/policies/requestPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/requestPolicy.ts rename to sdk/core/core-http/src/policies/requestPolicy.ts diff --git a/sdk/core/core-http/lib/policies/rpRegistrationPolicy.ts b/sdk/core/core-http/src/policies/rpRegistrationPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/rpRegistrationPolicy.ts rename to sdk/core/core-http/src/policies/rpRegistrationPolicy.ts diff --git a/sdk/core/core-http/lib/policies/signingPolicy.ts b/sdk/core/core-http/src/policies/signingPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/signingPolicy.ts rename to sdk/core/core-http/src/policies/signingPolicy.ts diff --git a/sdk/core/core-http/lib/policies/systemErrorRetryPolicy.ts b/sdk/core/core-http/src/policies/systemErrorRetryPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/systemErrorRetryPolicy.ts rename to sdk/core/core-http/src/policies/systemErrorRetryPolicy.ts diff --git a/sdk/core/core-http/lib/policies/throttlingRetryPolicy.ts b/sdk/core/core-http/src/policies/throttlingRetryPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/throttlingRetryPolicy.ts rename to sdk/core/core-http/src/policies/throttlingRetryPolicy.ts diff --git a/sdk/core/core-http/lib/policies/tracingPolicy.ts b/sdk/core/core-http/src/policies/tracingPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/tracingPolicy.ts rename to sdk/core/core-http/src/policies/tracingPolicy.ts diff --git a/sdk/core/core-http/lib/policies/userAgentPolicy.ts b/sdk/core/core-http/src/policies/userAgentPolicy.ts similarity index 100% rename from sdk/core/core-http/lib/policies/userAgentPolicy.ts rename to sdk/core/core-http/src/policies/userAgentPolicy.ts diff --git a/sdk/core/core-http/lib/proxyAgent.ts b/sdk/core/core-http/src/proxyAgent.ts similarity index 100% rename from sdk/core/core-http/lib/proxyAgent.ts rename to sdk/core/core-http/src/proxyAgent.ts diff --git a/sdk/core/core-http/lib/queryCollectionFormat.ts b/sdk/core/core-http/src/queryCollectionFormat.ts similarity index 100% rename from sdk/core/core-http/lib/queryCollectionFormat.ts rename to sdk/core/core-http/src/queryCollectionFormat.ts diff --git a/sdk/core/core-http/lib/restError.ts b/sdk/core/core-http/src/restError.ts similarity index 100% rename from sdk/core/core-http/lib/restError.ts rename to sdk/core/core-http/src/restError.ts diff --git a/sdk/core/core-http/lib/serializer.ts b/sdk/core/core-http/src/serializer.ts similarity index 100% rename from sdk/core/core-http/lib/serializer.ts rename to sdk/core/core-http/src/serializer.ts diff --git a/sdk/core/core-http/lib/serviceClient.ts b/sdk/core/core-http/src/serviceClient.ts similarity index 100% rename from sdk/core/core-http/lib/serviceClient.ts rename to sdk/core/core-http/src/serviceClient.ts diff --git a/sdk/core/core-http/lib/url.ts b/sdk/core/core-http/src/url.ts similarity index 100% rename from sdk/core/core-http/lib/url.ts rename to sdk/core/core-http/src/url.ts diff --git a/sdk/core/core-http/lib/util/base64.browser.ts b/sdk/core/core-http/src/util/base64.browser.ts similarity index 100% rename from sdk/core/core-http/lib/util/base64.browser.ts rename to sdk/core/core-http/src/util/base64.browser.ts diff --git a/sdk/core/core-http/lib/util/base64.ts b/sdk/core/core-http/src/util/base64.ts similarity index 100% rename from sdk/core/core-http/lib/util/base64.ts rename to sdk/core/core-http/src/util/base64.ts diff --git a/sdk/core/core-http/lib/util/constants.ts b/sdk/core/core-http/src/util/constants.ts similarity index 100% rename from sdk/core/core-http/lib/util/constants.ts rename to sdk/core/core-http/src/util/constants.ts diff --git a/sdk/core/core-http/lib/util/inspect.browser.ts b/sdk/core/core-http/src/util/inspect.browser.ts similarity index 100% rename from sdk/core/core-http/lib/util/inspect.browser.ts rename to sdk/core/core-http/src/util/inspect.browser.ts diff --git a/sdk/core/core-http/lib/util/inspect.ts b/sdk/core/core-http/src/util/inspect.ts similarity index 100% rename from sdk/core/core-http/lib/util/inspect.ts rename to sdk/core/core-http/src/util/inspect.ts diff --git a/sdk/core/core-http/lib/util/sanitizer.ts b/sdk/core/core-http/src/util/sanitizer.ts similarity index 100% rename from sdk/core/core-http/lib/util/sanitizer.ts rename to sdk/core/core-http/src/util/sanitizer.ts diff --git a/sdk/core/core-http/lib/util/utils.ts b/sdk/core/core-http/src/util/utils.ts similarity index 100% rename from sdk/core/core-http/lib/util/utils.ts rename to sdk/core/core-http/src/util/utils.ts diff --git a/sdk/core/core-http/lib/util/xml.browser.ts b/sdk/core/core-http/src/util/xml.browser.ts similarity index 100% rename from sdk/core/core-http/lib/util/xml.browser.ts rename to sdk/core/core-http/src/util/xml.browser.ts diff --git a/sdk/core/core-http/lib/util/xml.ts b/sdk/core/core-http/src/util/xml.ts similarity index 100% rename from sdk/core/core-http/lib/util/xml.ts rename to sdk/core/core-http/src/util/xml.ts diff --git a/sdk/core/core-http/lib/webResource.ts b/sdk/core/core-http/src/webResource.ts similarity index 100% rename from sdk/core/core-http/lib/webResource.ts rename to sdk/core/core-http/src/webResource.ts diff --git a/sdk/core/core-http/lib/xhrHttpClient.ts b/sdk/core/core-http/src/xhrHttpClient.ts similarity index 100% rename from sdk/core/core-http/lib/xhrHttpClient.ts rename to sdk/core/core-http/src/xhrHttpClient.ts diff --git a/sdk/core/core-http/test/credentialTests.ts b/sdk/core/core-http/test/credentialTests.ts index 0b411192b247..234da85774db 100644 --- a/sdk/core/core-http/test/credentialTests.ts +++ b/sdk/core/core-http/test/credentialTests.ts @@ -2,8 +2,8 @@ // Licensed under the MIT License. import "chai/register-should"; -import * as msRest from "../lib/coreHttp"; -import * as base64 from "../lib/util/base64"; +import * as msRest from "../src/coreHttp"; +import * as base64 from "../src/util/base64"; const BasicAuthenticationCredentials = msRest.BasicAuthenticationCredentials; const ApiKeyCredentials = msRest.ApiKeyCredentials; const fakeScheme = "fake-auth-scheme"; diff --git a/sdk/core/core-http/test/data/TestClient/lib/models/mappers.ts b/sdk/core/core-http/test/data/TestClient/src/models/mappers.ts similarity index 100% rename from sdk/core/core-http/test/data/TestClient/lib/models/mappers.ts rename to sdk/core/core-http/test/data/TestClient/src/models/mappers.ts diff --git a/sdk/core/core-http/test/data/TestClient/lib/testClient.ts b/sdk/core/core-http/test/data/TestClient/src/testClient.ts similarity index 96% rename from sdk/core/core-http/test/data/TestClient/lib/testClient.ts rename to sdk/core/core-http/test/data/TestClient/src/testClient.ts index 392e752736b2..59aaee27438a 100644 --- a/sdk/core/core-http/test/data/TestClient/lib/testClient.ts +++ b/sdk/core/core-http/test/data/TestClient/src/testClient.ts @@ -14,7 +14,7 @@ "use strict"; -import * as msRest from "../../../../lib/coreHttp"; +import * as msRest from "../../../../src/coreHttp"; import { Mappers } from "./models/mappers"; /** diff --git a/sdk/core/core-http/test/defaultHttpClientTests.browser.ts b/sdk/core/core-http/test/defaultHttpClientTests.browser.ts index 8d62fd44584f..41b5631ae990 100644 --- a/sdk/core/core-http/test/defaultHttpClientTests.browser.ts +++ b/sdk/core/core-http/test/defaultHttpClientTests.browser.ts @@ -3,8 +3,8 @@ import "chai/register-should"; -import { DefaultHttpClient } from "../lib/defaultHttpClient"; -import { WebResource, TransferProgressEvent } from "../lib/webResource"; +import { DefaultHttpClient } from "../src/defaultHttpClient"; +import { WebResource, TransferProgressEvent } from "../src/webResource"; import { getHttpMock, HttpMockFacade } from "./mockHttp"; describe("defaultHttpClient (browser)", function() { diff --git a/sdk/core/core-http/test/defaultHttpClientTests.node.ts b/sdk/core/core-http/test/defaultHttpClientTests.node.ts index e6c4e9f8033f..2d32fabc99d5 100644 --- a/sdk/core/core-http/test/defaultHttpClientTests.node.ts +++ b/sdk/core/core-http/test/defaultHttpClientTests.node.ts @@ -6,11 +6,11 @@ import "chai/register-should"; import * as http from "http"; import { createReadStream } from "fs"; -import { DefaultHttpClient } from "../lib/defaultHttpClient"; -import { WebResource, TransferProgressEvent } from "../lib/webResource"; +import { DefaultHttpClient } from "../src/defaultHttpClient"; +import { WebResource, TransferProgressEvent } from "../src/webResource"; import { getHttpMock, HttpMockFacade } from "./mockHttp"; import { PassThrough } from "stream"; -import { ReportTransform } from "../lib/fetchHttpClient"; +import { ReportTransform } from "../src/fetchHttpClient"; describe("defaultHttpClient (node)", function() { let httpMock: HttpMockFacade; diff --git a/sdk/core/core-http/test/defaultHttpClientTests.ts b/sdk/core/core-http/test/defaultHttpClientTests.ts index fb7afecd4de5..4c838c123eae 100644 --- a/sdk/core/core-http/test/defaultHttpClientTests.ts +++ b/sdk/core/core-http/test/defaultHttpClientTests.ts @@ -5,9 +5,9 @@ import { assert, AssertionError } from "chai"; import { AbortController } from "@azure/abort-controller"; import "chai/register-should"; -import { DefaultHttpClient } from "../lib/defaultHttpClient"; -import { RestError } from "../lib/restError"; -import { WebResource, TransferProgressEvent } from "../lib/webResource"; +import { DefaultHttpClient } from "../src/defaultHttpClient"; +import { RestError } from "../src/restError"; +import { WebResource, TransferProgressEvent } from "../src/webResource"; import { getHttpMock, HttpMockFacade } from "./mockHttp"; describe("defaultHttpClient", function() { diff --git a/sdk/core/core-http/test/expiringAccessTokenCacheTests.ts b/sdk/core/core-http/test/expiringAccessTokenCacheTests.ts index 07dd04ffd0d0..0c9a60df0fee 100644 --- a/sdk/core/core-http/test/expiringAccessTokenCacheTests.ts +++ b/sdk/core/core-http/test/expiringAccessTokenCacheTests.ts @@ -1,5 +1,5 @@ import { assert } from "chai"; -import { ExpiringAccessTokenCache } from "../lib/credentials/accessTokenCache"; +import { ExpiringAccessTokenCache } from "../src/credentials/accessTokenCache"; function mockToken(expirationDeltaMs: number) { return { diff --git a/sdk/core/core-http/test/logFilterTests.ts b/sdk/core/core-http/test/logFilterTests.ts index 866c5315f4a1..9a5a2575c3bf 100644 --- a/sdk/core/core-http/test/logFilterTests.ts +++ b/sdk/core/core-http/test/logFilterTests.ts @@ -2,11 +2,11 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { HttpHeaders, RawHttpHeaders } from "../lib/httpHeaders"; -import { HttpOperationResponse } from "../lib/httpOperationResponse"; -import { LogPolicy, LogPolicyOptions } from "../lib/policies/logPolicy"; -import { RequestPolicy, RequestPolicyOptions } from "../lib/policies/requestPolicy"; -import { WebResource } from "../lib/webResource"; +import { HttpHeaders, RawHttpHeaders } from "../src/httpHeaders"; +import { HttpOperationResponse } from "../src/httpOperationResponse"; +import { LogPolicy, LogPolicyOptions } from "../src/policies/logPolicy"; +import { RequestPolicy, RequestPolicyOptions } from "../src/policies/requestPolicy"; +import { WebResource } from "../src/webResource"; import { getLogLevel, setLogLevel, AzureLogLevel, Debugger } from "@azure/logger"; function getNextPolicy(responseHeaders?: RawHttpHeaders): RequestPolicy { diff --git a/sdk/core/core-http/test/mockHttp.ts b/sdk/core/core-http/test/mockHttp.ts index 294b679259af..19d668a784b4 100644 --- a/sdk/core/core-http/test/mockHttp.ts +++ b/sdk/core/core-http/test/mockHttp.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import xhrMock, { proxy } from "xhr-mock"; -import { isNode, HttpMethods } from "../lib/coreHttp"; +import { isNode, HttpMethods } from "../src/coreHttp"; import fetchMock, * as fetch from "fetch-mock"; import { Readable } from "stream"; diff --git a/sdk/core/core-http/test/msRestUserAgentPolicyTests.browser.ts b/sdk/core/core-http/test/msRestUserAgentPolicyTests.browser.ts index a36d114fa485..706a034ef654 100644 --- a/sdk/core/core-http/test/msRestUserAgentPolicyTests.browser.ts +++ b/sdk/core/core-http/test/msRestUserAgentPolicyTests.browser.ts @@ -3,10 +3,10 @@ import "chai/register-should"; -import { HttpOperationResponse } from "../lib/httpOperationResponse"; -import { RequestPolicy, RequestPolicyOptions } from "../lib/policies/requestPolicy"; -import { WebResource } from "../lib/webResource"; -import { userAgentPolicy } from "../lib/policies/userAgentPolicy"; +import { HttpOperationResponse } from "../src/httpOperationResponse"; +import { RequestPolicy, RequestPolicyOptions } from "../src/policies/requestPolicy"; +import { WebResource } from "../src/webResource"; +import { userAgentPolicy } from "../src/policies/userAgentPolicy"; describe("MsRestUserAgentPolicy (browser)", () => { describe("for browser", function() { diff --git a/sdk/core/core-http/test/msRestUserAgentPolicyTests.node.ts b/sdk/core/core-http/test/msRestUserAgentPolicyTests.node.ts index 0d08c11f8e96..9c3c8f492f8f 100644 --- a/sdk/core/core-http/test/msRestUserAgentPolicyTests.node.ts +++ b/sdk/core/core-http/test/msRestUserAgentPolicyTests.node.ts @@ -3,11 +3,11 @@ import "chai/register-should"; -import { HttpOperationResponse } from "../lib/httpOperationResponse"; -import { RequestPolicy, RequestPolicyOptions } from "../lib/policies/requestPolicy"; -import { Constants } from "../lib/util/constants"; -import { WebResource } from "../lib/webResource"; -import { userAgentPolicy } from "../lib/policies/userAgentPolicy"; +import { HttpOperationResponse } from "../src/httpOperationResponse"; +import { RequestPolicy, RequestPolicyOptions } from "../src/policies/requestPolicy"; +import { Constants } from "../src/util/constants"; +import { WebResource } from "../src/webResource"; +import { userAgentPolicy } from "../src/policies/userAgentPolicy"; const userAgentHeaderKey = Constants.HeaderConstants.USER_AGENT; diff --git a/sdk/core/core-http/test/operationParameterTests.ts b/sdk/core/core-http/test/operationParameterTests.ts index 49e275f786b8..53dc1250439c 100644 --- a/sdk/core/core-http/test/operationParameterTests.ts +++ b/sdk/core/core-http/test/operationParameterTests.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { getPathStringFromParameter, OperationParameter } from "../lib/operationParameter"; +import { getPathStringFromParameter, OperationParameter } from "../src/operationParameter"; describe("getParameterPathString()", () => { it("should throw when given undefined", () => { diff --git a/sdk/core/core-http/test/policies/bearerTokenAuthenticationPolicyTests.ts b/sdk/core/core-http/test/policies/bearerTokenAuthenticationPolicyTests.ts index 19d9fdaca4fd..a711fe4801e5 100644 --- a/sdk/core/core-http/test/policies/bearerTokenAuthenticationPolicyTests.ts +++ b/sdk/core/core-http/test/policies/bearerTokenAuthenticationPolicyTests.ts @@ -3,18 +3,18 @@ import { assert } from "chai"; import { fake } from "sinon"; -import { OperationSpec } from "../../lib/operationSpec"; +import { OperationSpec } from "../../src/operationSpec"; import { TokenCredential, GetTokenOptions, AccessToken } from "@azure/core-auth"; -import { RequestPolicy, RequestPolicyOptions } from "../../lib/policies/requestPolicy"; -import { Constants } from "../../lib/util/constants"; -import { HttpOperationResponse } from "../../lib/httpOperationResponse"; -import { HttpHeaders } from "../../lib/httpHeaders"; -import { WebResource } from "../../lib/webResource"; -import { BearerTokenAuthenticationPolicy } from "../../lib/policies/bearerTokenAuthenticationPolicy"; +import { RequestPolicy, RequestPolicyOptions } from "../../src/policies/requestPolicy"; +import { Constants } from "../../src/util/constants"; +import { HttpOperationResponse } from "../../src/httpOperationResponse"; +import { HttpHeaders } from "../../src/httpHeaders"; +import { WebResource } from "../../src/webResource"; +import { BearerTokenAuthenticationPolicy } from "../../src/policies/bearerTokenAuthenticationPolicy"; import { ExpiringAccessTokenCache, TokenRefreshBufferMs -} from "../../lib/credentials/accessTokenCache"; +} from "../../src/credentials/accessTokenCache"; describe("BearerTokenAuthenticationPolicy", function() { const mockPolicy: RequestPolicy = { diff --git a/sdk/core/core-http/test/policies/deserializationPolicyTests.ts b/sdk/core/core-http/test/policies/deserializationPolicyTests.ts index 7ca6b4fdd8a5..74bcae36167b 100644 --- a/sdk/core/core-http/test/policies/deserializationPolicyTests.ts +++ b/sdk/core/core-http/test/policies/deserializationPolicyTests.ts @@ -2,18 +2,18 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { HttpHeaders } from "../../lib/httpHeaders"; -import { HttpOperationResponse } from "../../lib/httpOperationResponse"; -import { HttpClient, OperationSpec, Serializer, CompositeMapper } from "../../lib/coreHttp"; +import { HttpHeaders } from "../../src/httpHeaders"; +import { HttpOperationResponse } from "../../src/httpOperationResponse"; +import { HttpClient, OperationSpec, Serializer, CompositeMapper } from "../../src/coreHttp"; import { DeserializationPolicy, deserializationPolicy, deserializeResponseBody, defaultJsonContentTypes, defaultXmlContentTypes -} from "../../lib/policies/deserializationPolicy"; -import { RequestPolicy, RequestPolicyOptions } from "../../lib/policies/requestPolicy"; -import { WebResource } from "../../lib/webResource"; +} from "../../src/policies/deserializationPolicy"; +import { RequestPolicy, RequestPolicyOptions } from "../../src/policies/requestPolicy"; +import { WebResource } from "../../src/webResource"; describe("deserializationPolicy", function() { const mockPolicy: RequestPolicy = { diff --git a/sdk/core/core-http/test/policies/proxyPolicyTests.browser.ts b/sdk/core/core-http/test/policies/proxyPolicyTests.browser.ts index c97b0c4c4401..1e060cf1ce48 100644 --- a/sdk/core/core-http/test/policies/proxyPolicyTests.browser.ts +++ b/sdk/core/core-http/test/policies/proxyPolicyTests.browser.ts @@ -3,11 +3,11 @@ import "chai/register-should"; import { should } from "chai"; -import { ProxySettings } from "../../lib/serviceClient"; -import { RequestPolicyOptions } from "../../lib/policies/requestPolicy"; -import { WebResource } from "../../lib/webResource"; -import { HttpHeaders } from "../../lib/httpHeaders"; -import { ProxyPolicy, getDefaultProxySettings } from "../../lib/policies/proxyPolicy"; +import { ProxySettings } from "../../src/serviceClient"; +import { RequestPolicyOptions } from "../../src/policies/requestPolicy"; +import { WebResource } from "../../src/webResource"; +import { HttpHeaders } from "../../src/httpHeaders"; +import { ProxyPolicy, getDefaultProxySettings } from "../../src/policies/proxyPolicy"; describe("ProxyPolicy (browser)", function() { const proxySettings: ProxySettings = { diff --git a/sdk/core/core-http/test/policies/proxyPolicyTests.node.ts b/sdk/core/core-http/test/policies/proxyPolicyTests.node.ts index 8c2d09a5b598..60d1559295db 100644 --- a/sdk/core/core-http/test/policies/proxyPolicyTests.node.ts +++ b/sdk/core/core-http/test/policies/proxyPolicyTests.node.ts @@ -3,12 +3,12 @@ import "chai/register-should"; import { should } from "chai"; -import { ProxySettings } from "../../lib/serviceClient"; -import { RequestPolicyOptions } from "../../lib/policies/requestPolicy"; -import { WebResource } from "../../lib/webResource"; -import { HttpHeaders } from "../../lib/httpHeaders"; -import { proxyPolicy, ProxyPolicy, getDefaultProxySettings } from "../../lib/policies/proxyPolicy"; -import { Constants } from "../../lib/coreHttp"; +import { ProxySettings } from "../../src/serviceClient"; +import { RequestPolicyOptions } from "../../src/policies/requestPolicy"; +import { WebResource } from "../../src/webResource"; +import { HttpHeaders } from "../../src/httpHeaders"; +import { proxyPolicy, ProxyPolicy, getDefaultProxySettings } from "../../src/policies/proxyPolicy"; +import { Constants } from "../../src/coreHttp"; describe("ProxyPolicy (node)", function() { const proxySettings: ProxySettings = { diff --git a/sdk/core/core-http/test/policies/throttlingRetryPolicyTests.ts b/sdk/core/core-http/test/policies/throttlingRetryPolicyTests.ts index 9575796ba292..aed5f2aabb2f 100644 --- a/sdk/core/core-http/test/policies/throttlingRetryPolicyTests.ts +++ b/sdk/core/core-http/test/policies/throttlingRetryPolicyTests.ts @@ -3,10 +3,10 @@ import { assert, AssertionError } from "chai"; import sinon from "sinon"; -import { ThrottlingRetryPolicy } from "../../lib/policies/throttlingRetryPolicy"; -import { WebResource } from "../../lib/webResource"; -import { HttpOperationResponse } from "../../lib/httpOperationResponse"; -import { HttpHeaders, RequestPolicyOptions } from "../../lib/coreHttp"; +import { ThrottlingRetryPolicy } from "../../src/policies/throttlingRetryPolicy"; +import { WebResource } from "../../src/webResource"; +import { HttpOperationResponse } from "../../src/httpOperationResponse"; +import { HttpHeaders, RequestPolicyOptions } from "../../src/coreHttp"; describe("ThrottlingRetryPolicy", () => { class PassThroughPolicy { diff --git a/sdk/core/core-http/test/policies/tracingPolicyTests.ts b/sdk/core/core-http/test/policies/tracingPolicyTests.ts index 0e94bd9d1b31..0536266537ef 100644 --- a/sdk/core/core-http/test/policies/tracingPolicyTests.ts +++ b/sdk/core/core-http/test/policies/tracingPolicyTests.ts @@ -8,10 +8,10 @@ import { HttpOperationResponse, HttpHeaders, RequestPolicyOptions -} from "../../lib/coreHttp"; +} from "../../src/coreHttp"; import { SpanOptions, SpanContext, TraceFlags } from "@opentelemetry/types"; import { setTracer, NoOpTracer, NoOpSpan } from "@azure/core-tracing"; -import { tracingPolicy } from "../../lib/policies/tracingPolicy"; +import { tracingPolicy } from "../../src/policies/tracingPolicy"; class MockSpan extends NoOpSpan { private _endCalled = false; diff --git a/sdk/core/core-http/test/proxyAgent.node.ts b/sdk/core/core-http/test/proxyAgent.node.ts index 9cd2e7923914..a835c14390fb 100644 --- a/sdk/core/core-http/test/proxyAgent.node.ts +++ b/sdk/core/core-http/test/proxyAgent.node.ts @@ -6,8 +6,8 @@ import { should } from "chai"; import tunnel from "tunnel"; import https from "https"; -import { HttpHeaders } from "../lib/coreHttp"; -import { createProxyAgent, createTunnel } from "../lib/proxyAgent"; +import { HttpHeaders } from "../src/coreHttp"; +import { createProxyAgent, createTunnel } from "../src/proxyAgent"; describe("proxyAgent", () => { describe("createProxyAgent", () => { @@ -97,9 +97,9 @@ describe("proxyAgent", () => { createProxyAgent("http://example.com", proxySettings); }; fn.should.throw( - testCase.expectInvalidHostError? - "Expecting a non-empty host in proxy settings." : - "Expecting a valid port number in the range of [0, 65535] in proxy settings." + testCase.expectInvalidHostError + ? "Expecting a non-empty host in proxy settings." + : "Expecting a valid port number in the range of [0, 65535] in proxy settings." ); done(); }); diff --git a/sdk/core/core-http/test/restError.node.ts b/sdk/core/core-http/test/restError.node.ts index 9d30ed9ef36f..f0e4e5d1599f 100644 --- a/sdk/core/core-http/test/restError.node.ts +++ b/sdk/core/core-http/test/restError.node.ts @@ -2,11 +2,11 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { RestError } from "../lib/restError"; -import { WebResource } from "../lib/webResource"; -import { HttpOperationResponse } from "../lib/httpOperationResponse"; +import { RestError } from "../src/restError"; +import { WebResource } from "../src/webResource"; +import { HttpOperationResponse } from "../src/httpOperationResponse"; import { inspect } from "util"; -import { HttpHeaders } from "../lib/coreHttp"; +import { HttpHeaders } from "../src/coreHttp"; describe("RestError", function() { it("serializes properly in node", function() { diff --git a/sdk/core/core-http/test/serializationTests.node.ts b/sdk/core/core-http/test/serializationTests.node.ts index f9650eaf8cdf..e8a35108aa75 100644 --- a/sdk/core/core-http/test/serializationTests.node.ts +++ b/sdk/core/core-http/test/serializationTests.node.ts @@ -3,8 +3,8 @@ import "chai/register-should"; -import { TestClient } from "./data/TestClient/lib/testClient"; -import { Mappers } from "./data/TestClient/lib/models/mappers"; +import { TestClient } from "./data/TestClient/src/testClient"; +import { Mappers } from "./data/TestClient/src/models/mappers"; describe("msrest (node)", function() { describe("deserialize", function() { diff --git a/sdk/core/core-http/test/serializationTests.ts b/sdk/core/core-http/test/serializationTests.ts index 468d6b37748f..edc8244a2ad6 100644 --- a/sdk/core/core-http/test/serializationTests.ts +++ b/sdk/core/core-http/test/serializationTests.ts @@ -4,9 +4,9 @@ import { assert } from "chai"; import "chai/register-should"; -import * as msRest from "../lib/coreHttp"; -import { TestClient } from "./data/TestClient/lib/testClient"; -import { Mappers } from "./data/TestClient/lib/models/mappers"; +import * as msRest from "../src/coreHttp"; +import { TestClient } from "./data/TestClient/src/testClient"; +import { Mappers } from "./data/TestClient/src/models/mappers"; const Serializer = new msRest.Serializer({}); const valid_uuid = "ceaafd1e-f936-429f-bbfc-82ee75dddc33"; diff --git a/sdk/core/core-http/test/serviceClientTests.ts b/sdk/core/core-http/test/serviceClientTests.ts index 999cae372190..9d431c7b1d77 100644 --- a/sdk/core/core-http/test/serviceClientTests.ts +++ b/sdk/core/core-http/test/serviceClientTests.ts @@ -2,21 +2,21 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { HttpClient } from "../lib/httpClient"; -import { QueryCollectionFormat } from "../lib/queryCollectionFormat"; +import { HttpClient } from "../src/httpClient"; +import { QueryCollectionFormat } from "../src/queryCollectionFormat"; import { DictionaryMapper, MapperType, Serializer, Mapper, CompositeMapper -} from "../lib/serializer"; +} from "../src/serializer"; import { serializeRequestBody, ServiceClient, getOperationArgumentValueFromParameterPath -} from "../lib/serviceClient"; -import { WebResource } from "../lib/webResource"; +} from "../src/serviceClient"; +import { WebResource } from "../src/webResource"; import { OperationArguments, HttpHeaders, @@ -24,8 +24,8 @@ import { RestResponse, isNode, OperationSpec -} from "../lib/coreHttp"; -import { ParameterPath } from "../lib/operationParameter"; +} from "../src/coreHttp"; +import { ParameterPath } from "../src/operationParameter"; describe("ServiceClient", function() { it("should serialize headerCollectionPrefix", async function() { diff --git a/sdk/core/core-http/test/urlTests.ts b/sdk/core/core-http/test/urlTests.ts index 4432cf0e93f4..95582f7d5763 100644 --- a/sdk/core/core-http/test/urlTests.ts +++ b/sdk/core/core-http/test/urlTests.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { URLTokenizer, URLToken, URLBuilder, URLQuery } from "../lib/url"; +import { URLTokenizer, URLToken, URLBuilder, URLQuery } from "../src/url"; describe("URLQuery", () => { it(`constructor()`, () => { diff --git a/sdk/core/core-http/test/utilsTests.ts b/sdk/core/core-http/test/utilsTests.ts index d573fa50a4c2..ab15dfb34979 100644 --- a/sdk/core/core-http/test/utilsTests.ts +++ b/sdk/core/core-http/test/utilsTests.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import { expect } from "chai"; -import { isValidUuid } from "../lib/util/utils"; +import { isValidUuid } from "../src/util/utils"; describe("utils", function() { describe("isValidUuid()", function() { @@ -14,4 +14,4 @@ describe("utils", function() { expect(isValidUuid(uuidString), "Second call failed").to.be.true; }) }); -}) \ No newline at end of file +}) diff --git a/sdk/core/core-http/test/xhrTests.browser.ts b/sdk/core/core-http/test/xhrTests.browser.ts index 4ef3b7e37c5d..b03ef6da4b65 100644 --- a/sdk/core/core-http/test/xhrTests.browser.ts +++ b/sdk/core/core-http/test/xhrTests.browser.ts @@ -2,8 +2,8 @@ // Licensed under the MIT License. import { assert } from "chai"; -import { parseHeaders, XhrHttpClient } from "../lib/xhrHttpClient"; -import { WebResource } from "../lib/webResource"; +import { parseHeaders, XhrHttpClient } from "../src/xhrHttpClient"; +import { WebResource } from "../src/webResource"; describe("XhrHttpClient", function() { it("parses headers", function() { diff --git a/sdk/core/core-http/test/xmlTests.ts b/sdk/core/core-http/test/xmlTests.ts index fd9f0d1fb831..15a664787b0d 100644 --- a/sdk/core/core-http/test/xmlTests.ts +++ b/sdk/core/core-http/test/xmlTests.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { parseXML, stringifyXML } from "../lib/util/xml"; +import { parseXML, stringifyXML } from "../src/util/xml"; import { assert } from "chai"; import * as msAssert from "./msAssert"; diff --git a/sdk/core/core-http/tsconfig.json b/sdk/core/core-http/tsconfig.json index 34f4ac8a93be..ca0feabd6005 100644 --- a/sdk/core/core-http/tsconfig.json +++ b/sdk/core/core-http/tsconfig.json @@ -7,5 +7,5 @@ }, "compileOnSave": true, "exclude": ["node_modules"], - "include": ["./lib/**/*.ts", "./samples/**/*.ts", "./test/**/*.ts"] + "include": ["./src/**/*.ts", "./samples/**/*.ts", "./test/**/*.ts"] }