vstack-typescript-generator - npm Package Compare versions

Comparing version 0.1.5 to 0.1.6

dist/src/c-sharp-parser.js

@@ -34,4 +34,4 @@ "use strict";
     CSharpParser.stripComments = function (input) {
-        var blockCommentRegex = new RegExp('/\\*([\\s\\S]*)\\*/', 'gm');
-        var lineCommentRegex = new RegExp('//(.*)', 'g');
+        var blockCommentRegex = /\/\*([\s\S]*?)\*\//gm;
+        var lineCommentRegex = /\/\/(.*)/g;
         return input
@@ -78,9 +78,11 @@ .replace(blockCommentRegex, '')
         var entryMatch;
-        var entryRegex = /([^\s,]+)\s*=?\s*(\d+)?,?/gm;
+        var entryRegex = /^\s*([\w\d_]+)\s*=?\s*([0-9A-Fx]+)?,?\s*$/gm;
         var getNextEntryMatch = function () { return entryMatch = entryRegex.exec(body); };
         while (getNextEntryMatch() !== null) {
             var entryName = entryMatch[1];
-            var entryValue = parseInt(entryMatch[2], 10);
+            var entryValue = entryMatch[2];
+            var radix = /^[0-9]+$/.test(entryValue) ? 10 : 16;
+            var entryValueParsed = parseInt(entryValue, radix);
             if (entryName.indexOf('[') === -1) {
-                entries.push(new c_sharp_objects_1.CSharpEnumEntry(entryName, entryValue));
+                entries.push(new c_sharp_objects_1.CSharpEnumEntry(entryName, entryValueParsed));
             }
@@ -87,0 +89,0 @@ }

dist/src/utility.js

@@ -15,5 +15,8 @@ "use strict";
         }
-        else if (['int', 'short', 'decimal', 'double', 'float', 'byte', 'Int32', 'Int64', 'Byte'].indexOf(csType) !== -1) {
+        else if (['byte', 'short', 'int', 'long', 'float', 'double', 'decimal'].indexOf(csType) !== -1) {
             return 'number';
         }
+        else if (['Byte', 'Int16', 'Int32', 'Int64', 'Single', 'Double', 'Decimal'].indexOf(csType) !== -1) {
+            return 'number';
+        }
         else if (csType === 'DateTime') {
@@ -20,0 +23,0 @@ return options && options.dateTimeToDate ? 'Date' : 'string';

package.json

 {
   "name": "vstack-typescript-generator",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
@@ -9,6 +9,6 @@ "main": "dist/src/index.js",
     "minor-release": "npm version minor && npm publish && git push --follow-tags",
-    "clean": "rimraf dist & rimraf bundles",
+    "clean": "rimraf dist & rimraf coverage",
     "lint": "tslint \"src/**/*.ts\"",
     "build": "npm run clean & tsc -p tsconfig.json",
-    "test": "istanbul cover node_modules/jasmine/bin/jasmine.js && npm run remap-coverage",
+    "test": "istanbul cover node_modules/jasmine/bin/jasmine.js",
     "remap-coverage": "npm run remap-coverage-json & npm run remap-coverage-html",
@@ -15,0 +15,0 @@ "remap-coverage-json": "remap-istanbul -i coverage/coverage.json -o coverage/coverage-remapped.json",

No alert changes

Improved metrics

Total package byte prevSize

35094

increased by1.29%

Lines of code

426

increased by1.19%

No dependency changes