[FIX] Fix error handling and reporting of stereotype.

shellyln · Mar 1, 2020 · a0f5e57 · a0f5e57
1 parent 30d55f2
commit a0f5e57
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.3.1
+
+* `[FIX]` Fix error handling and reporting of stereotype.
+* Improve playground.
+
+
 ## v0.3.0
 
 * Add `@stereotype` decorator.

diff --git a/docs/playground/assets/script/playground2.js b/docs/playground/assets/script/playground2.js
@@ -24,6 +24,9 @@ interface EntryBase {
     name: string;
     /** ACL infos */
     acl: ACL[];
+    /** Timestamp */
+    @stereotype('datetime')
+    timestamp: string;
 }
 
 /** File entry */
@@ -239,6 +242,7 @@ class App extends React.Component {
             const ctx = {
                 checkAll: true,
                 schema,
+                stereotypes: new Map(tynder.stereotypes),
             };
             if (tynder.validate(JSON.parse(data), tynder.getType(schema, targetEntryName.value), ctx)) {
                 r = `Validation succeeded. (Tynder)`;
@@ -306,8 +310,26 @@ class App extends React.Component {
             targetEntryName.value = 'Folder';
         }
         {
+            const now = new Date();
             const editor = AppState.AceEditor['dataEditor'];
-            editor.setValue(`{}`);
+            editor.setValue(JSON.stringify({
+                type: 'folder',
+                name: 'foo',
+                entries: [{
+                    type: 'file',
+                    name: 'bar',
+                    acl: [{
+                        target: 'a',
+                        value: 'deny',
+                    }],
+                    timestamp: now.toISOString(),
+                }],
+                acl: [{
+                    target: 'a',
+                    value: 'deny',
+                }],
+                timestamp: now.toISOString(),
+            }, null, 2));
             editor.clearSelection();
         }
     }

diff --git a/src/lib/reporter.ts b/src/lib/reporter.ts
@@ -172,6 +172,8 @@ export function formatErrorMessage(
 
     const dict = new Map<string, string>([
         ['expectedType',
+            ty.stereotype ?
+                ty.stereotype :
             escapeString(getExpectedType(ty))],
         ['type',
             escapeString(typeof data)],

diff --git a/src/validator.ts b/src/validator.ts
@@ -179,6 +179,7 @@ function validatePrimitiveTypeAssertion<T>(
 
     let chkSt = checkStereotypes(chkTarget, ty, ctx);
     if (chkSt === null) {
+        reportError(ErrorTypes.TypeUnmatched, data, ty, {ctx});
         return null;
     } else if (chkSt === false) {
         chkSt = {