assert corrections

ppaska · ppaska · commit ab7f15ad87aa · 2022-08-18T19:34:44.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspython-cli",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "CLI for jspython. Allows you to run jspython (*.jspy) files",
   "main": "./lib/public-api.js",
   "bin": {
diff --git a/src/assert.ts b/src/assert.ts
@@ -1,4 +1,3 @@
-
 export class Assert {
   #chainedCheckCount: number = 1;
   public status: boolean = true;
@@ -45,6 +44,26 @@ export class Assert {
     );
   }
 
+  isTruthy(value: unknown): Assert {
+    return this.assertFunction(
+      value,
+      null,
+      (e, r) => !!e,
+      (e, r) =>
+        `Value '${e}' is not Truthy - https://developer.mozilla.org/en-US/docs/Glossary/Truthy`
+    );
+  }
+
+  isFalsy(value: unknown): Assert {
+    return this.assertFunction(
+      value,
+      null,
+      (e, r) => !e,
+      (e, r) =>
+        `Value '${e}' is not Falsy - https://developer.mozilla.org/en-US/docs/Glossary/Falsy`
+    );
+  }
+
   isTrue(value: unknown): Assert {
     return this.assertFunction(
       value,
diff --git a/src/cli.ts b/src/cli.ts
@@ -90,6 +90,7 @@ async function main() {
     console.log(` :\> jspython -f (fileName.jspy)`);
     console.log(` :\> jspython --file=(fileName.jspy)`);
     console.log(` :\> jspython --file=(fileName.jspy) --srcRoot=src`);
+    console.log(` :\> jspython --file=(fileName.jspy) --param1=someValue1 --param2=someValue2`);
     console.log(' ');
     return;
   }
diff --git a/src/jspython-node.ts b/src/jspython-node.ts
@@ -101,7 +101,13 @@ async function initialize(baseSource: string) {
 }
 
 initialScope.assert = (name: string, dataContext: any) => assert(name, dataContext);
-initialScope.showAsserts = () => console.table(initialScope.asserts);
+initialScope.showAsserts = () =>
+  console.table(
+    initialScope.asserts?.map((r: any) => ({
+      status: r.success ? 'success' : 'fail',
+      assert: `${r.name}${!!r.description ? ': ' : ''}${r.description || ''}`.trim()
+    }))
+  );
 initialScope.print = (...args: any) =>
   logFn({
     time: new Date(),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jspython-cli",`
`3`		`- "version": "2.1.14",`
	`3`	`+ "version": "2.1.15",`
`4`	`4`	`"description": "CLI for jspython. Allows you to run jspython (*.jspy) files",`
`5`	`5`	`"main": "./lib/public-api.js",`
`6`	`6`	`"bin": {`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ async function main() {`
`90`	`90`	console.log(` :\> jspython -f (fileName.jspy)`);
`91`	`91`	console.log(` :\> jspython --file=(fileName.jspy)`);
`92`	`92`	console.log(` :\> jspython --file=(fileName.jspy) --srcRoot=src`);
	`93`	+ console.log(` :\> jspython --file=(fileName.jspy) --param1=someValue1 --param2=someValue2`);
`93`	`94`	`console.log(' ');`
`94`	`95`	`return;`
`95`	`96`	`}`