Added jest tests

Author: Vlad Balin

dist/index.js

@@ -1,3 +1,2 @@
-import { ChainableAttributeSpec } from 'type-r';
 export declare function isEmail(x: string): boolean;
-export declare const Email: ChainableAttributeSpec;
+export declare const Email: import("../../lib/record/attributes/attrDef").ChainableAttributeSpec;

dist/index.js.map

@@ -12,7 +12,8 @@
       "experimentalDecorators": true,
       "baseUrl": ".",
       "paths" : {
-        "type-r":[ "../lib" ]
+        "type-r":[ "../lib" ],
+        "type-r/ext-types":[ "../lib" ]
       }
     },
     "files":[

ext-types/dist/index.js.map

@@ -1,12 +1,20 @@
+import { Integer } from "type-r/ext-types";
 import { ChainableAttributeSpec } from "type-r";
 declare global {
+    interface Function {
+        value: (x: any) => ChainableAttributeSpec;
+        isRequired: ChainableAttributeSpec;
+        asProp: PropertyDecorator;
+        has: ChainableAttributeSpec;
+    }
     interface DateConstructor {
         microsoft: ChainableAttributeSpec;
         timestamp: ChainableAttributeSpec;
     }
-}
-declare global {
     interface Window {
         Integer: Function;
     }
+    interface NumberConstructor {
+        integer: typeof Integer;
+    }
 }

ext-types/lib/email.d.ts

@@ -1,16 +1,57 @@
-import { Integer, MicrosoftDate, Timestamp } from "ext-types";
-import { ChainableAttributeSpec } from "type-r";
+import { Integer, MicrosoftDate, Timestamp } from "type-r/ext-types";
+import { type, ChainableAttributeSpec } from "type-r";
 
 /*
  * dates
  */
 declare global {
+    // Legacy has-notation
+    interface Function{
+        value : ( x : any ) => ChainableAttributeSpec;
+        isRequired : ChainableAttributeSpec;
+        asProp : PropertyDecorator
+        has : ChainableAttributeSpec;
+    }
+
+    // Date type extensions
     interface DateConstructor {
         microsoft : ChainableAttributeSpec
         timestamp : ChainableAttributeSpec
     }
+
+    // Integer type
+    interface Window {
+        Integer : Function;
+    }
+
+    interface NumberConstructor {
+        integer : typeof Integer
+    }
 }
 
+Function.prototype.value = function( x ) {
+    return new ChainableAttributeSpec( { type : this, value : x, hasCustomDefault : true } );
+};
+
+Object.defineProperty( Function.prototype, 'isRequired', {
+    get() { return this._isRequired || this.has.isRequired; },
+    set( x ){ this._isRequired = x; }
+});
+
+Object.defineProperty( Function.prototype, 'asProp', {
+    get() { return this.has.asProp; },
+});
+
+Object.defineProperty( Function.prototype, 'has', {
+    get() {
+        // workaround for sinon.js and other libraries overriding 'has'
+        return this._has || type( this );
+    },
+
+    set( value ) { this._has = value; }
+} );
+
+
 Object.defineProperties( Date, {
     microsoft: {
         value: MicrosoftDate
@@ -25,13 +66,8 @@ Object.defineProperties( Date, {
 /*
  * integer
  */
-declare global {
-    interface Window {
-        Integer : Function;
-    }
-}
 
-(Number as any).integer = Integer;
+Number.integer = Integer;
 
 if( typeof window !== 'undefined' ) {
     window.Integer = Integer;

ext-types/lib/email.js.map

@@ -13,7 +13,7 @@
       "baseUrl": ".",
       "paths" : {
         "type-r":[ "../lib" ],
-        "ext-types": ["../ext-types/lib"]
+        "type-r/ext-types": ["../ext-types/lib"]
       }
     },
     "files":[

ext-types/lib/integer.js.map

@@ -0,0 +1,25 @@
+module.exports = {
+    testEnvironment: 'node',
+    transform: {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    moduleFileExtensions: [
+      "ts",
+      "tsx",
+      "js",
+      "jsx",
+      "json",
+      "node",
+    ],
+    testRegex: '/tests/.+\\.(test|spec)\\.(ts|js)x?$',
+    coverageDirectory: 'coverage',
+    collectCoverageFrom: [
+      'src/**/*.{ts,tsx,js,jsx}',
+      '!src/**/*.d.ts',
+    ],
+    globals: {
+      'ts-jest': {
+        tsConfig: 'tests/tsconfig.json'
+      }
+    }
+  };

ext-types/lib/url.js.map

@@ -1,19 +1,13 @@
-declare global {
-    interface ObjectConstructor {
-        setPrototypeOf(target: Object, proto: Object): any;
-    }
-}
-export * from './object-plus';
+import { Mixable as Class } from './object-plus/';
+import { ChainableAttributeSpec, Record as Model } from './record';
 export * from './collection';
-export * from './relations';
+export * from './io-tools';
+export * from './object-plus';
 export * from './record';
+export * from './relations';
 export * from './transactions';
-export * from './io-tools';
-export declare const on: any, off: any, trigger: any, once: any, listenTo: any, stopListening: any, listenToOnce: any;
-import { Record as Model } from './record';
-import { Mixable as Class } from './object-plus/';
 export { Model, Class };
+export declare const on: any, off: any, trigger: any, once: any, listenTo: any, stopListening: any, listenToOnce: any;
 export declare function attributes(attrDefs: any): typeof Model;
-import { ChainableAttributeSpec } from './record';
 export declare function value(x: any): ChainableAttributeSpec;
 export declare function transaction<F extends Function>(method: F): F;

ext-types/tsconfig.json

@@ -10,5 +10,5 @@ export declare class Logger extends Messenger {
         [name in LogLevel]: LoggerEventHandler;
     } | LogLevel, handler?: LoggerEventHandler) => this;
 }
-export declare const logRouter: Logger;
-export declare const log: typeof logRouter.trigger;
+export declare const logger: Logger;
+export declare const log: typeof logger.trigger;