Update to modern javascript #1

AndyOGo · 2019-02-21T16:51:07Z

AndyOGo · 2019-02-22T16:52:07Z

package.json

@@ -1,25 +1,61 @@
 {
-  "name": "json-logic-js",
+  "name": "@axa-ch/json-logic-js",
  "version": "1.2.2",


I would bump the version to 2.0.0 🤔

AndyOGo · 2019-02-25T09:02:45Z

@mjenny
@lina-salih
I searched through the open PRs and found one which rewrote it to ES6 already, just not using modules 🤔
jwadhams#56

AndyOGo · 2019-02-25T09:07:36Z

lib/operations/accessor/missing.js

+  return are_missing;
+}
+
+missing.withApply = true;


@lina-salih
@mjenny
I don't like this hacks of meta data like withApply and code...
The reason I have them is, that some operations need to call apply recursively, and others have names within the API like == which is not a valid JavaScript function or variable name., so:

withApply: adds the apply function as a callback as the first argument

code: overrides the functions key within the operations object, e.g. equal() function gets overridden by it's code property being ==

This is too complex and error prone 💣

Do you plan on changing this at some point?

Yeah, it sit's on my nerves^^

Go for it. 💯

Oh.... do you want to change this in the current PR or open an issue? 😖

AndyOGo · 2019-02-25T09:08:54Z

lib/operations/accessor/missingSome.js

+}
+
+missingSome.code = 'missing_some';
+missingSome.withApply = true;


@lina-salih @mjenny
Same here code, withApply as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

AndyOGo · 2019-02-25T09:09:34Z

lib/operations/accessor/variable.js

+  return data;
+}
+
+variable.code = 'var';


@lina-salih @mjenny
Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

var is a reserved keyword and can't be used as function name

AndyOGo · 2019-02-25T09:10:12Z

lib/operations/arithmetic/add.js

+  }, 0);
+}
+
+add.code = '+';


@lina-salih @mjenny
Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

+ is an existing operator

AndyOGo · 2019-02-25T09:10:28Z

lib/operations/arithmetic/divide.js

+  return a / b;
+}
+
+divide.code = '/';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

/ is an existing operator

AndyOGo · 2019-02-25T09:11:15Z

lib/operations/arithmetic/modulo.js

+  return a % b;
+}
+
+modulo.code = '%';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

% is an existing operator

AndyOGo · 2019-02-25T09:11:25Z

lib/operations/arithmetic/substract.js

+  return a - b;
+}
+
+substract.code = '-';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

- is an existing operator

AndyOGo · 2019-02-25T09:11:36Z

lib/operations/logic/equal.js

+  return a == b;
+}
+
+equal.code = '==';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

== is an existing operator

AndyOGo · 2019-02-25T09:11:45Z

lib/operations/logic/falsy.js

+  return !truthy(a);
+}
+
+falsy.code = '!';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

! is an existing operator

AndyOGo · 2019-02-25T09:11:53Z

lib/operations/logic/notEqual.js

+  return a != b;
+}
+
+notEqual.code = '!=';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

!= is an existing operator

AndyOGo · 2019-02-25T09:12:00Z

lib/operations/logic/strictEqual.js

+  return a === b;
+}
+
+strictEqual.code = '===';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

=== is an existing operator

AndyOGo · 2019-02-25T09:12:09Z

lib/operations/logic/strictNotEqual.js

+  return a !== b;
+}
+
+strictNotEqual.code = '!==';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

!== is an existing operator

AndyOGo · 2019-02-25T09:12:25Z

lib/operations/logic/truthy.js

@@ -0,0 +1,3 @@
+import truthy from '../../helpers/truthy';
+truthy.code = '!!';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

! is an existing operator

AndyOGo · 2019-02-25T09:12:32Z

lib/operations/misc/indexOf.js

+  return b.indexOf(a) !== -1;
+}
+
+indexOf.code = 'in';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

in is an existing operator

AndyOGo · 2019-02-25T09:12:41Z

lib/operations/numeric/greater.js

+  return a > b;
+}
+
+greater.code = '>';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

> is an existing operator

AndyOGo · 2019-02-25T09:12:49Z

lib/operations/numeric/greaterEqual.js

+  return a >= b;
+}
+
+greaterEqual.code = '>=';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

>= is an existing operator

AndyOGo · 2019-02-25T09:12:59Z

lib/operations/numeric/lower.js

+  return c === undefined ? a < b : a < b && b < c;
+}
+
+lower.code = '<';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

< is an existing operator

AndyOGo · 2019-02-25T09:13:10Z

lib/operations/numeric/lowerEqual.js

+  return c === undefined ? a <= b : a <= b && b <= c;
+}
+
+lowerEqual.code = '<=';


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

<= is an existing operator

AndyOGo · 2019-02-25T09:14:47Z

lib/visitors/logic/condition.js

