feat: handle possible non-static flags prop

salesforcecli · Jun 10, 2022 · 0cb2781 · 0cb2781
1 parent 2a6c99c
commit 0cb2781
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/rules/flagCrossReferences.ts b/src/rules/flagCrossReferences.ts
@@ -40,7 +40,7 @@ export const flagCrossReferences = ESLintUtils.RuleCreator.withoutDocs({
             .filter(Boolean);
 
           if (
-            flagsNode.type === 'PropertyDefinition' &&
+            flagsNode?.type === 'PropertyDefinition' &&
             flagsNode.key.type === 'Identifier' &&
             flagsNode.value.type === 'ObjectExpression'
           ) {

diff --git a/src/shared/flags.ts b/src/shared/flags.ts
@@ -29,8 +29,8 @@ export const isFlag = (node: TSESTree.Node): boolean =>
 
 export const isFlagsStaticProperty = (node: TSESTree.Node): boolean =>
   node.type === AST_NODE_TYPES.PropertyDefinition &&
-  node.value.type === AST_NODE_TYPES.ObjectExpression &&
+  node.static &&
+  node.value?.type === AST_NODE_TYPES.ObjectExpression &&
   node.key.type === AST_NODE_TYPES.Identifier &&
-  node.key?.name === 'flags' &&
-  node.accessibility === 'public' &&
-  node.static;
+  node.key.name === 'flags' &&
+  node.accessibility === 'public';
diff --git a/test/rules/flagCrossReferences.test.ts b/test/rules/flagCrossReferences.test.ts
@@ -22,6 +22,18 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
     'some-literal': Flags.string({}),
   }
 }
+`,
+    // non static other definition of flags
+    `
+    export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
+  public static flags = {
+    alias: Flags.string({
+      dependsOn: ['some-literal']
+    }),
+    'some-literal': Flags.string({}),
+  }
+  private flags: CmdFlags;
+}
 `,
     `
 export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {