@vorplex/core 0.0.34 → 0.0.36

package/dist/modules/changes/changes.util.js

@@ -321,7 +321,7 @@ export class $Changes {
         }
         const sourceWithDifferences = $Changes.apply(source, remoteCompare.differences, localCompare.differences, remoteCompare.similarities, localCompare.similarities);
         return {
-            result: $Changes.apply(remote, local),
+            result: $Changes.apply(remote, localCompare.differences, localCompare.conflicts),
             conflict: {
                 local: localCompare,
                 remote: remoteCompare,

package/dist/modules/string/string.util.d.ts

@@ -6,6 +6,7 @@ export declare class $String {
     static getWords(string: string): string[];
     static camelCase(string: string): string;
     static kebabCase(string: string): string;
+    static titleCase(string: string): string;
     static isNullOrEmpty(value: string): boolean;
     static sanitizeForRegex(string: string): string;
 }

package/dist/modules/string/string.util.js

@@ -33,6 +33,12 @@ export class $String {
             .map((word) => word.toLowerCase())
             .join('-');
     }
+    static titleCase(string) {
+        return $String
+            .getWords(string.replace(/[-_]/g, ' '))
+            .map(word => $String.upperCaseFirst(word.toLowerCase()))
+            .join(' ');
+    }
     static isNullOrEmpty(value) {
         return value == null || value === '';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vorplex/core",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "type": "module",
   "sideEffects": false,
   "files": [