Makes it able to treat permissionSets and to work when there is no Base

.circleci/config.yml

@@ -0,0 +1,61 @@
+---
+version: 2
+jobs:
+  node-latest: &test
+    docker:
+      - image: node:latest
+    working_directory: ~/cli
+    steps:
+      - checkout
+      - restore_cache: &restore_cache
+          keys:
+            - v1-npm-{{checksum ".circleci/config.yml"}}-{{checksum "yarn.lock"}}
+            - v1-npm-{{checksum ".circleci/config.yml"}}
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run: ./bin/run --version
+      - run: ./bin/run --help
+      - run:
+          name: Testing
+          command: yarn test
+      - run:
+          name: Submitting code coverage to codecov
+          command: |
+            ./node_modules/.bin/nyc report --reporter text-lcov > coverage.lcov
+            curl -s https://codecov.io/bash | bash
+  node-12:
+    <<: *test
+    docker:
+      - image: node:12
+  node-10:
+    <<: *test
+    docker:
+      - image: node:10
+  cache:
+    <<: *test
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: yarn
+      - save_cache:
+          key: v1-npm-{{checksum ".circleci/config.yml"}}-{{checksum "yarn.lock"}}
+          paths:
+            - ~/cli/node_modules
+            - /usr/local/share/.cache/yarn
+            - /usr/local/share/.config/yarn
+
+workflows:
+  version: 2
+  'sfdx-md-merge-driver':
+    jobs:
+      - node-latest
+      - node-12
+      - node-10
+      - cache:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -0,0 +1 @@
+/lib

.eslintrc.json

@@ -0,0 +1,21 @@
+{
+  "extends": ["oclif", "oclif-typescript"],
+  "rules": {
+    "space-before-function-paren": "off",
+    "arrow-parens": "off",
+    "indent": "off",
+    "operator-linebreak": "off",
+    "node/no-missing-require": [
+      "error",
+      {
+        "tryExtensions": [".ts", ".js"]
+      }
+    ],
+    "node/no-missing-import": [
+      "error",
+      {
+        "tryExtensions": [".ts", ".js"]
+      }
+    ]
+  }
+}

.gitignore

@@ -0,0 +1,11 @@
+*-debug.log
+*-error.log
+/.nyc_output
+/dist
+/lib
+/package-lock.json
+/tmp
+/node_modules
+/sfdx-md-merge-driver.1
+/.vscode
+/coverage

.lintstagedrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  '*.ts': ['prettier --write', 'git add'],
+  '**/*.ts?(x)': () => 'tsc -p tsconfig.json --noEmit',
+}

.mocharc.js

@@ -0,0 +1,14 @@
+'use strict';
+
+// Here's a JavaScript-based config file.
+// If you need conditional logic, you might want to use this type of config.
+// Otherwise, JSON or YAML is recommended.
+
+module.exports = {
+    require: 'ts-node/register',
+    'watch-extensions': 'ts',
+    recursive: true,
+    reporter: 'spec',
+    timeout: 10000,
+    slow: 0,
+};

.nycrc

@@ -0,0 +1,4 @@
+{
+    "extends": "@istanbuljs/nyc-config-typescript",
+      "reporter": ["html","text"]
+}

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": false
+}

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+  - node
+
+cache: yarn
+
+script:
+  - ./bin/run --version
+  - ./bin/run --help
+  - yarn run test
+
+after_success:
+  - ./node_modules/.bin/nyc report --reporter text-lcov > coverage.lcov
+  - bash < (curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -0,0 +1,56 @@
+# 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.
+
+### [0.1.4](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.3...v0.1.4) (2020-02-06)
+
+
+### Bug Fixes
+
+* merge of customlabels ([3b49d3d](https://github.com/jayree/sfdx-md-merge-driver/commit/3b49d3d902cce76257bc4e155f4a7dfe0052af6a))
+
+### [0.1.3](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.1...v0.1.3) (2020-01-29)
+
+
+### Features
+
+* convert to typescript and oclif ([b03b4b6](https://github.com/jayree/sfdx-md-merge-driver/commit/b03b4b6d1dede2faee2c1b7f408217f33642d700))
+
+
+### Bug Fixes
+
+* Adding some conf missing ([cc81e8f](https://github.com/jayree/sfdx-md-merge-driver/commit/cc81e8f2dbd6dccd74a7b6b8a8e9ca2e6ed59aa4))
+* Put xml renderOpts for strict exact output than a Salesforce retrieve ([a30a1cc](https://github.com/jayree/sfdx-md-merge-driver/commit/a30a1ccb62a81a50ccb12793cdfd8f95b4c689ee))
+
+### [0.1.2](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.1...v0.1.2) (2020-01-22)
+
+
+### Features
+
+* convert to typescript and oclif ([b03b4b6](https://github.com/jayree/sfdx-md-merge-driver/commit/b03b4b6d1dede2faee2c1b7f408217f33642d700))
+
+### [0.1.1](https://github.com/jayree/sfdx-md-merge-driver/compare/v0.1.0...v0.1.1) (2019-11-22)
+
+
+### Features
+
+* auto install if yarn or npm is used ([a3813fc](https://github.com/jayree/sfdx-md-merge-driver/commit/a3813fcb0eb89c59e9362a0907e8bae02efda012))
+
+## 0.1.0 (2019-11-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* Enhancements for VSCode
+
+### Features
+
+* add node.js package and installer framework ([b3e20ba](https://github.com/jayree/sfdx-md-merge-driver/commit/b3e20ba203a22e080b749c406a7d534cb574317c))
+* Enhancements for VSCode ([ec76f79](https://github.com/jayree/sfdx-md-merge-driver/commit/ec76f79812ab13b167ae4464249d956a36f49a5a))
+* migrate from groovy to node.js script ([b525c45](https://github.com/jayree/sfdx-md-merge-driver/commit/b525c45774cf695fe62c16f56fcbfd77a9e7bb29))
+
+
+### Bug Fixes
+
+* fix undefined xml tag ([a037632](https://github.com/jayree/sfdx-md-merge-driver/commit/a037632343827cb7c389b0412a429f2b67aae650))
+* update dependencies ([b75257e](https://github.com/jayree/sfdx-md-merge-driver/commit/b75257ea2f6c207559e5af935df827f76b3da290))