Skip to content
This repository was archived by the owner on Sep 18, 2020. It is now read-only.

Commit 30b9a37

Browse files
committed
moved utils back out
1 parent f241c9a commit 30b9a37

File tree

10 files changed

+10
-168
lines changed

10 files changed

+10
-168
lines changed

src/core/base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {getMailBox} from 'escalate';
33
import config from './../config';
44
import {setManager, isDirtyable, DirtyableYielder, AtomYielder, LifeCycleManager} from './lifecycle';
55
import {Any} from './../data-types/any';
6-
import {getPrimeType, generateClassId} from './utils';
6+
import {getPrimeType, generateClassId} from '../utils';
77
import {validateValue, validateNullValue} from './validation';
88
import {isDataMatching} from './type-match';
99
import {

src/core/utils.ts

Lines changed: 0 additions & 158 deletions
This file was deleted.

src/core/validation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as _ from 'lodash';
2-
import {getReadableValueTypeName} from './utils';
2+
import {getReadableValueTypeName} from '../utils';
33
import {ErrorContext, Type, isNonPrimitiveType} from "../types";
44

55
export function misMatchMessage(errorContext:ErrorContext, expected:{id:string}|string, actual:any, overridepath?:string|null, template?:string) {

src/data-types/any.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as _ from 'lodash';
22
import {getMailBox} from 'escalate';
3-
import {cloneType, getReadableValueTypeName, defaultClassOptions} from './../core/utils';
3+
import {cloneType, getReadableValueTypeName, defaultClassOptions} from './../utils';
44
import {TypeMatch} from './../core/type-match';
55
import {
66
ErrorMessage, ErrorContext, ErrorDetails, Validator,

src/data-types/define-enum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as _ from 'lodash';
22
import {getMailBox} from 'escalate';
3-
import {inherit, getPrimeType} from './../core/utils';
3+
import {inherit, getPrimeType} from './../utils';
44
import {Any} from './any';
55

66
const MAILBOX = getMailBox('mutable.defineEnum');

src/data-types/es5-map.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as _ from 'lodash';
22
import {getMailBox} from 'escalate';
33

4-
import {getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from './../core/utils';
4+
import {getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from './../utils';
55
import {MuBase, defineNonPrimitive} from './../core/base';
66
import * as generics from './../core/generic-types';
77
import {validateValue, validateNullValue, misMatchMessage, arrow} from './../core/validation';
88
import {validateAndWrap} from './../core/type-match';
99
import {MapWrapperOverDictionary} from './map-wrapper';
1010
import {observable, untracked, extras, autorun} from 'mobx';
11-
import {shouldAssign} from './../core/utils';
11+
import {shouldAssign} from './../utils';
1212
const MAILBOX = getMailBox('mutable.Es5Map');
1313

1414
function entries(map){

src/data-types/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {getMailBox} from 'escalate';
33
import {ArrayWrapper} from './array-wrapper';
44
import {validateNullValue, misMatchMessage} from './../core/validation';
55
import {validateAndWrap} from './../core/type-match';
6-
import {clone, shouldAssign, getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from './../core/utils';
6+
import {clone, shouldAssign, getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from './../utils';
77
import {MuBase, defineNonPrimitive} from './../core/base';
88
import * as generics from './../core/generic-types';
99
import {observable, asFlat, untracked, extras} from 'mobx';

src/objects/define.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Type, isNonPrimitiveType, ReferenceType} from '../types';
22
import {getMailBox} from 'escalate';
3-
import {inherit, getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from '../core/utils';
3+
import {inherit, getValueFromRootRef, getReferenceWrapper, reportFieldDefinitionError} from '../utils';
44
import {forEach, extend, clone} from 'lodash';
55
import {misMatchMessage} from '../core/validation';
66
import {MuObject} from "./object";

src/objects/object.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Mutable
66
} from "../types";
77
import {getMailBox} from "escalate";
8-
import {shouldAssign, getPrimeType} from "../core/utils";
8+
import {shouldAssign, getPrimeType} from "../utils";
99
import {validateNullValue, isAssignableFrom, misMatchMessage} from "../core/validation";
1010
import {validateAndWrap} from "../core/type-match";
1111
import {optionalSetManager, DirtyableYielder, AtomYielder} from "../core/lifecycle";

test/utils.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as sinon from 'sinon';
22
import {expect} from 'chai';
33

4-
import {cloneType} from '../src/core/utils';
4+
import {cloneType} from '../src/utils';
55
import {isAssignableFrom} from '../src/core/validation';
66

77
describe('utils', function() {

0 commit comments

Comments
 (0)