@peteradeojo/typegencli - npm Package Compare versions

Comparing version 0.3.0 to 0.4.0

dist/generator.js

@@ -77,3 +77,3 @@ "use strict";
         if (c !== 0) {
-            return false;
+            return [];
         }
@@ -86,47 +86,29 @@ const nests = [];
         }
-        return nests.length > 0 ? nests : false;
+        return nests; //.length > 0 ? nests : false;
     }
     discovery(data, name) {
         let d = {};
-        if (checkIsArray(data) === 1) {
-            data.forEach((datum) => {
-                d = Object.assign(Object.assign({}, d), datum);
-            });
-            // this.discovery(data[0], name);
-            // return;
+        switch (checkIsArray(data)) {
+            case 1:
+                data.forEach((datum) => {
+                    d = Object.assign(Object.assign({}, d), datum);
+                });
+                this.discovery(d, name);
+                return;
+            default:
+                d = data;
         }
-        else {
-            d = data;
-        }
         const nests = this.nestedObject(d);
-        if (nests) {
-            nests.forEach((nest) => {
-                this.discovery(d[nest], nest);
-                d[nest] = 'discovered:' + nest;
-            });
-            this.discovery(d, name);
-        }
-        else {
-            this.discoveredTypes.add({
-                name: name || String(this.discoveredTypes.size + 1),
-                src: d,
-            });
-        }
+        nests.forEach((nest) => {
+            this.discovery(d[nest], nest);
+            d[nest] = 'discovered:' + nest;
+        });
+        this.discoveredTypes.add({
+            name: name || String(this.discoveredTypes.size + 1),
+            src: d,
+        });
     }
-    generateFromObject(obj) { }
-    generate(data, name) {
-        // console.log(data, name);
-        let t = '{\n';
-        for (let i of Object.keys(data)) {
-            // console.log(i);
-            const cx = {
-                name: i,
-                src: data[i],
-            };
-            console.log(cx);
-            console.log(this.discoveredTypes.has(cx));
-        }
-    }
     resolveTypes(data) {
         let t = '{\n';
+        console.log(data);
         for (let i of Object.keys(data)) {
@@ -142,2 +124,5 @@ if (typeof data[i] == 'string') {
             }
+            else {
+                t += `${i}: ${(0, exports.generateType)(data[i])};\n`;
+            }
         }
@@ -144,0 +129,0 @@ t += '}';

package.json

 {
   "name": "@peteradeojo/typegencli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "main": "dist/index.js",
@@ -5,0 +5,0 @@ "bin": {

src/generator.ts

@@ -89,3 +89,3 @@ const capitalize = (str: string) => {
 		if (c !== 0) {
-			return false;
+			return [];
 		}
@@ -100,3 +100,3 @@
 
-		return nests.length > 0 ? nests : false;
+		return nests; //.length > 0 ? nests : false;
 	}
@@ -106,48 +106,29 @@
 		let d: any = {};
-		if (checkIsArray(data) === 1) {
-			data.forEach((datum: any) => {
-				d = { ...d, ...datum };
-			});
-			// this.discovery(data[0], name);
-			// return;
-		} else {
-			d = data;
+		switch (checkIsArray(data)) {
+			case 1:
+				data.forEach((datum: any) => {
+					d = { ...d, ...datum };
+				});
+
+				this.discovery(d, name);
+				return;
+			default:
+				d = data;
 		}
 
 		const nests = this.nestedObject(d);
-		if (nests) {
-			nests.forEach((nest) => {
-				this.discovery(d[nest], nest);
-				d[nest] = 'discovered:' + nest;
-			});
+		nests.forEach((nest) => {
+			this.discovery(d[nest], nest);
+			d[nest] = 'discovered:' + nest;
+		});
 
-			this.discovery(d, name);
-		} else {
-			this.discoveredTypes.add({
-				name: name || String(this.discoveredTypes.size + 1),
-				src: d,
-			});
-		}
+		this.discoveredTypes.add({
+			name: name || String(this.discoveredTypes.size + 1),
+			src: d,
+		});
 	}
 
-	generateFromObject(obj: { [key: string]: any }) {}
-
-	generate(data: any, name?: string): any {
-		// console.log(data, name);
-		let t = '{\n';
-		for (let i of Object.keys(data)) {
-			// console.log(i);
-			const cx = {
-				name: i,
-				src: data[i],
-			};
-
-			console.log(cx);
-
-			console.log(this.discoveredTypes.has(cx));
-		}
-	}
-
 	resolveTypes(data: any) {
 		let t = '{\n';
+		console.log(data)
 		for (let i of Object.keys(data)) {
@@ -161,2 +142,4 @@ if (typeof data[i] == 'string') {
 				}
+			} else {
+				t += `${i}: ${generateType(data[i])};\n`;
 			}
@@ -163,0 +146,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

40295

decreased by-2.6%

Lines of code

824

decreased by-3.4%

No dependency changes