Merge pull request watson-developer-cloud#652 from watson-developer-cloud/next

fix(Prettier,tslint): Regeneration of services and tslint support (watson-developer-cloud#638)

Author: germanattanasio

.gitignore

@@ -33,4 +33,5 @@ index.js
 **/*.d.ts
 !*/blob.d.ts
 **/*.js.map
-coverage.lcov
+coverage.lcov
+.swagger-codegen-ignore

.jshintrc

@@ -0,0 +1,8 @@
+{
+  "useTabs": false,
+  "printWidth": 100,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "parser": "babylon"
+}

.prettierrc

@@ -5,12 +5,13 @@ node_js:
 - 6
 - stable
 before_install:
+- openssl aes-256-cbc -K $encrypted_e4ebf4573484_key -iv $encrypted_e4ebf4573484_iv
+  -in auth.js.enc -out test/resources/auth.js -d
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_e4ebf4573484_key
-  -iv $encrypted_e4ebf4573484 -in auth.js.enc -out test/resources/auth.js -d ||
-  true'
+  -iv $encrypted_e4ebf4573484 -in auth.js.enc -out test/resources/auth.js -d || true'
 - npm install -g typescript
 script:
-- tsc # use the tsconfig.json to transpile specified service-files
+- tsc
 - npm test
 - sh scripts/typedoc/generate_typedoc.sh
 after_success:

.travis.yml

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { createRequest } from '../lib/requestwrapper';
-import { BaseService } from '../lib/base_service';
 import url = require('url');
+import { BaseService } from '../lib/base_service';
+import { createRequest } from '../lib/requestwrapper';
 
 class AuthorizationV1 extends BaseService {
+  static URL: string = 'https://stream.watsonplatform.net/authorization/api';
   name;
   serviceVersion;
-  static URL: string = 'https://stream.watsonplatform.net/authorization/api';
 
   /**
    * Authorization Service

auth.js.enc

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import GeneratedConversationV1 = require('./v1-generated');
 import extend = require('extend');
 import { getMissingParams } from '../lib/helper';
 import { createRequest } from '../lib/requestwrapper';
+import GeneratedConversationV1 = require('./v1-generated');
 
 class ConversationV1 extends GeneratedConversationV1 {
   static VERSION_DATE_2017_05_26: string = '2017-05-26';
@@ -30,17 +30,17 @@ class ConversationV1 extends GeneratedConversationV1 {
 
   static VERSION_DATE_2016_07_11: string = '2016-07-11';
 
+  private static removedError: Error = new Error(
+    'This endpoint has been deprecated.'
+  );
+
   constructor(options) {
     // For backward compatibility, allow version to be passed in version_date.
     const _options = extend({}, options);
     _options.version = _options.version_date || _options.version;
     super(_options);
   }
 
-  private static removedError: Error = new Error(
-    'This endpoint has been deprecated.'
-  );
-
   workspaceStatus(params, callback) {
     console.warn(ConversationV1.removedError);
   }
@@ -62,7 +62,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'old_intent', 'intent'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateIntentParams = {
       workspace_id: params.workspace_id,
@@ -86,7 +86,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'intent', 'old_text', 'text'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateExampleParams = {
       workspace_id: params.workspace_id,
@@ -121,7 +121,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'old_text', 'text'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateCounterexampleParams = {
       workspace_id: params.workspace_id,
@@ -151,7 +151,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'old_entity', 'entity'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateEntityParams = {
       workspace_id: params.workspace_id,
@@ -185,7 +185,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'entity', 'old_value', 'value'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateValueParams = {
       workspace_id: params.workspace_id,
@@ -218,7 +218,7 @@ class ConversationV1 extends GeneratedConversationV1 {
       'synonym'
     ];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateSynonymParams = {
       workspace_id: params.workspace_id,
@@ -236,7 +236,7 @@ class ConversationV1 extends GeneratedConversationV1 {
   }
 
   createDialogNode(params, callback) {
-    let _params = extend({}, params);
+    const _params = extend({}, params);
     if (params && params.type && !_params.node_type) {
       _params.node_type = params.type;
     }
@@ -271,7 +271,7 @@ class ConversationV1 extends GeneratedConversationV1 {
 
     const requiredParams = ['workspace_id', 'old_dialog_node', 'dialog_node'];
     const missingParams = getMissingParams(params, requiredParams);
-    if (missingParams) return callback(missingParams);
+    if (missingParams) { return callback(missingParams); }
 
     const _params: GeneratedConversationV1.UpdateDialogNodeParams = {
       workspace_id: params.workspace_id,

authorization/v1.ts

@@ -15,13 +15,13 @@
  */
 
 import extend = require('extend');
-import pick = require('object.pick');
-import omit = require('object.omit');
 import isStream = require('isstream');
+import omit = require('object.omit');
+import pick = require('object.pick');
 import { RequestResponse } from 'request';
-import { createRequest } from '../lib/requestwrapper';
 import { BaseService } from '../lib/base_service';
 import { FileObject } from '../lib/helper';
+import { createRequest } from '../lib/requestwrapper';
 
 class DialogV1 extends BaseService {
   static URL: string = 'https://gateway.watsonplatform.net/dialog/api';
@@ -301,7 +301,7 @@ DialogV1.prototype.name = 'dialog';
 DialogV1.prototype.serviceVersion = 'v1';
 
 namespace DialogV1 {
-  /** Options for the `DialogV1` constructor. **/
+  /** Options for the `DialogV1` constructor. */
   export type Options = {
     url?: string;
     username?: string;
@@ -310,82 +310,82 @@ namespace DialogV1 {
     headers?: object;
   };
 
-  /** The callback for a service request. **/
+  /** The callback for a service request. */
   export type Callback = (
     error: any,
     body?: any,
     response?: RequestResponse
   ) => void;
 
   export interface UpdateDialogParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
-    /** The dialog template file. Valid file extensions are .mct for encrypeed dialog files, .json and .xml. **/
+    /** The dialog template file. Valid file extensions are .mct for encrypeed dialog files, .json and .xml.  */
     file: FileObject;
   }
 
   export interface UpdateContentParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
     [key: string]: any;
   }
 
   export interface GetContentParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
     [key: string]: any;
   }
 
   export interface GetDialogsParams {}
 
   export interface CreateDialogParams {
-    /** The dialog template name. **/
+    /** The dialog template name.  */
     name: string;
-    /** The dialog template file. Valid file extensions are .mct for encrypeed dialog files, .json and .xml. **/
+    /** The dialog template file. Valid file extensions are .mct for encrypeed dialog files, .json and .xml.  */
     file: FileObject;
   }
 
   export interface DeleteDialogParams {
-    /** The dialog identifier. **/
+    /** The dialog identifier.  */
     id: string;
   }
 
   export interface ConversationParams {
-    /** The dialog template indentifier. **/
+    /** The dialog template indentifier.  */
     dialog_id: string;
-    /** A generated conversation identifier number. If it is not specified, a new conversation is started. **/
+    /** A generated conversation identifier number. If it is not specified, a new conversation is started.  */
     conversation_id: string;
-    /** A generated client identifier number. If it is not specified, a new client identifier is issued. **/
+    /** A generated client identifier number. If it is not specified, a new client identifier is issued.  */
     client_id: string;
-    /** The user input to be processed. If the conversation_id parameter is blank, this parameter is optional. **/
+    /** The user input to be processed. If the conversation_id parameter is blank, this parameter is optional.  */
     input: string;
   }
 
   export interface GetConversationParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
-    /** The start of the range in YYYY-MM-DD HH:MM:SS format. **/
+    /** The start of the range in YYYY-MM-DD HH:MM:SS format.  */
     date_from: string;
-    /** The end of the range in YYYY-MM-DD HH:MM:SS format. **/
+    /** The end of the range in YYYY-MM-DD HH:MM:SS format.  */
     date_to: string;
-    /** The offset starting point in the conversation result list. The default value is 0. **/
+    /** The offset starting point in the conversation result list. The default value is 0.  */
     offset: number;
-    /** The maximum number of conversations to retrieve. The default value is 10000. **/
+    /** The maximum number of conversations to retrieve. The default value is 10000.  */
     limit: number;
   }
 
   export interface GetProfileParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
-    /** A client ID obtained from /dialog. **/
+    /** A client ID obtained from /dialog.  */
     client_id: string;
-    name: string | Array<string>;
+    name: string | string[];
   }
 
   export interface UpdateProfileParams {
-    /** The dialog template identifier. **/
+    /** The dialog template identifier.  */
     dialog_id: string;
-    /** A client ID obtained from /dialog. **/
+    /** A client ID obtained from /dialog.  */
     client_id: string;
     name_values: string;
   }