@legalplace/lplogic 2.1.5 → 2.3.0

package/.gitlab-ci.yml

@@ -1,17 +1,28 @@
-image: node:11-alpine
+image: 148253454541.dkr.ecr.eu-west-1.amazonaws.com/deploydock:node20
 
 
 stages:
   - deploy
+  - build
 
 before_script:
 - export PATH=$PATH:./node_modules/.bin/
+- echo -e "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+
 
 variables: 
   DOCKER_DRIVER: overlay2
 
+build:
+  stage: build
+  script:
+    - export PATH=$PATH:./node_modules/.bin/
+    - yarn install
+    - yarn build
+  except:
+    - master  # Excludes the master branch
+
 publish:
-  image: node:11-alpine
   stage: deploy
   except:
     variables:
@@ -25,4 +36,4 @@ publish:
   environment:
     name: development
   only:
-  - master
+  - master

package/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [2.3.0](https://git.legalplace.eu/legalplace/lplogic/compare/v2.2.0...v2.3.0) (2024-01-09)
+
+
+### Features
+
+* adding new job build for non master branches ([95e101f](https://git.legalplace.eu/legalplace/lplogic/commit/95e101fe9a9199b06557731d7b753a3d067c82dc))
+* adding new stage ([f3446a4](https://git.legalplace.eu/legalplace/lplogic/commit/f3446a441c640e7c88559ac8a4e92c3d990a08f3))
+
+
+### Bug Fixes
+
+* add build files ([a54b21a](https://git.legalplace.eu/legalplace/lplogic/commit/a54b21a1177396622ccce8f2c98cee9d348bcdc7))
+* update package.json ([116d9c2](https://git.legalplace.eu/legalplace/lplogic/commit/116d9c24bdecdce09cea4ca15017f8c6e6fef8be))
+* update version node from 11 to 18 ([5570198](https://git.legalplace.eu/legalplace/lplogic/commit/5570198c2c75aba1c3d1b993823a95c0eb6ab157))
+
+## [2.2.0](https://git.legalplace.eu/legalplace/lplogic/compare/v2.0.1...v2.2.0) (2024-01-09)
+
+
+### Features
+
+* adding new operator regex-match ([d6e31b3](https://git.legalplace.eu/legalplace/lplogic/commit/d6e31b3393fbddf4e79b9181acefda099aff5e0e))

package/dist/LpLogic.js

@@ -104,8 +104,9 @@ json_logic_js_1.default.add_operation("not-selected", function (values, comparat
     var filter = reducedValue.filter(function (_value) { return _value === true; });
     return reducedValue.length === filter.length;
 });
-json_logic_js_1.default.add_operation("not-selected-ip", function (values) {
-    var filter = values.filter(function (_value) { return _value !== true; });
+json_logic_js_1.default.add_operation("not-selected-ip", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return (parent && !value) || !parent; });
+    var filter = reducedValue.filter(function (_value) { return _value === true; });
     return values.length === filter.length;
 });
 json_logic_js_1.default.add_operation("has-one", function (values, comparator, parents) {
@@ -201,5 +202,29 @@ var notLike = function (values, comparator, parents) {
     return reducedValues.length === filter.length;
 };
 json_logic_js_1.default.add_operation("not-like", notLike);
+var regexMatch = function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        var cleanValue = typeof value === "number" ? value.toString() : value.trim();
+        var regex;
+        if (typeof comparator === 'string') {
+            try {
+                regex = new RegExp(comparator);
+            }
+            catch (error) {
+                return false;
+            }
+        }
+        else {
+            if (!(comparator instanceof RegExp)) {
+                return false;
+            }
+            regex = comparator;
+        }
+        return regex.test(cleanValue) && parent;
+    });
+    var filter = reducedValues.filter(function (value) { return value === true; });
+    return reducedValues.length === filter.length;
+};
+json_logic_js_1.default.add_operation("regex-match", regexMatch);
 var LpLogic = json_logic_js_1.default.apply;
 exports.default = LpLogic;

package/dist/Parser.js

@@ -14,7 +14,7 @@ var Parser = (function () {
         return this.logic;
     };
     Parser.prototype.validateCondition = function (condition) {
-        var result = jsonschema_1.validate(condition, condition_v1_schema_1.default);
+        var result = (0, jsonschema_1.validate)(condition, condition_v1_schema_1.default);
         if (result.errors.length > 0) {
             throw new Error(JSON.stringify(condition) + " is not a valid condition");
         }

package/dist/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Parser = void 0;
 var LpLogic_1 = __importDefault(require("./LpLogic"));
 var Parser_1 = __importDefault(require("./Parser"));
 exports.Parser = Parser_1.default;

package/package.json

@@ -1,37 +1,47 @@
 {
   "name": "@legalplace/lplogic",
-  "version": "2.1.5",
+  "version": "2.3.0",
   "description": "LegalPlace LpLogic",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "scripts": {
     "test": "npx jest",
-    "build": "npx tsc"
+    "build": "npx tsc",
+    "release": "standard-version -a --no-verify"
   },
   "outDir": "./dist",
   "author": "Moncef Hammou <moncef@legalplace.fr>",
   "license": "ISC",
+  "dependencies": {
+    "@legalplace/models-v3-types": "5.1.24",
+    "@legalplace/json-logic-js": "^1.2.3",
+    "jsonschema": "^1.2.4"
+  },
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@babel/preset-typescript": "^7.7.2",
-    "@legalplace/models-v3-types": "^3.4.0",
-    "@types/jest": "^24.0.15",
-    "@types/node": "^12.6.1",
+    "@types/node": "^12.12.6",
     "@typescript-eslint/eslint-plugin": "^2.6.1",
     "@typescript-eslint/parser": "^2.6.1",
     "airbnb-standard": "^1.0.0",
     "eslint": "^6.6.0",
     "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-config-prettier": "^6.5.0",
     "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-prettier": "^3.1.1",
-    "jest": "^24.8.0",
-    "prettier": "1.19.1",
-    "ts-jest": "^24.0.2",
-    "typescript": "^3.7.2"
+    "typescript": "4.4.3",
+    "semantic-release": "^17.1.1",
+    "husky": "^4.2.5",
+    "@commitlint/cli": "^9.0.1",
+    "@commitlint/config-conventional": "^9.0.1",
+    "standard-version": "^8.0.0"
   },
-  "dependencies": {
-    "@legalplace/json-logic-js": "^1.2.3",
-    "jsonschema": "^1.2.4"
+  "husky": {
+    "hooks": {
+      "pre-commit": "CI=true",
+      "commit-msg": "commitlint -E  HUSKY_GIT_PARAMS"
+    }
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
   }
 }