fixed issues with Typescript typings definition -> Issue #2

Author: adonis0302

.idea/libraries/Generated_files.xml

@@ -143,18 +143,7 @@ module.exports = function (grunt) {
               }
           },
           typings:{
-              src: ['src/validation/Validation.ts','src/validation/Utils.ts','src/validation/FormSchema.ts'],
-              dest: 'typings/<%= pkg.name %>',
-              options: {
-                  basePath: 'src/validation',
-                  module: 'commonjs',
-                  target: 'es5',
-                  declaration: true,
-                  comments:false
-              }
-          },
-          otherTypings: {
-              src: ['src/validation/BasicValidators.ts'],
+              src: ['src/validation/*.ts'],
               dest: 'typings/<%= pkg.name %>',
               options: {
                   basePath: 'src/validation',
@@ -243,29 +232,22 @@ module.exports = function (grunt) {
                   banner: '// Type definitions for <%= pkg.name %> - v<%= pkg.version %>\n' +
                       '// Project: https://github.com/rsamec/form\n' +
                       '// Definitions by: Roman Samec <https://github.com/rsamec>\n' +
-                      '// Definitions: https://github.com/borisyankov/DefinitelyTyped\n\n',
+                      '// Definitions: https://github.com/borisyankov/DefinitelyTyped\n\n' +
+                        '\n' +
+                        '/// <reference path="../../typings/q/Q.d.ts" />\n' +
+                        '/// <reference path="../../typings/underscore/underscore.d.ts" />\n' +
+                        '/// <reference path="../../typings/hashmap/hashmap.d.ts" />\n' +
+                        '/// <reference path="../../typings/node/node.d.ts" />\n',
+                  footer:'declare module "business-rule-engine" {export = Validation;}',
                   process: function(src, filepath) {
                       return '// Source: ' + filepath + '\n' +
-                          src.replace(/[ \t]*export = (\w*);?/g, 'declare module "business-rule-engine" {export = $1;}');
+                          src.replace(/.*<reference path=.*/g, '')//remove references
+                              .replace(/export.*/g, '')//remove exports
+                              .replace(/import.*/g, '');//  + //remove imports
                   }
               },
               files: {
-                  'typings/<%= pkg.name %>/<%= pkg.name %>.d.ts': ['typings/<%= pkg.name %>/Validation.d.ts']
-              }
-          },
-          otherTypings:{
-
-              options:{
-                  process: function(src, filepath) {
-                      return '// Source: ' + filepath + '\n' +
-                          src.replace(/[ \t]*export = (\w*);?/g, 'declare module "node-$1" {export = $1;}');
-                  }
-              },
-              files: {
-                  'typings/<%= pkg.name %>/BasicValidators.d.ts': ['typings/<%= pkg.name %>/BasicValidators.d.ts'],
-                  'typings/<%= pkg.name %>/Utils.d.ts': ['typings/<%= pkg.name %>/Utils.d.ts'],
-                  'typings/<%= pkg.name %>/FormSchema.d.ts': ['typings/<%= pkg.name %>/FormSchema.d.ts']
-
+                  'typings/<%= pkg.name %>/<%= pkg.name %>.d.ts': ['typings/<%= pkg.name %>/Utils.d.ts','typings/<%= pkg.name %>/Validation.d.ts','typings/<%= pkg.name %>/BasicValidators.d.ts','typings/<%= pkg.name %>/FormSchema.d.ts']
               }
           }
       }
@@ -286,8 +268,8 @@ module.exports = function (grunt) {
 
 
   grunt.registerTask('test', ['typescript:src','typescript:test', 'mochacli', 'watch']);
-  grunt.registerTask('ci', ['complexity', 'jshint', 'mochacli']);
+  //grunt.registerTask('ci', ['complexity', 'jshint', 'mochacli']);
   grunt.registerTask('dist', ['typescript:commonjs','typescript:amd','typescript:customValidatorsCommonjs','typescript:customValidatorsAmd','typescript:localCommonjs','typescript:localAmd','copy','concat:module','uglify:dist']);
-  grunt.registerTask('typings',['typescript:typings','concat:typings','typescript:otherTypings','concat:otherTypings']);
+  grunt.registerTask('typings',['typescript:typings','concat:typings']);
   grunt.registerTask('document', ['typedoc']);
 };

Gruntfile.js

@@ -1,7 +1,7 @@
 {
   "name": "business-rules-engine",
   "main": "dist/module/Validation.js",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "homepage": "https://github.com/rsamec/business-rules-engine",
   "authors": [
     "rsamec <[email protected]>"

bower.json

@@ -1,4 +1,4 @@
-/*! business-rules-engine, v.1.2.5 05-12-2014 */
+/*! business-rules-engine, v.1.2.5 06-12-2014 */
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

dist/business-rules-engine.js

@@ -1,6 +1,6 @@
 {
   "name": "business-rules-engine",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "business rules engine",
   "main": "./commonjs/Validation",
   "repository": {

dist/business-rules-engine.min.js

@@ -1,6 +1,6 @@
 {
   "name": "business-rules-engine",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "business rules engine",
   "main": "src/validation",
   "scripts": {

dist/package.json

@@ -4,6 +4,7 @@
 import moment = require("moment");
 import _ = require("underscore");
 
+
  /**
  * @ngdoc object
  * @name DateCompareValidator

package.json

@@ -1,12 +1,12 @@
 ///<reference path='../../typings/underscore/underscore.d.ts'/>
 ///<reference path='../../typings/q/Q.d.ts'/>
 ///<reference path='../../typings/node/node.d.ts'/>
-///<reference path='../../typings/business-rules-engine/business-rules-engine.d.ts'/>
+///<reference path='../../typings/business-rules-engine/Validation.d.ts'/>
 
 
 import Q = require("q");
 import _ = require("underscore");
-
+import Validation = require("./Validation");
 
 /**
  * Basic validation rules that enables to validate an value against common constraints.

src/customValidators/DateCompareValidator.ts

@@ -1,7 +1,7 @@
 ///<reference path='../../typings/q/Q.d.ts'/>
 ///<reference path='../../typings/underscore/underscore.d.ts'/>
 ///<reference path='../../typings/node/node.d.ts'/>
-///<reference path='../../typings/business-rules-engine/business-rules-engine.d.ts'/>
+///<reference path='../../typings/business-rules-engine/Validation.d.ts'/>
 
 import _ = require('underscore');
 import Q = require('q');

src/validation/BasicValidators.ts

@@ -1,7 +1,7 @@
 ///<reference path='../../typings/mocha/mocha.d.ts'/>
 ///<reference path='../../typings/node/node.d.ts'/>
 ///<reference path='../../typings/underscore/underscore.d.ts'/>
-///<reference path='../../typings/q/q.d.ts'/>
+///<reference path='../../typings/Q/q.d.ts'/>
 
 
 var Validation = require('../../src/validation/Validation.js');