From 4d9df6aae2789c141ae8a8fca41918039cecf815 Mon Sep 17 00:00:00 2001 From: Cyril Gandon Date: Tue, 11 Oct 2016 08:58:52 +0200 Subject: [PATCH] Fix the grunt task --- Nimrod/TypeScriptType.cs | 2 +- Nimrod/Writers/ControllerToTypeScript.cs | 2 -- grunt-nimrod/package.json | 2 +- grunt-nimrod/src/nimrod.ts | 3 +-- grunt-nimrod/tasks/nimrod.d.ts | 1 - grunt-nimrod/tasks/nimrod.js | 2 +- grunt-nimrod/tasks/nimrod.js.map | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Nimrod/TypeScriptType.cs b/Nimrod/TypeScriptType.cs index 9262165..d6ccff3 100644 --- a/Nimrod/TypeScriptType.cs +++ b/Nimrod/TypeScriptType.cs @@ -58,7 +58,7 @@ public string ToString(Predicate includeNamespace, bool includeGenericArgu var genericArguments = this.Type.GetGenericArguments(); if (this.Type.FullName != null && this.Type.FullName.Contains("System.Nullable") && genericArguments.Length == 1) { - result = $"{genericArguments[0].ToTypeScript().ToString(includeNamespace)}{(strictNullCheck ? strictNullCheckString : "")}"; + result = $"{genericArguments[0].ToTypeScript().ToString(includeNamespace)}{strictNullCheckString}"; } else { diff --git a/Nimrod/Writers/ControllerToTypeScript.cs b/Nimrod/Writers/ControllerToTypeScript.cs index 5abd59a..fc6e0dd 100644 --- a/Nimrod/Writers/ControllerToTypeScript.cs +++ b/Nimrod/Writers/ControllerToTypeScript.cs @@ -47,8 +47,6 @@ public override IEnumerable GetLines() .Select(p => $"{p.Name}: {p.Name}") .Join($",{Environment.NewLine}"); - - bool isGetOrDelete = httpVerb == HttpMethodAttribute.Get || httpVerb == HttpMethodAttribute.Delete; var paramsBody = isGetOrDelete ? diff --git a/grunt-nimrod/package.json b/grunt-nimrod/package.json index cebe802..3ea909c 100644 --- a/grunt-nimrod/package.json +++ b/grunt-nimrod/package.json @@ -1,7 +1,7 @@ { "name": "grunt-nimrod", "description": "An .NET Controller to TypeScript Converter", - "version": "0.3.1", + "version": "0.4.0", "homepage": "https://github.com/resgroup/nimrod", "contributors": [ { diff --git a/grunt-nimrod/src/nimrod.ts b/grunt-nimrod/src/nimrod.ts index 32b3046..08ac747 100644 --- a/grunt-nimrod/src/nimrod.ts +++ b/grunt-nimrod/src/nimrod.ts @@ -10,7 +10,6 @@ import * as child from 'child_process'; export interface IGruntNimrodOptions { exe?: string; verbose?: boolean; - module?: string; output?: string; strictNullCheck?: boolean; files?: string[]; @@ -36,7 +35,7 @@ module.exports = function (grunt: IGrunt) { let pathExe = options.exe || __dirname + '\\Nimrod.Console\\bin\\Release\\Nimrod.Console.exe'; - let cmd = pathExe + ' -m ' + options.module + ' -o ' + options.output + ' --files=' + options.files.join(',') + verbose + strictNullCheck; + let cmd = pathExe + ' -o ' + options.output + ' --files=' + options.files.join(',') + verbose + strictNullCheck; if (options.verbose) { grunt.log.write('Executing command : ' + cmd); } diff --git a/grunt-nimrod/tasks/nimrod.d.ts b/grunt-nimrod/tasks/nimrod.d.ts index 8f92f4e..433feed 100644 --- a/grunt-nimrod/tasks/nimrod.d.ts +++ b/grunt-nimrod/tasks/nimrod.d.ts @@ -1,7 +1,6 @@ export interface IGruntNimrodOptions { exe?: string; verbose?: boolean; - module?: string; output?: string; strictNullCheck?: boolean; files?: string[]; diff --git a/grunt-nimrod/tasks/nimrod.js b/grunt-nimrod/tasks/nimrod.js index ea91ef9..a3c4480 100644 --- a/grunt-nimrod/tasks/nimrod.js +++ b/grunt-nimrod/tasks/nimrod.js @@ -14,7 +14,7 @@ module.exports = function (grunt) { strictNullCheck = ' --strictNullCheck'; } var pathExe = options.exe || __dirname + '\\Nimrod.Console\\bin\\Release\\Nimrod.Console.exe'; - var cmd = pathExe + ' -m ' + options.module + ' -o ' + options.output + ' --files=' + options.files.join(',') + verbose + strictNullCheck; + var cmd = pathExe + ' -o ' + options.output + ' --files=' + options.files.join(',') + verbose + strictNullCheck; if (options.verbose) { grunt.log.write('Executing command : ' + cmd); } diff --git a/grunt-nimrod/tasks/nimrod.js.map b/grunt-nimrod/tasks/nimrod.js.map index 01e2cad..74e76e1 100644 --- a/grunt-nimrod/tasks/nimrod.js.map +++ b/grunt-nimrod/tasks/nimrod.js.map @@ -1 +1 @@ -{"version":3,"file":"nimrod.js","sourceRoot":"","sources":["../src/nimrod.ts"],"names":[],"mappings":";AAOA,IAAY,KAAK,WAAM,eAAe,CAAC,CAAA;AAWvC,MAAM,CAAC,OAAO,GAAG,UAAU,KAAa;IACpC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,wCAAwC,EAAE;QAExE,IAAI,IAAI,GAAG,IAAwB,CAAC;QACpC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAExB,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAsB,EAAE,CAAC,CAAC;QAEpD,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;YAC3B,OAAO,GAAG,YAAY,CAAC;QAC3B,CAAC;QAED,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC;YACnC,eAAe,GAAG,oBAAoB,CAAC;QAC3C,CAAC;QAED,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,SAAS,GAAG,oDAAoD,CAAC;QAE9F,IAAI,GAAG,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,eAAe,CAAC;QAC1I,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YACrC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YACrC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAU;YAChC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YAC9B,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;YAC7C,IAAI,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"nimrod.js","sourceRoot":"","sources":["../src/nimrod.ts"],"names":[],"mappings":";AAOA,IAAY,KAAK,WAAM,eAAe,CAAC,CAAA;AAUvC,MAAM,CAAC,OAAO,GAAG,UAAU,KAAa;IACpC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,wCAAwC,EAAE;QAExE,IAAI,IAAI,GAAG,IAAwB,CAAC;QACpC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAExB,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAsB,EAAE,CAAC,CAAC;QAEpD,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;YAC3B,OAAO,GAAG,YAAY,CAAC;QAC3B,CAAC;QAED,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC;YACnC,eAAe,GAAG,oBAAoB,CAAC;QAC3C,CAAC;QAED,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,SAAS,GAAG,oDAAoD,CAAC;QAE9F,IAAI,GAAG,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,eAAe,CAAC;QAChH,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YACrC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YACrC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,KAAU;YAChC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAS;YAC9B,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;YAC7C,IAAI,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"} \ No newline at end of file