refactor(pointfree): address TS strictNullChecks flag

thi-ng · Jun 7, 2019 · 50bf59a · 50bf59a
1 parent dd8806f
commit 50bf59a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/packages/pointfree-lang/src/index.ts b/packages/pointfree-lang/src/index.ts
@@ -28,7 +28,7 @@ const nodeLoc = (node: ASTNode) =>
  * @param ctx
  */
 const resolveSym = (node: ASTNode, ctx: pf.StackContext) => {
-    const id = node.id;
+    const id = node.id!;
     let w = ctx[2].__words[id] || ALIASES[id] || (<any>pf)[id];
     if (!w) {
         illegalArgs(`${nodeLoc(node)} unknown symbol: ${id}`);
@@ -47,7 +47,7 @@ const resolveSym = (node: ASTNode, ctx: pf.StackContext) => {
  * @param ctx
  */
 const resolveVar = (node: ASTNode, ctx: pf.StackContext) => {
-    const id = node.id;
+    const id = node.id!;
     const v = ctx[2].__vars[id];
     if (!v) {
         illegalArgs(`${nodeLoc(node)} unknown var: ${id}`);
@@ -72,7 +72,7 @@ const resolveNode = (node: ASTNode, ctx: pf.StackContext): any => {
         case NodeType.VAR_DEREF:
             return resolveVar(node, ctx);
         case NodeType.VAR_STORE:
-            return storevar(node.id);
+            return storevar(node.id!);
         case NodeType.ARRAY:
             return resolveArray(node, ctx);
         case NodeType.OBJ:
@@ -267,7 +267,7 @@ const visitStore = (
     ctx: pf.StackContext,
     state: VisitorState
 ) => {
-    const id = node.id;
+    const id = node.id!;
     if (state.word) {
         ctx[0].push(storevar(id));
         return ctx;
@@ -295,7 +295,7 @@ const visitWord = (
     ctx: pf.StackContext,
     state: VisitorState
 ) => {
-    const id = node.id;
+    const id = node.id!;
     if (state.word) {
         illegalState(
             `${nodeLoc(node)}: can't define words inside quotations (${id})`

diff --git a/packages/pointfree-lang/src/parser.ts b/packages/pointfree-lang/src/parser.ts
@@ -3,8 +3,8 @@
 // Stubs for auto-generated parser module (using pegjs 0.10.+)
 // To rebuild the parser run either: `yarn build` or `yarn peg`
 export class SyntaxError {
-    message: string;
-    expected: string;
+    message!: string;
+    expected!: string;
     found: any;
     location: any;
 }

diff --git a/packages/pointfree/src/index.ts b/packages/pointfree/src/index.ts
@@ -287,7 +287,7 @@ export const op2v = (f: Fn2<any, any, any>) => (
             illegalArgs("at least one arg must be an array");
         }
     }
-    stack[n] = c;
+    stack[n] = c!;
     return ctx;
 };
 
@@ -1250,6 +1250,7 @@ export const cases = (cases: IObjectOf<StackProc>) => (ctx: StackContext) => {
         return $stackFn(cases.default)(ctx);
     }
     illegalState(`no matching case for: ${tos}`);
+    return ctx;
 };
 
 export const casesq = (ctx: StackContext) => {