Merge branch 'master' into Custom

Author: OneOfOne

.gitignore

@@ -4,3 +4,4 @@
 /cache/
 /debug
 /testdata/testmodel1/s2ts_gen_*.go
+/helpers.js

cmd/genHelpers.sh

@@ -1,18 +1,37 @@
-#!/bin/sh
-
-IN=$1
-INJS=${IN/\.ts/\.js}
-OUT=$2
-tsc -t es6 -m es6 $IN || exit 1
-
-echo package struct2ts > $OUT
-echo >> $OUT
-echo "const ts_helpers = \`" >> $OUT
-cat $IN >> $OUT
-echo "\`" >> $OUT
-
-echo >> $OUT
-echo "const es6_helpers = \`" >> $OUT
-perl -pe 's/\s{4}/\t/g' < $INJS >> $OUT
-rm $INJS
-echo "\`" >> $OUT
+#!/bin/bash -e
+
+IN="$1"
+OUT="$2"
+
+if test "${IN}x" = "x"; then
+  echo "Please provide input file (hint helper.ts)";
+  exit 1
+fi
+
+if test "${OUT}x" = "x"; then
+  echo "Please provide output file (hint helpers_gen.go)";
+  exit 1
+fi
+
+if test ! -e "${IN}"; then
+  echo "${IN} doesn't exist";
+  exit 1
+fi
+
+INJS="${IN/\.ts/\.js}"
+
+echo "Creating ${OUT}"
+
+tsc -t es6 -m es6 "${IN}" || exit 1
+
+echo package struct2ts > "${OUT}"
+echo >> "${OUT}"
+echo "const ts_helpers = \`" >> "${OUT}"
+cat "${IN}" >> "${OUT}"
+echo "\`" >> "${OUT}"
+
+echo >> "${OUT}"
+echo "const es6_helpers = \`" >> "${OUT}"
+perl -pe 's/\s{4}/\t/g' < "$INJS" >> "${OUT}"
+rm "${INJS}"
+echo "\`" >> "${OUT}"

helpers.ts

@@ -43,7 +43,8 @@ function ToObject(o: any, typeOrCfg: any = {}, child = false): any {
 
 	for (const k of Object.keys(o)) {
 		const v: any = o[k];
-		if (!v) continue;
+		if (v === undefined) continue;
+		if (v === null) continue;
 		d[k] = ToObject(v, typeOrCfg[k] || {}, true);
 	}
 

helpers_gen.go

@@ -18,14 +18,14 @@ function ParseNumber(v: number | string, isInt = false): number {
 	return (isInt ? parseInt(v) : parseFloat(v)) || 0;
 }
 
-function FromArray<T>(Ctor: { new(v: any): T }, data?: any[] | any, def = null): T[] | null {
+function FromArray<T>(Ctor: { new (v: any): T }, data?: any[] | any, def = null): T[] | null {
 	if (!data || !Object.keys(data).length) return def;
 	const d = Array.isArray(data) ? data : [data];
 	return d.map((v: any) => new Ctor(v));
 }
 
 function ToObject(o: any, typeOrCfg: any = {}, child = false): any {
-	if (!o) return null;
+	if (o == null) return null;
 	if (typeof o.toObject === 'function' && child) return o.toObject();
 
 	switch (typeof o) {
@@ -46,7 +46,8 @@ function ToObject(o: any, typeOrCfg: any = {}, child = false): any {
 
 	for (const k of Object.keys(o)) {
 		const v: any = o[k];
-		if (!v) continue;
+		if (v === undefined) continue;
+		if (v === null) continue;
 		d[k] = ToObject(v, typeOrCfg[k] || {}, true);
 	}
 
@@ -80,7 +81,7 @@ function FromArray(Ctor, data, def = null) {
 	return d.map((v) => new Ctor(v));
 }
 function ToObject(o, typeOrCfg = {}, child = false) {
-	if (!o)
+	if (o == null)
 		return null;
 	if (typeof o.toObject === 'function' && child)
 		return o.toObject();
@@ -99,7 +100,9 @@ function ToObject(o, typeOrCfg = {}, child = false) {
 	const d = {};
 	for (const k of Object.keys(o)) {
 		const v = o[k];
-		if (!v)
+		if (v === undefined)
+			continue;
+		if (v === null)
 			continue;
 		d[k] = ToObject(v, typeOrCfg[k] || {}, true);
 	}