modl-converter - npm Package Compare versions

Comparing version 0.0.10 to 0.0.11

dist/JsonToModl.js

@@ -42,3 +42,8 @@ "use strict";
     if (typeof node === 'object') {
-        return escapedKey + "(" + objectToModlMapWithoutParentheses(node) + ")";
+        if (Object.keys(node).length === 1) {
+            return escapedKey + "=" + objectToModlMap(node);
+        }
+        else {
+            return "" + escapedKey + objectToModlMap(node);
+        }
     }
@@ -71,2 +76,20 @@ var result = primitiveToModl(escapedKey, node);
 }
+function objectToModlMap(node) {
+    if (typeof node !== 'object') {
+        return primitiveNodeToModl(node);
+    }
+    if (Array.isArray(node)) {
+        return arrayToModlArray(node);
+    }
+    var keys = Object.keys(node);
+    if (keys.length > 1) {
+        return "(" + keys.map(function (k) { return pairToModlRecursive(k, node[k]); }).join(';') + ")";
+    }
+    else if (keys.length === 0) {
+        return '()';
+    }
+    else {
+        return keys.map(function (k) { return pairToModlRecursive(k, node[k]); }).join('');
+    }
+}
 function primitiveToModl(key, node) {
@@ -84,3 +107,3 @@ var nodeAsString = primitiveNodeToModl(node);
     if (typeof node === 'object') {
-        return "(" + objectToModlMapWithoutParentheses(node) + ")";
+        return objectToModlMap(node);
     }
@@ -87,0 +110,0 @@ return primitiveNodeToModl(node);

package.json

 {
   "name": "modl-converter",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A JSON to MODL library in TypeScript",
@@ -5,0 +5,0 @@ "types": "dist/index.d.ts",

src/JsonToModl.ts

@@ -54,3 +54,7 @@ import log from 'loglevel';
   if (typeof node === 'object') {
-    return `${escapedKey}(${objectToModlMapWithoutParentheses(node)})`;
+    if (Object.keys(node).length === 1) {
+      return `${escapedKey}=${objectToModlMap(node)}`;
+    } else {
+      return `${escapedKey}${objectToModlMap(node)}`;
+    }
   }
@@ -87,2 +91,19 @@ const result: string | null = primitiveToModl(escapedKey, node);
 
+function objectToModlMap(node: any): string | null {
+  if (typeof node !== 'object') {
+    return primitiveNodeToModl(node);
+  }
+  if (Array.isArray(node)) {
+    return arrayToModlArray(node);
+  }
+  const keys = Object.keys(node);
+  if (keys.length > 1) {
+    return `(${keys.map((k) => pairToModlRecursive(k, node[k])).join(';')})`;
+  } else if (keys.length === 0) {
+    return '()';
+  } else {
+    return keys.map((k) => pairToModlRecursive(k, node[k])).join('');
+  }
+}
+
 function primitiveToModl(key: string, node: any): string | null {
@@ -101,3 +122,3 @@ const nodeAsString: string | null = primitiveNodeToModl(node);
   if (typeof node === 'object') {
-    return `(${objectToModlMapWithoutParentheses(node)})`;
+    return objectToModlMap(node);
   }
@@ -104,0 +125,0 @@ return primitiveNodeToModl(node);

No alert changes

Improved metrics

Total package byte prevSize

35910

increased by5.8%

Lines of code

559

increased by8.33%

No dependency changes