Don't error on other modules. Oops

jacobgardner · Jul 8, 2019 · 5d9b764 · 5d9b764
1 parent 59882cf
commit 5d9b764
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -7,6 +7,9 @@ export function assertIsType<T = _RUNTIME_CHECK_ANY>(
 
 export function isType<T = _RUNTIME_CHECK_ANY>(data: unknown): data is T;
 
+// This is a useless function for the default export so it's not used
+export default function(arg: never): never;
+
 // export class _RUNTIME_CHECK_VALIDATION_ERROR {}
 
 // export class ValidationError extends _RUNTIME_CHECK_VALIDATION_ERROR {}
diff --git a/src/main.ts b/src/main.ts
@@ -36,7 +36,7 @@ export default function transformer(program: ts.Program /*, config: Config*/) {
             if (errors.length) {
                 const lines = errors.map(
                     ({ message, file, line, character }) =>
-                        `Error [runtime-check transform]: ${message}. This error occured in ${file}, Line: ${line}:${character}`,
+                        `Error [runtime-check transform]: ${message}. This error occured in ${file}:${line}:${character}`,
                 );
 
                 throw new Error(lines.join('\n'));

diff --git a/src/validationVisitor.ts b/src/validationVisitor.ts
@@ -15,6 +15,18 @@ import { writeRuntimeValidatorToFile } from './buildRuntimeValidator';
 // TODO: This can all be broken up/abstracted/fped quite a bit.
 // TODO: Organize this better in a way that makes more logical sense
 
+function isImportThisModule(node: ts.ImportDeclaration): boolean {
+    const { moduleSpecifier } = node;
+
+    if (ts.isStringLiteral(moduleSpecifier)) {
+        if (moduleSpecifier.text === pjson.name) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 /*
     This is where most of the work occurs for discovering the validation
     functions and converting them to the usable types in the final build.
@@ -114,11 +126,16 @@ export class ValidationVisitor {
         if (namedBindings) {
             if (ts.isNamespaceImport(namedBindings)) {
                 // * as something
-                // TODO: Implement
-                return emitErrorFromNode(
-                    node,
-                    `Namespace import is not yet supported.  Please use \`import { ${TYPE_ASSERTION_NAME} } from '${pjson.name}';\``,
-                );
+
+                if (isImportThisModule(node)) {
+                    // TODO: Implement
+                    return emitErrorFromNode(
+                        node,
+                        `Namespace import is not yet supported.  Please use \`import { ${TYPE_ASSERTION_NAME} } from '${pjson.name}';\``,
+                    );
+                }
+
+                return node;
             } else {
                 // {namedImports}
                 return transformNamedImport(
@@ -130,11 +147,17 @@ export class ValidationVisitor {
             }
         } else if (name) {
             // defaultImport
-            // TODO: Implement
-            return emitErrorFromNode(
-                node,
-                `Default import is not yet supported.  Please use \`import { ${TYPE_ASSERTION_NAME} } from '${pjson.name}';\``,
-            );
+
+            // TODO: Add regression tests making sure to test files where other
+            // modules are being imported....
+            if (isImportThisModule(node)) {
+                return emitErrorFromNode(
+                    node,
+                    `Default import is not yet supported.  Please use \`import { ${TYPE_ASSERTION_NAME} } from '${pjson.name}';\``,
+                );
+            }
+
+            return node;
         }
 
         return node;