+  return null;
+}
+
+condition.code = ['if', '?:'];


Same here code as described in https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014

/if is an existing operator and ?: not a valid variable name and it's and array...

storm1ng

Other than https://github.com/axa-ch/json-logic-js/pull/1/files#r259730014 this LGTM

storm1ng · 2019-02-26T06:23:59Z

lib/operations/accessor/missing.js

+  return are_missing;
+}
+
+missing.withApply = true;


Do you plan on changing this at some point?

storm1ng · 2019-02-26T09:20:37Z

Awesome PR, using once again up-to-date components 👍

l-salih

Great job! thank you @AndyOGo 😄

l-salih · 2019-02-26T10:56:06Z

lib/operations/arithmetic/add.js

@@ -0,0 +1,12 @@
+function add() {


do we need arithmetic operations?

I would kick them

l-salih · 2019-02-26T10:56:37Z

lib/operations/logic/strictEqual.js

+  return a === b;
+}
+
+strictEqual.code = '===';


l-salih · 2019-02-26T10:58:48Z

src/createJsonLogic.js

+  };
+}
+
+export default createJsonLogic;


l-salih · 2019-02-26T10:59:15Z

src/operations/accessor/variable.js

+  const not_found = b === undefined ? null : b;
+  let data = this;
+
+  if (typeof a === 'undefined' || a === '' || a === null) {


could we export this as a function?

sure as a helper

refactore: extract operations

aa69be4

AndyOGo added the enhancement New feature or request label Feb 21, 2019

AndyOGo self-assigned this Feb 21, 2019

AndyOGo changed the title ~~refactore: extract operations~~ Update to modern javascript Feb 21, 2019

AndyOGo added 2 commits February 21, 2019 18:16

refactore: extracted helpers

d11373c

refactore: truthy and falsy operations

535dd80

AndyOGo force-pushed the refactore/update-to-modern-js branch from d2dadc1 to ee9fa49 Compare February 21, 2019 17:37

refactore: start extracting visitors

e6e627f

AndyOGo force-pushed the refactore/update-to-modern-js branch from ee9fa49 to e6e627f Compare February 21, 2019 17:57

AndyOGo added 4 commits February 21, 2019 18:57

fix: added missing operator code

8ae7689

refactore: naming of accessors

e84b724

refactore: visitor names

90da723

refactore: start applying visitors

e68d842

AndyOGo force-pushed the refactore/update-to-modern-js branch from bbe1d8a to e68d842 Compare February 21, 2019 18:16

AndyOGo added 8 commits February 21, 2019 19:25

fix: restored original API

b3c2426

feat: also export jsonLogic creator

65f7549

refactore: api

4656028

fix: grouped operations and visitors by kind

02e84a6

fix: imports and exports

8bebfc1

fix: cached isArray

21bb46d

fix: broken tests

7566f8a

refactore: enabled babel, rollup, tests,...

859945b

AndyOGo force-pushed the refactore/update-to-modern-js branch from c5b26ed to 859945b Compare February 22, 2019 12:19

fix: upgraded qunit

f68c165

AndyOGo force-pushed the refactore/update-to-modern-js branch from 04edfe0 to f68c165 Compare February 22, 2019 14:41

AndyOGo added 5 commits February 22, 2019 15:55

refactore: build

1518cb3

feat: added module, browser and main field

bb9cb75

feat: enable source maps

4279063

chore: rebuild

f605f04

deleted bower.json

330d37d

AndyOGo commented Feb 22, 2019

View reviewed changes

AndyOGo requested review from l-salih and storm1ng February 22, 2019 16:53

fix: removed old logic.js

182447f

AndyOGo commented Feb 25, 2019

View reviewed changes

storm1ng approved these changes Feb 26, 2019

View reviewed changes

lib/operations/accessor/missing.js

return are_missing;

}

missing.withApply = true;

Copy link

storm1ng Feb 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you plan on changing this at some point?

l-salih approved these changes Feb 26, 2019

View reviewed changes

chore: clean husky and lint-staged configuration

5b5de10

AndyOGo merged commit 1fcfd7f into master Mar 5, 2019

AndyOGo deleted the refactore/update-to-modern-js branch March 5, 2019 11:21

		@@ -0,0 +1,3 @@
		import truthy from '../../helpers/truthy';
		truthy.code = '!!';

Update to modern javascript #1

Update to modern javascript #1

Conversation

AndyOGo commented Feb 21, 2019 • edited Loading

Choose a reason for hiding this comment

AndyOGo commented Feb 25, 2019

AndyOGo Feb 25, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndyOGo Feb 25, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

storm1ng left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

storm1ng commented Feb 26, 2019

l-salih left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndyOGo commented Feb 21, 2019 •

edited

Loading

AndyOGo Feb 25, 2019 •

edited

Loading

AndyOGo Feb 25, 2019 •

edited

Loading