diff --git a/packages/@azure/cognitiveservices-imagesearch/README.md b/packages/@azure/cognitiveservices-imagesearch/README.md index deff816584cb..5d72eeea80ac 100644 --- a/packages/@azure/cognitiveservices-imagesearch/README.md +++ b/packages/@azure/cognitiveservices-imagesearch/README.md @@ -1,33 +1,26 @@ -## An isomorphic javascript sdk for - ImageSearchAPIClient +# An isomorphic javascript sdk for - ImageSearchAPIClient +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 ImageSearchAPIClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install +## How to Install +- nodejs ``` npm install @azure/cognitiveservices-imagesearch ``` - -### How to use - -#### nodejs - Authentication, client creation and search images 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 images 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 { ImageSearchAPIClient, ImageSearchAPIModels, ImageSearchAPIMappers } from "@azure/cognitiveservices-imagesearch"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; @@ -70,17 +63,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -#### browser - Authentication, client creation and search images 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 images as an example written in javascript. - index.html ```html @@ -88,8 +71,8 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to @azure/cognitiveservices-imagesearch 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-imagesearch/lib/imageSearchAPIClient.ts b/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClient.ts index fbe090744716..c118b99a3cbf 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClient.ts +++ b/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClient.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-imagesearch/lib/imageSearchAPIClientContext.ts b/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClientContext.ts index 83563163ed01..6ec86d8c5ede 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClientContext.ts +++ b/packages/@azure/cognitiveservices-imagesearch/lib/imageSearchAPIClientContext.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-imagesearch"; diff --git a/packages/@azure/cognitiveservices-imagesearch/lib/models/index.ts b/packages/@azure/cognitiveservices-imagesearch/lib/models/index.ts index 3785f780510f..f8da5e05ab86 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/models/index.ts +++ b/packages/@azure/cognitiveservices-imagesearch/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"; /** @@ -1045,7 +1045,7 @@ export interface ImageObject { * of the number of websites where you can buy an apple pie. To indicate the * number of offers in your UX, include badging such as a shopping cart icon * that contains the count. When the user clicks on the icon, use - * imageInisghtsToken to get the list of websites. + * imageInsightsToken to get the list of websites. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ diff --git a/packages/@azure/cognitiveservices-imagesearch/lib/models/mappers.ts b/packages/@azure/cognitiveservices-imagesearch/lib/models/mappers.ts index bfafc3397541..ed37dc2ff159 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/models/mappers.ts +++ b/packages/@azure/cognitiveservices-imagesearch/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 ResponseBase: msRest.CompositeMapper = { @@ -108,6 +108,8 @@ export const Thing: msRest.CompositeMapper = { serializedName: "image", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } }, @@ -239,6 +241,8 @@ export const Offer: msRest.CompositeMapper = { serializedName: "seller", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Organization" } }, @@ -269,6 +273,8 @@ export const Offer: msRest.CompositeMapper = { serializedName: "aggregateRating", type: { name: "Composite", + polymorphicDiscriminator: PropertiesItem.type.polymorphicDiscriminator, + uberParent: "PropertiesItem", className: "AggregateRating" } }, @@ -300,6 +306,8 @@ export const AggregateOffer: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Offer" } } @@ -334,6 +342,8 @@ export const ImagesImageMetadata: msRest.CompositeMapper = { serializedName: "aggregateOffer", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "AggregateOffer" } } @@ -365,6 +375,8 @@ export const CreativeWork: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Thing" } } @@ -464,6 +476,8 @@ export const ImageObject: msRest.CompositeMapper = { serializedName: "thumbnail", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } }, @@ -546,6 +560,8 @@ export const Query: msRest.CompositeMapper = { serializedName: "thumbnail", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } @@ -640,6 +656,8 @@ export const Images: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } @@ -878,6 +896,8 @@ export const RelatedCollectionsModule: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageGallery" } } @@ -901,6 +921,8 @@ export const ImagesModule: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } @@ -981,6 +1003,8 @@ export const RecipesModule: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Recipe" } } @@ -1071,6 +1095,8 @@ export const RecognizedEntity: msRest.CompositeMapper = { serializedName: "entity", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "Thing" } }, @@ -1099,6 +1125,8 @@ export const RecognizedEntityRegion: msRest.CompositeMapper = { serializedName: "region", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "NormalizedRectangle" } }, @@ -1110,6 +1138,8 @@ export const RecognizedEntityRegion: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "RecognizedEntity" } } @@ -1133,6 +1163,8 @@ export const RecognizedEntityGroup: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "RecognizedEntityRegion" } } @@ -1265,6 +1297,8 @@ export const ImageInsights: msRest.CompositeMapper = { serializedName: "shoppingSources", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "AggregateOffer" } }, @@ -1339,6 +1373,8 @@ export const TrendingImagesTile: msRest.CompositeMapper = { serializedName: "image", type: { name: "Composite", + polymorphicDiscriminator: ResponseBase.type.polymorphicDiscriminator, + uberParent: "ResponseBase", className: "ImageObject" } } diff --git a/packages/@azure/cognitiveservices-imagesearch/lib/models/parameters.ts b/packages/@azure/cognitiveservices-imagesearch/lib/models/parameters.ts index b88d27e03088..7f45503aa21c 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/models/parameters.ts +++ b/packages/@azure/cognitiveservices-imagesearch/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-imagesearch/lib/operations/imagesOperations.ts b/packages/@azure/cognitiveservices-imagesearch/lib/operations/imagesOperations.ts index 2b671ecd8999..3508d9b0bbd7 100644 --- a/packages/@azure/cognitiveservices-imagesearch/lib/operations/imagesOperations.ts +++ b/packages/@azure/cognitiveservices-imagesearch/lib/operations/imagesOperations.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/imagesOperationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/cognitiveservices-imagesearch/package.json b/packages/@azure/cognitiveservices-imagesearch/package.json index cc643e27049a..6d7bce36adfc 100644 --- a/packages/@azure/cognitiveservices-imagesearch/package.json +++ b/packages/@azure/cognitiveservices-imagesearch/package.json @@ -4,7 +4,7 @@ "description": "ImageSearchAPIClient 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-imagesearch/rollup.config.js b/packages/@azure/cognitiveservices-imagesearch/rollup.config.js index 1af0495d0a02..2f945ecc8c53 100644 --- a/packages/@azure/cognitiveservices-imagesearch/rollup.config.js +++ b/packages/@azure/cognitiveservices-imagesearch/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/imageSearchAPIClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/cognitiveservices-imagesearch.js", format: "umd", name: "Azure.CognitiveservicesImagesearch", 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-imagesearch/tsconfig.json b/packages/@azure/cognitiveservices-imagesearch/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/cognitiveservices-imagesearch/tsconfig.json +++ b/packages/@azure/cognitiveservices-imagesearch/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }