diff --git a/packages/@azure/cognitiveservices-entitysearch/README.md b/packages/@azure/cognitiveservices-entitysearch/README.md index 4a494af5df18..fad651a6d293 100644 --- a/packages/@azure/cognitiveservices-entitysearch/README.md +++ b/packages/@azure/cognitiveservices-entitysearch/README.md @@ -1,33 +1,26 @@ -## An isomorphic javascript sdk for - EntitySearchAPIClient +# An isomorphic javascript sdk for - EntitySearchAPIClient +This project provides an isomorphic javascript package. Right now it supports: +- node.js version 6.x.x or higher +- browser javascript -This package contains an isomorphic SDK for EntitySearchAPIClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install +## How to Install +- nodejs ``` npm install @azure/cognitiveservices-entitysearch ``` - -### How to use - -#### nodejs - Authentication, client creation and search entities as an example written in TypeScript. - -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth +- browser +```html + ``` -##### Sample code +## How to use + +### nodejs - Authentication, client creation and search entities as an example written in TypeScript. ```ts -import * as msRest from "@azure/ms-rest-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; +import * as msRest from "ms-rest-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; import { EntitySearchAPIClient, EntitySearchAPIModels, EntitySearchAPIMappers } from "@azure/cognitiveservices-entitysearch"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; @@ -55,17 +48,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -#### browser - Authentication, client creation and search entities as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. +### browser - Authentication, client creation and search entities as an example written in javascript. - index.html ```html @@ -73,8 +56,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to @azure/cognitiveservices-entitysearch sample - - + + - + + ``` -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClient.ts b/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClient.ts index cfd36b5da42e..2132be621334 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClient.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClientContext.ts b/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClientContext.ts index bfb51532e32c..fb5b6d1432b3 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClientContext.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/entitySearchAPIClientContext.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; const packageName = "@azure/cognitiveservices-entitysearch"; diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/models/index.ts b/packages/@azure/cognitiveservices-entitysearch/lib/models/index.ts index 00c16b7e6661..571d15e4dd9b 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/models/index.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { ServiceClientOptions } from "@azure/ms-rest-js"; -import * as msRest from "@azure/ms-rest-js"; +import { ServiceClientOptions } from "ms-rest-js"; +import * as msRest from "ms-rest-js"; /** @@ -1203,7 +1203,7 @@ export interface PostalAddress { */ readonly addressCountry?: string; /** - * @member {string} [countryIso] The two letter ISO code of this countr. For + * @member {string} [countryIso] The two letter ISO code of this country. For * example, US. * **NOTE: This property will not be serialized. It can only be populated by * the server.** diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/models/mappers.ts b/packages/@azure/cognitiveservices-entitysearch/lib/models/mappers.ts index db830a576044..60299b745ebe 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/models/mappers.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/models/mappers.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const QueryContext: msRest.CompositeMapper = { @@ -115,6 +115,11 @@ export const Response: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "_type", + clientName: "_type" + }, + uberParent: "ContractualRulesContractualRule", className: "ContractualRulesContractualRule" } } @@ -159,6 +164,8 @@ export const Thing: msRest.CompositeMapper = { serializedName: "image", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } }, @@ -212,6 +219,8 @@ export const CreativeWork: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Thing" } } @@ -283,6 +292,8 @@ export const ImageObject: msRest.CompositeMapper = { serializedName: "thumbnail", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } @@ -386,6 +397,8 @@ export const Entities: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Thing" } } @@ -412,6 +425,8 @@ export const Places: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Thing" } } @@ -443,6 +458,8 @@ export const SearchResponse: msRest.CompositeMapper = { serializedName: "entities", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Entities" } }, @@ -451,6 +468,8 @@ export const SearchResponse: msRest.CompositeMapper = { serializedName: "places", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Places" } } @@ -696,6 +715,8 @@ export const Place: msRest.CompositeMapper = { serializedName: "address", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "PostalAddress" } }, @@ -747,6 +768,8 @@ export const LocalBusiness: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } @@ -903,6 +926,8 @@ export const ContractualRulesLicenseAttribution: msRest.CompositeMapper = { serializedName: "license", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "License" } }, diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/models/parameters.ts b/packages/@azure/cognitiveservices-entitysearch/lib/models/parameters.ts index 25d02ef7d929..8d408ee36c2f 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/models/parameters.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: [ diff --git a/packages/@azure/cognitiveservices-entitysearch/lib/operations/entitiesOperations.ts b/packages/@azure/cognitiveservices-entitysearch/lib/operations/entitiesOperations.ts index 9125b64820f1..5e5df673d40c 100644 --- a/packages/@azure/cognitiveservices-entitysearch/lib/operations/entitiesOperations.ts +++ b/packages/@azure/cognitiveservices-entitysearch/lib/operations/entitiesOperations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/entitiesOperationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/cognitiveservices-entitysearch/package.json b/packages/@azure/cognitiveservices-entitysearch/package.json index e6b447818133..4913cb895b0f 100644 --- a/packages/@azure/cognitiveservices-entitysearch/package.json +++ b/packages/@azure/cognitiveservices-entitysearch/package.json @@ -4,7 +4,7 @@ "description": "EntitySearchAPIClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/cognitiveservices-entitysearch/rollup.config.js b/packages/@azure/cognitiveservices-entitysearch/rollup.config.js index 47e8ff0fbc67..3af51d58193c 100644 --- a/packages/@azure/cognitiveservices-entitysearch/rollup.config.js +++ b/packages/@azure/cognitiveservices-entitysearch/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/entitySearchAPIClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/cognitiveservices-entitysearch.js", format: "umd", name: "Azure.CognitiveservicesEntitysearch", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/cognitiveservices-entitysearch/tsconfig.json b/packages/@azure/cognitiveservices-entitysearch/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/cognitiveservices-entitysearch/tsconfig.json +++ b/packages/@azure/cognitiveservices-entitysearch/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }