feat(lodash): remove lodash-es

michaelwittwer · michaelwittwer · commit 79216b701c6d · 2018-09-10T18:22:31.000+02:00
lodash-es has a problem when using without a bundler which understands es2015 modules, so basically in pure node implementation with cjs modules, (import / export) will throw an error
diff --git a/jest.config.js b/jest.config.js
@@ -8,9 +8,6 @@ module.exports = {
   transform: {
     ".(ts|tsx|js)": "ts-jest"
   },
-  transformIgnorePatterns: [
-    "<rootDir>/node_modules/(?!lodash-es)"
-  ],
   testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
   moduleFileExtensions: [
     "ts",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
   "devDependencies": {
     "@types/debug": "^0.0.30",
     "@types/jest": "^23.3.1",
-    "@types/lodash-es": "^4.17.1",
+    "@types/lodash": "^4.14.116",
     "@types/node": "^8.0.26",
     "@types/reflect-metadata": "^0.1.0",
     "@types/uuid": "^3.4.1",
@@ -90,7 +90,7 @@
     "husky": "^0.14.0",
     "jest": "^23.5.0",
     "lint-staged": "^7.2.0",
-    "lodash-es": "^4.17.10",
+    "lodash": "^4.17.10",
     "lodash.camelcase": "^4.3.0",
     "moment": "^2.22.1",
     "prettier": "^1.14.0",
@@ -117,7 +117,7 @@
   },
   "peerDependencies": {
     "aws-sdk": "^2.286.1",
-    "lodash-es": "^4.17.10",
+    "lodash": "^4.17.10",
     "moment": "^2.22.2",
     "rxjs": "^6.0.0"
   },
diff --git a/src/decorator/impl/model/model.decorator.ts b/src/decorator/impl/model/model.decorator.ts
@@ -1,4 +1,4 @@
-import { kebabCase } from 'lodash-es'
+import { kebabCase } from 'lodash'
 import { PropertyMetadata } from '../../metadata/property-metadata.model'
 import { SecondaryIndex } from '../index/secondary-index'
 import { KEY_PROPERTY } from '../property/property.decorator'
diff --git a/src/dynamo/batchget/batch-get.request.ts b/src/dynamo/batchget/batch-get.request.ts
@@ -1,5 +1,5 @@
 import { AttributeMap, BatchGetItemInput } from 'aws-sdk/clients/dynamodb'
-import { isObject, isString } from 'lodash-es'
+import { isObject, isString } from 'lodash'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { MetadataHelper } from '../../decorator/metadata/metadata-helper'
diff --git a/src/dynamo/expression/condition-expression-builder.spec.ts b/src/dynamo/expression/condition-expression-builder.spec.ts
@@ -1,4 +1,4 @@
-import { has } from 'lodash-es'
+import { has } from 'lodash'
 import * as moment from 'moment'
 import { PartitionKey } from '../../decorator/impl/key/partition-key.decorator'
 import { Model } from '../../decorator/impl/model/model.decorator'
diff --git a/src/dynamo/expression/condition-expression-builder.ts b/src/dynamo/expression/condition-expression-builder.ts
@@ -1,5 +1,5 @@
 import { AttributeMap, AttributeValue } from 'aws-sdk/clients/dynamodb'
-import { curryRight, forEach, isPlainObject } from 'lodash-es'
+import { curryRight, forEach, isPlainObject } from 'lodash'
 import { Metadata } from '../../decorator/metadata/metadata'
 import { PropertyMetadata } from '../../decorator/metadata/property-metadata.model'
 import { Mapper } from '../../mapper/mapper'
diff --git a/src/dynamo/expression/logical-operator/merge-conditions.function.ts b/src/dynamo/expression/logical-operator/merge-conditions.function.ts
@@ -1,4 +1,4 @@
-import { mapKeys } from 'lodash-es'
+import { mapKeys } from 'lodash'
 import { Metadata } from '../../../decorator/metadata/metadata'
 import { uniqAttributeValueName } from '../functions/unique-attribute-value-name.function'
 import { ConditionExpressionDefinitionFunction } from '../type/condition-expression-definition-function'
diff --git a/src/dynamo/expression/param-util.ts b/src/dynamo/expression/param-util.ts
@@ -5,7 +5,7 @@ import {
   ScanInput,
   UpdateItemInput,
 } from 'aws-sdk/clients/dynamodb'
-import { isEmpty, isString } from 'lodash-es'
+import { isEmpty, isString } from 'lodash'
 import { Expression } from './type/expression.type'
 
 export class ParamUtil {
diff --git a/src/dynamo/expression/request-expression-builder.ts b/src/dynamo/expression/request-expression-builder.ts
@@ -1,4 +1,4 @@
-import { curry } from 'lodash-es'
+import { curry } from 'lodash'
 import { Metadata } from '../../decorator/metadata/metadata'
 import { BaseRequest } from '../request/base.request'
 import { ConditionExpressionBuilder } from './condition-expression-builder'
diff --git a/src/dynamo/paged/paged-data-source.ts b/src/dynamo/paged/paged-data-source.ts
@@ -1,6 +1,6 @@
 // tslint:disable:no-console
 import { Key } from 'aws-sdk/clients/dynamodb'
-import { findIndex } from 'lodash-es'
+import { findIndex } from 'lodash'
 import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'
 import { finalize, map, publishReplay, refCount, share, switchMap, tap } from 'rxjs/operators'
 import { QueryRequest } from '../request/query/query.request'
diff --git a/src/dynamo/request/batchgetsingletable/batch-get-single-table.request.ts b/src/dynamo/request/batchgetsingletable/batch-get-single-table.request.ts
@@ -1,5 +1,5 @@
 import { AttributeMap, BatchGetItemInput } from 'aws-sdk/clients/dynamodb'
-import { isObject } from 'lodash-es'
+import { isObject } from 'lodash'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { Metadata } from '../../../decorator/metadata/metadata'
diff --git a/src/dynamo/request/get/get.request.ts b/src/dynamo/request/get/get.request.ts
@@ -1,5 +1,5 @@
 import { AttributeMap, ReturnConsumedCapacity } from 'aws-sdk/clients/dynamodb'
-import { values as objValues } from 'lodash-es'
+import { values as objValues } from 'lodash'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { Mapper } from '../../../mapper/mapper'
diff --git a/src/dynamo/request/update/update.request.ts b/src/dynamo/request/update/update.request.ts
@@ -4,7 +4,7 @@ import {
   ReturnItemCollectionMetrics,
   UpdateItemOutput,
 } from 'aws-sdk/clients/dynamodb'
-import { forEach } from 'lodash-es'
+import { forEach } from 'lodash'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { Mapper } from '../../../mapper/mapper'
diff --git a/src/mapper/for-type/number.mapper.ts b/src/mapper/for-type/number.mapper.ts
@@ -1,5 +1,5 @@
 import { AttributeValue } from 'aws-sdk/clients/dynamodb'
-import { isNumber } from 'lodash-es'
+import { isNumber } from 'lodash'
 import { MapperForType } from './base.mapper'
 
 export class NumberMapper implements MapperForType<number> {
diff --git a/src/mapper/util.ts b/src/mapper/util.ts
@@ -1,5 +1,5 @@
 import { AttributeValue } from 'aws-sdk/clients/dynamodb'
-import { isNumber, isString } from 'lodash-es'
+import { isNumber, isString } from 'lodash'
 import { isMoment } from 'moment'
 import { AttributeCollectionType } from './type/attribute-collection.type'
 import { AttributeModelType } from './type/attribute-model.type'
diff --git a/tsconfig.json b/tsconfig.json
@@ -47,7 +47,7 @@
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+//     "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     // "esModuleInterop": true                /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { kebabCase } from 'lodash-es'`
	`1`	`+import { kebabCase } from 'lodash'`
`2`	`2`	`import { PropertyMetadata } from '../../metadata/property-metadata.model'`
`3`	`3`	`import { SecondaryIndex } from '../index/secondary-index'`
`4`	`4`	`import { KEY_PROPERTY } from '../property/property.decorator'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { has } from 'lodash-es'`
	`1`	`+import { has } from 'lodash'`
`2`	`2`	`import * as moment from 'moment'`
`3`	`3`	`import { PartitionKey } from '../../decorator/impl/key/partition-key.decorator'`
`4`	`4`	`import { Model } from '../../decorator/impl/model/model.decorator'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { mapKeys } from 'lodash-es'`
	`1`	`+import { mapKeys } from 'lodash'`
`2`	`2`	`import { Metadata } from '../../../decorator/metadata/metadata'`
`3`	`3`	`import { uniqAttributeValueName } from '../functions/unique-attribute-value-name.function'`
`4`	`4`	`import { ConditionExpressionDefinitionFunction } from '../type/condition-expression-definition-function'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { curry } from 'lodash-es'`
	`1`	`+import { curry } from 'lodash'`
`2`	`2`	`import { Metadata } from '../../decorator/metadata/metadata'`
`3`	`3`	`import { BaseRequest } from '../request/base.request'`
`4`	`4`	`import { ConditionExpressionBuilder } from './condition-expression-builder'`