@fimbul/mimir - npm Package Compare versions

Comparing version 0.12.0-dev.20180628 to 0.12.0-dev.20180629

package.json

 {
   "name": "@fimbul/mimir",
-  "version": "0.12.0-dev.20180628",
+  "version": "0.12.0-dev.20180629",
   "description": "Core rules of the Fimbullinter project",
@@ -5,0 +5,0 @@ "main": "recommended.yaml",

src/rules/no-unstable-api-use.js

@@ -68,3 +68,3 @@ "use strict";
                 else {
-                    for (const { symbol, name } of utils_1.propertiesOfType(type, utils_1.lateBoundPropertyNames(element.propertyName.expression, this.checker)))
+                    for (const { symbol, name } of utils_1.propertiesOfType(type, utils_1.lateBoundPropertyNames(element.propertyName.expression, this.checker).properties))
                         this.checkStability(symbol, element.propertyName, name, describeWithName);
@@ -71,0 +71,0 @@ }

src/rules/no-useless-initializer.js

@@ -63,3 +63,3 @@ "use strict";
     }
-    checkBindingPattern(node, getPropName) {
+    checkBindingPattern(node, propNames) {
         if (this.program === undefined || !utils_1.isStrictNullChecksEnabled(this.program.getCompilerOptions()))
@@ -73,8 +73,5 @@ return;
                 continue;
-            const name = getPropName(element, i);
-            if (name === undefined)
+            const lateBoundNames = propNames(element, i, checker);
+            if (!lateBoundNames.known || lateBoundNames.properties.some(maybeUndefined))
                 continue;
-            const symbol = (type || (type = checker.getApparentType(checker.getTypeAtLocation(node)))).getProperty(name);
-            if (symbol === undefined || symbolMaybeUndefined(checker, symbol, node))
-                continue;
             const fix = checker.getTypeAtLocation(element.name).flags & (ts.TypeFlags.Union | ts.TypeFlags.Any | ts.TypeFlags.Unknown)
@@ -85,2 +82,6 @@ ? undefined
         }
+        function maybeUndefined({ symbolName }) {
+            const symbol = utils_1.getPropertyOfType(type || (type = checker.getApparentType(checker.getTypeAtLocation(node))), symbolName);
+            return symbol === undefined || symbolMaybeUndefined(checker, symbol, node);
+        }
     }
@@ -129,7 +130,11 @@ checkFunctionParameters(parameters) {
 exports.Rule = Rule;
-function getObjectPropertyName(property) {
-    return tsutils_1.getPropertyName(property.propertyName === undefined ? property.name : property.propertyName);
+function getObjectPropertyName(property, _i, checker) {
+    const staticName = tsutils_1.getPropertyName(property.propertyName === undefined ? property.name : property.propertyName);
+    return staticName !== undefined
+        ? { known: true, properties: [{ name: staticName, symbolName: utils_1.escapeIdentifier(staticName) }] }
+        : utils_1.lateBoundPropertyNames(property.propertyName.expression, checker);
 }
 function getArrayPropertyName(_, i) {
-    return String(i);
+    const name = String(i);
+    return { known: true, properties: [{ name, symbolName: name }] };
 }
@@ -136,0 +141,0 @@ function symbolMaybeUndefined(checker, symbol, node) {

src/utils.d.ts

@@ -23,9 +23,12 @@ import * as ts from 'typescript';
 }>;
+export declare function getPropertyOfType(type: ts.Type, name: ts.__String): ts.Symbol | undefined;
+export interface LateBoundPropertyInfo {
+    known: boolean;
+    properties: LateBoundPropertyName[];
+}
 export interface LateBoundPropertyName {
     name: string;
-    symbolName: string;
+    symbolName: ts.__String;
 }
-export declare function lateBoundPropertyNames(node: ts.Expression, checker: ts.TypeChecker): IterableIterator<{
-    name: string;
-    symbolName: string;
-}>;
+export declare function lateBoundPropertyNames(node: ts.Expression, checker: ts.TypeChecker): LateBoundPropertyInfo;
+export declare function escapeIdentifier(name: string): ts.__String;

src/utils.js

@@ -145,3 +145,3 @@ "use strict";
         return;
-    yield* propertiesOfType(checker.getApparentType(checker.getTypeAtLocation(node.expression)), lateBoundPropertyNames(argumentExpression, checker));
+    yield* propertiesOfType(checker.getApparentType(checker.getTypeAtLocation(node.expression)), lateBoundPropertyNames(argumentExpression, checker).properties);
 }
@@ -151,3 +151,3 @@ exports.elementAccessSymbols = elementAccessSymbols;
     for (const { symbolName, name } of names) {
-        const symbol = type.getProperties().find((s) => s.escapedName === symbolName);
+        const symbol = getPropertyOfType(type, symbolName);
         if (symbol !== undefined)
@@ -158,10 +158,16 @@ yield { symbol, name };
 exports.propertiesOfType = propertiesOfType;
-function* lateBoundPropertyNames(node, checker) {
+function getPropertyOfType(type, name) {
+    return type.getProperties().find((s) => s.escapedName === name);
+}
+exports.getPropertyOfType = getPropertyOfType;
+function lateBoundPropertyNames(node, checker) {
+    let known = true;
+    const properties = [];
     if (tsutils_1.isPropertyAccessExpression(node) &&
         tsutils_1.isIdentifier(node.expression) &&
         node.expression.text === 'Symbol') {
-        yield {
+        properties.push({
             name: `Symbol.${node.name.text}`,
             symbolName: `__@${node.name.text}`,
-        };
+        });
     }
@@ -173,14 +179,19 @@ else {
                 const name = String(key.value);
-                yield {
+                properties.push({
                     name,
                     symbolName: escapeIdentifier(name),
-                };
+                });
             }
+            else {
+                known = false;
+            }
         }
     }
+    return { known, properties };
 }
 exports.lateBoundPropertyNames = lateBoundPropertyNames;
 function escapeIdentifier(name) {
-    return name.startsWith('__') ? '_' + name : name;
+    return (name.startsWith('__') ? '_' + name : name);
 }
+exports.escapeIdentifier = escapeIdentifier;
 //# sourceMappingURL=utils.js.map

No alert changes

Improved metrics

Total package byte prevSize

358314

increased by0.51%

Lines of code

3810

increased by0.5%

No dependency changes