Skip to content

Housekeeping #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "plugin:bpmn-io/es6"
"extends": "plugin:bpmn-io/recommended"
}
23 changes: 23 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: CI
on: [ push, pull_request ]
jobs:
Build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest]
node-version: [ 20 ]

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js ${{matrix.node-version}}
uses: actions/setup-node@v4
with:
node-version: ${{matrix.node-version}}
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Build
run: npm run all
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules/
tmp/
dist/
package-lock.json
dist/
5 changes: 0 additions & 5 deletions .npmignore

This file was deleted.

1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bpmn-js-differ

[![Build Status](https://travis-ci.com/bpmn-io/bpmn-js-differ.svg?branch=master)](https://travis-ci.com/bpmn-io/bpmn-js-differ)
[![CI](https://github.com/bpmn-io/bpmn-js-differ/actions/workflows/CI.yml/badge.svg)](https://github.com/bpmn-io/bpmn-js-differ/actions/workflows/CI.yml)

A semantic diffing utility for BPMN 2.0 files. To be used together with [bpmn-moddle](https://github.com/bpmn-io/bpmn-moddle).

Expand Down
21 changes: 6 additions & 15 deletions lib/change-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,9 @@ ChangeHandler.prototype.removed = function(model, property, element, idx) {
if (!this._removed[tracked.element.id]) {
this._removed[tracked.element.id] = element;
}
} else

if (tracked = isTracked(model)) {
} else if (tracked = isTracked(model)) {
this.changed(tracked.element, tracked.property + property + '[' + idx + ']', null, element);
} else

if (isDi(model) && property === 'waypoint') {
} else if (isDi(model) && property === 'waypoint') {
this._layoutChanged[model.bpmnElement.id] = model.bpmnElement;
}
};
Expand All @@ -108,9 +104,7 @@ ChangeHandler.prototype.changed = function(model, property, newValue, oldValue)

if (isDi(model)) {
this._layoutChanged[model.bpmnElement.id] = model.bpmnElement;
} else

if (tracked = isTracked(model)) {
} else if (tracked = isTracked(model)) {
var changed = this._changed[tracked.element.id];

if (!changed) {
Expand All @@ -131,17 +125,14 @@ ChangeHandler.prototype.added = function(model, property, element, idx) {
if (!this._added[tracked.element.id]) {
this._added[tracked.element.id] = element;
}
} else

if (tracked = isTracked(model)) {
} else if (tracked = isTracked(model)) {
this.changed(tracked.element, tracked.property + property + '[' + idx + ']', element, null);
} else

if (isDi(model) && property === 'waypoint') {
} else if (isDi(model) && property === 'waypoint') {
this._layoutChanged[model.bpmnElement.id] = model.bpmnElement;
}
};

ChangeHandler.prototype.moved = function(model, property, oldIndex, newIndex) {

// noop
};
2 changes: 1 addition & 1 deletion lib/diff.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Differ from './differ';
import Differ from './differ.js';

export default function diff(a, b, handler) {
return new Differ().diff(a, b, handler);
Expand Down
5 changes: 2 additions & 3 deletions lib/differ.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
DiffPatcher
} from 'diffpatch';

import ChangeHandler from './change-handler';
import ChangeHandler from './change-handler.js';


export default function Differ() { }
Expand Down Expand Up @@ -76,8 +76,7 @@ Differ.prototype.diff = function(a, b, handler) {

if (added || (removed && !moved)) {
handler[removed ? 'removed' : 'added'](model, key, val[0], idx);
} else
if (moved) {
} else if (moved) {
handler.moved(model, key, val[1], val[2]);
} else {
walk(val, model[key][idx]);
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export {
default as Differ
} from './differ';
} from './differ.js';

export {
default as diff
} from './diff';
} from './diff.js';
Loading