@litert/typeguard 1.1.0 → 1.3.0

package/src/test/09-exceptions.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Angus.Fenying <fenying@litert.org>
+ * Copyright 2022 Angus Fenying <fenying@litert.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ const testItems: ITestSuite = {
             'items': [
                 {
                     inputName: 'When test === \'ffff\'',
-                    inputValue: {'test': 'ffff'},
+                    inputValue: { 'test': 'ffff' },
                     expect: true
                 },
                 {
@@ -46,12 +46,12 @@ const testItems: ITestSuite = {
             'items': [
                 {
                     inputName: 'When test === 123',
-                    inputValue: {'test': 123},
+                    inputValue: { 'test': 123 },
                     expect: true
                 },
                 {
                     inputName: 'When test === 1234',
-                    inputValue: {'test': 1234},
+                    inputValue: { 'test': 1234 },
                     expect: false
                 },
                 {

package/src/test/abstracts.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Angus.Fenying <fenying@litert.org>
+ * Copyright 2022 Angus Fenying <fenying@litert.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,6 +103,26 @@ export function defaultItemss(
 
 const compiler = TypeGuard.createInlineCompiler();
 
+compiler.addPredefinedType<string>(
+    'ipv4_address',
+    function(i): i is string {
+        return  typeof i === 'string'
+            && /^[0-9]{1,3}(\.[0-9]{1,3}){3}$/.test(i)
+            && i.split('.').map(x => parseInt(x, 10)).every(x => x >= 0 && x <= 255);
+    }
+);
+
+const compiler2 = TypeGuard.createInlineCompiler();
+
+compiler2.addPredefinedType<string>(
+    'ipv4_address',
+    function(i): i is string {
+        return  typeof i === 'string'
+            && /^[0-9]{1,3}(\.[0-9]{1,3}){3}$/.test(i)
+            && i.split('.').map(x => parseInt(x, 10)).every(x => x >= 0 && x <= 255);
+    }
+);
+
 export function assertItem(input: unknown, expect: boolean | 'throw'): ITestItem {
 
     return {
@@ -127,7 +147,7 @@ export function createTestDefinition(suite: ITestSuite) {
 
         describe(suite.name, function() {
 
-            for (let section of suite.sections) {
+            for (const section of suite.sections) {
 
                 describe(section.name, function() {
 
@@ -141,18 +161,31 @@ export function createTestDefinition(suite: ITestSuite) {
                             assert.throws(() => {
 
                                 compiler.compile<any>({
-                                    'rule': section.rule
+                                    'rule': section.rule,
+                                    traceErrors: true,
+                                });
+                            });
+
+                            assert.throws(() => {
+
+                                compiler2.compile<any>({
+                                    'rule': section.rule,
                                 });
                             });
                         });
                         return;
                     }
 
-                    const check = compiler.compile<any>({
-                        'rule': section.rule
+                    const checkWithTrace = compiler.compile<any>({
+                        'rule': section.rule,
+                        traceErrors: true,
                     });
 
-                    for (let item of section.items.sort((a, b) => a.expect === b.expect ? 0 : (a.expect ? -1 : 1))) {
+                    const checkWithoutTrace = compiler2.compile<any>({
+                        'rule': section.rule,
+                    });
+
+                    for (const item of section.items.sort((a, b) => a.expect === b.expect ? 0 : (a.expect ? -1 : 1))) {
 
                         it(`${
                             item.expect ? 'PASSED' : 'REJECTED'
@@ -161,7 +194,12 @@ export function createTestDefinition(suite: ITestSuite) {
                         }.`, function() {
 
                             assert.equal(
-                                check(item.inputValue),
+                                checkWithTrace(item.inputValue),
+                                item.expect
+                            );
+
+                            assert.equal(
+                                checkWithoutTrace(item.inputValue),
                                 item.expect
                             );
                         });