Merge pull request #1406 from blackflux/dev

[Gally]: master <- dev

README.md

@@ -125,7 +125,7 @@ Could for example re-use a plugin as
 
 <!-- eslint-disable-next-line import/no-unresolved, import/no-extraneous-dependencies -->
 ```js
-import { injectPlugin, rewriter } from 'object-rewrite';
+const { injectPlugin, rewriter } = require('object-rewrite');
 
 const plugin = injectPlugin(/* ... */);
 

src/index.js

@@ -1,7 +1,7 @@
-import { injectPlugin, filterPlugin, sortPlugin } from './module/plugin';
-import rewriter from './module/rewriter';
+const { injectPlugin, filterPlugin, sortPlugin } = require('./module/plugin');
+const rewriter = require('./module/rewriter');
 
-export default {
+module.exports = {
   injectPlugin,
   filterPlugin,
   sortPlugin,

src/module/plugin.js

@@ -1,8 +1,8 @@
-import assert from 'assert';
-import Joi from 'joi-strict';
-import validationCompile from './plugin/validation-compile';
-import validationExtractKeys from './plugin/validation-extract-keys';
-import joinPath from './plugin/join-path';
+const assert = require('assert');
+const Joi = require('joi-strict');
+const validationCompile = require('./plugin/validation-compile');
+const validationExtractKeys = require('./plugin/validation-extract-keys');
+const joinPath = require('./plugin/join-path');
 
 const plugin = (type, options) => {
   assert(['FILTER', 'INJECT', 'SORT'].includes(type));
@@ -163,6 +163,6 @@ const plugin = (type, options) => {
   return self;
 };
 
-export const filterPlugin = (opts) => plugin('FILTER', opts);
-export const injectPlugin = (opts) => plugin('INJECT', opts);
-export const sortPlugin = (opts) => plugin('SORT', opts);
+module.exports.filterPlugin = (opts) => plugin('FILTER', opts);
+module.exports.injectPlugin = (opts) => plugin('INJECT', opts);
+module.exports.sortPlugin = (opts) => plugin('SORT', opts);

src/module/plugin/join-path.js

@@ -1,4 +1,4 @@
-export default (input) => {
+module.exports = (input) => {
   const result = input.filter((e) => !!e).join('.');
   if (result === '*') {
     return '';

src/module/plugin/validation-compile.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+const assert = require('assert');
 
 const validationCompile = (input, strict = true) => {
   if (typeof input === 'function') {
@@ -20,4 +20,4 @@ const validationCompile = (input, strict = true) => {
     && compiled.every(([k, v]) => v(r[k]) === true)
   );
 };
-export default validationCompile;
+module.exports = validationCompile;

src/module/plugin/validation-extract-keys.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+const assert = require('assert');
 
 const validationExtractKeys = (prefix, input) => {
   if (typeof input === 'function') {
@@ -15,4 +15,4 @@ const validationExtractKeys = (prefix, input) => {
     return p;
   }, []);
 };
-export default validationExtractKeys;
+module.exports = validationExtractKeys;

src/module/rewriter.js

@@ -1,12 +1,12 @@
-import assert from 'assert';
-import objectFields from 'object-fields';
-import compileMeta from './rewriter/compile-meta';
-import mkInjectRewriter from './rewriter/mk-inject-rewriter';
-import mkFilterRewriter from './rewriter/mk-filter-rewriter';
-import mkSortRewriter from './rewriter/mk-sort-rewriter';
-import initPluginMap from './rewriter/init-plugin-map';
+const assert = require('assert');
+const objectFields = require('object-fields');
+const compileMeta = require('./rewriter/compile-meta');
+const mkInjectRewriter = require('./rewriter/mk-inject-rewriter');
+const mkFilterRewriter = require('./rewriter/mk-filter-rewriter');
+const mkSortRewriter = require('./rewriter/mk-sort-rewriter');
+const initPluginMap = require('./rewriter/init-plugin-map');
 
-export default (pluginMap, dataStoreFields_, logger = console) => {
+module.exports = (pluginMap, dataStoreFields_, logger = console) => {
   assert(pluginMap instanceof Object && !Array.isArray(pluginMap));
   assert(Array.isArray(dataStoreFields_) && dataStoreFields_.every((e) => typeof e === 'string'));
 

src/module/rewriter/compare-fn.js

@@ -1,4 +1,4 @@
-export default (keys) => {
+module.exports = (keys) => {
   const lookups = keys.reduce((p, c, idx) => {
     const index = Math.max(0, c.lastIndexOf('.'));
     const k = c.slice(0, index);

src/module/rewriter/compile-meta.js

@@ -1,7 +1,7 @@
-import compileTargetMap from './compile-target-map';
+const compileTargetMap = require('./compile-target-map');
 
 // todo: write separate test
-export default (plugins, fields, initContext, logger) => {
+module.exports = (plugins, fields, initContext, logger) => {
   const pluginsByType = {
     FILTER: [],
     INJECT: [],

src/module/rewriter/compile-target-map.js

@@ -1,4 +1,4 @@
-export default (type, plugins, initContext) => {
+module.exports = (type, plugins, initContext) => {
   const result = {};
   for (let i = 0; i < plugins.length; i += 1) {
     const plugin = plugins[i];

src/module/rewriter/init-plugin-map.js

@@ -1,4 +1,4 @@
-export default (map, data, context, logger) => {
+module.exports = (map, data, context, logger) => {
   const result = {};
   const activeLookup = new Map();
   Object.entries(map).forEach(([prefix, pls]) => {

src/module/rewriter/mk-filter-rewriter.js

@@ -1,8 +1,8 @@
-import assert from 'assert';
-import objectScan from 'object-scan';
-import CompareFn from './compare-fn';
+const assert = require('assert');
+const objectScan = require('object-scan');
+const CompareFn = require('./compare-fn');
 
-export default (keys) => objectScan(keys, {
+module.exports = (keys) => objectScan(keys, {
   useArraySelector: false,
   compareFn: CompareFn(keys),
   filterFn: ({

src/module/rewriter/mk-inject-rewriter.js

@@ -1,9 +1,9 @@
-import assert from 'assert';
-import objectScan from 'object-scan';
-import set from 'lodash.set';
-import CompareFn from './compare-fn';
+const assert = require('assert');
+const objectScan = require('object-scan');
+const set = require('lodash.set');
+const CompareFn = require('./compare-fn');
 
-export default (keys) => objectScan(keys, {
+module.exports = (keys) => objectScan(keys, {
   useArraySelector: false,
   compareFn: CompareFn(keys),
   filterFn: ({

src/module/rewriter/mk-sort-rewriter.js

@@ -1,9 +1,9 @@
-import assert from 'assert';
-import objectScan from 'object-scan';
-import cmpFn from '../../util/cmp-fn';
-import CompareFn from './compare-fn';
+const assert = require('assert');
+const objectScan = require('object-scan');
+const cmpFn = require('../../util/cmp-fn');
+const CompareFn = require('./compare-fn');
 
-export default (keys) => objectScan(keys, {
+module.exports = (keys) => objectScan(keys, {
   useArraySelector: false,
   compareFn: CompareFn(keys),
   filterFn: ({

src/util/cmp-fn.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+const assert = require('assert');
 
 const fn = (a, b) => {
   if (Array.isArray(a)) {
@@ -17,4 +17,4 @@ const fn = (a, b) => {
   }
   return a < b ? -1 : 1;
 };
-export default fn;
+module.exports = fn;

test/index.spec.js

@@ -1,6 +1,5 @@
-import index from '../src/index';
-
 const expect = require('chai').expect;
+const index = require('../src/index');
 
 describe('Testing Package', () => {
   it('Testing Exposed', () => {

test/module/plugin.spec.js

@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import { injectPlugin, filterPlugin, sortPlugin } from '../../src/module/plugin';
+const { expect } = require('chai');
+const { injectPlugin, filterPlugin, sortPlugin } = require('../../src/module/plugin');
 
 describe('Testing plugin', () => {
   const fn = () => null;

test/module/plugin/join-path.spec.js

@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import joinPath from '../../../src/module/plugin/join-path';
+const { expect } = require('chai');
+const joinPath = require('../../../src/module/plugin/join-path');
 
 describe('Testing join-path.js', () => {
   it('Testing basic join', () => {

test/module/plugin/validation-compile.spec.js

@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import validationCompile from '../../../src/module/plugin/validation-compile';
+const { expect } = require('chai');
+const validationCompile = require('../../../src/module/plugin/validation-compile');
 
 describe('Testing validation-compile.js', () => {
   it('Testing function', () => {

test/module/plugin/validation-extract-keys.spec.js

@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import validationExtractKeys from '../../../src/module/plugin/validation-extract-keys';
+const { expect } = require('chai');
+const validationExtractKeys = require('../../../src/module/plugin/validation-extract-keys');
 
 describe('Testing validation-extract-keys.js', () => {
   let fn;

test/module/rewriter.spec.js

@@ -1,8 +1,8 @@
-import get from 'lodash.get';
-import { expect } from 'chai';
-import shuffle from 'lodash.shuffle';
-import rewriter from '../../src/module/rewriter';
-import { injectPlugin, filterPlugin, sortPlugin } from '../../src/module/plugin';
+const get = require('lodash.get');
+const { expect } = require('chai');
+const shuffle = require('lodash.shuffle');
+const rewriter = require('../../src/module/rewriter');
+const { injectPlugin, filterPlugin, sortPlugin } = require('../../src/module/plugin');
 
 describe('Testing rewriter', () => {
   it('Testing name not unique', () => {

test/module/rewriter/compile-target-map.spec.js

@@ -1,7 +1,7 @@
-import { expect } from 'chai';
-import objectScan from 'object-scan';
-import { injectPlugin } from '../../../src/module/plugin';
-import compileTargetMap from '../../../src/module/rewriter/compile-target-map';
+const { expect } = require('chai');
+const objectScan = require('object-scan');
+const { injectPlugin } = require('../../../src/module/plugin');
+const compileTargetMap = require('../../../src/module/rewriter/compile-target-map');
 
 describe('Testing get-plugin-target-map.js', () => {
   let fn;

test/util/cmp-fn.spec.js

@@ -1,5 +1,5 @@
-import { expect } from 'chai';
-import cmpFn from '../../src/util/cmp-fn';
+const { expect } = require('chai');
+const cmpFn = require('../../src/util/cmp-fn');
 
 describe('Testing cmp-fn.js', () => {
   it('Testing sort', () => {