feat: list declarations under a public module if applicable

api-editor/gui/src/app/App.tsx

@@ -36,29 +36,21 @@ import {
     initializeUI,
     persistUI,
     selectCurrentUserAction,
-    selectFilter,
     selectShowAnnotationImportDialog,
     selectShowAPIImportDialog,
     selectShowUsageImportDialog,
     selectUI,
     setFilterString,
 } from '../features/ui/uiSlice';
 import { initializeUsages, persistUsages, selectUsages } from '../features/usages/usageSlice';
-import {
-    initializePythonPackage,
-    selectFilteredPythonPackage,
-    selectPythonPackage,
-} from '../features/packageData/apiSlice';
+import { initializePythonPackage, selectRawPythonPackage } from '../features/packageData/apiSlice';
 import { PythonClass } from '../features/packageData/model/PythonClass';
 import { PythonParameter } from '../features/packageData/model/PythonParameter';
 
 export const App: React.FC = function () {
     useIndexedDB();
 
-    const pythonPackage = useAppSelector(selectPythonPackage);
-    const usages = useAppSelector(selectUsages);
-    const pythonFilter = useAppSelector(selectFilter);
-    const filteredPythonPackage = useAppSelector(selectFilteredPythonPackage);
+    const pythonPackage = useAppSelector(selectRawPythonPackage);
 
     const [showInferErrorDialog, setShowInferErrorDialog] = useState(false);
     const [inferErrors, setInferErrors] = useState<string[]>([]);
@@ -68,7 +60,7 @@ export const App: React.FC = function () {
     };
 
     const currentUserAction = useAppSelector(selectCurrentUserAction);
-    const userActionTarget = pythonPackage.getByRelativePathAsString(currentUserAction.target);
+    const userActionTarget = pythonPackage.getDeclarationById(currentUserAction.target);
     const showAnnotationImportDialog = useAppSelector(selectShowAnnotationImportDialog);
     const showAPIImportDialog = useAppSelector(selectShowAPIImportDialog);
     const showUsagesImportDialog = useAppSelector(selectShowUsageImportDialog);
@@ -125,17 +117,15 @@ export const App: React.FC = function () {
                         />
                     )}
                     {currentUserAction.type === 'move' && <MoveForm target={userActionTarget || pythonPackage} />}
-                    {currentUserAction.type === 'none' && (
-                        <TreeView pythonPackage={filteredPythonPackage} filter={pythonFilter} usages={usages} />
-                    )}
+                    {currentUserAction.type === 'none' && <TreeView />}
                     {currentUserAction.type === 'optional' && (
                         <OptionalForm target={userActionTarget || pythonPackage} />
                     )}
                     {currentUserAction.type === 'rename' && <RenameForm target={userActionTarget || pythonPackage} />}
                     {currentUserAction.type === 'todo' && <TodoForm target={userActionTarget || pythonPackage} />}
                 </GridItem>
                 <GridItem gridArea="rightPane" overflow="auto">
-                    <SelectionView pythonPackage={pythonPackage} pythonFilter={pythonFilter} usages={usages} />
+                    <SelectionView />
                 </GridItem>
 
                 {showAnnotationImportDialog && <AnnotationImportDialog />}

api-editor/gui/src/common/GenerateAdapters.tsx

@@ -18,7 +18,7 @@ import React, { useRef, useState } from 'react';
 import { useAppSelector } from '../app/hooks';
 import { selectAnnotations } from '../features/annotations/annotationSlice';
 import { AnnotatedPythonPackageBuilder } from '../features/annotatedPackageData/model/AnnotatedPythonPackageBuilder';
-import { selectPythonPackage } from '../features/packageData/apiSlice';
+import { selectRawPythonPackage } from '../features/packageData/apiSlice';
 
 interface GenerateAdaptersProps {
     displayInferErrors: (errors: string[]) => void;
@@ -31,7 +31,7 @@ export const GenerateAdapters: React.FC<GenerateAdaptersProps> = function ({ dis
     const cancelRef = useRef(null);
 
     const annotationStore = useAppSelector(selectAnnotations);
-    const pythonPackage = useAppSelector(selectPythonPackage);
+    const pythonPackage = useAppSelector(selectRawPythonPackage);
 
     const packageNameIsValid = !shouldValidate || newPackageName !== '';
 

api-editor/gui/src/features/annotatedPackageData/model/AnnotatedPythonPackageBuilder.ts

@@ -17,6 +17,7 @@ import {
     InferableBoundaryAnnotation,
     InferableCalledAfterAnnotation,
     InferableConstantAnnotation,
+    InferableDescriptionAnnotation,
     InferableEnumAnnotation,
     InferableGroupAnnotation,
     InferableMoveAnnotation,
@@ -25,7 +26,6 @@ import {
     InferableRemoveAnnotation,
     InferableRenameAnnotation,
     InferableRequiredAnnotation,
-    InferableDescriptionAnnotation,
     InferableTodoAnnotation,
 } from './InferableAnnotation';
 
@@ -44,7 +44,7 @@ export class AnnotatedPythonPackageBuilder {
             this.pythonPackage.distribution,
             this.pythonPackage.version,
             this.#buildAnnotatedPythonModules(this.pythonPackage.modules),
-            this.#getExistingAnnotations(this.pythonPackage.pathAsString()),
+            this.#getExistingAnnotations(this.pythonPackage.id),
         );
     }
 
@@ -57,7 +57,7 @@ export class AnnotatedPythonPackageBuilder {
                     pythonModule.fromImports,
                     this.#buildAnnotatedPythonClasses(pythonModule),
                     this.#buildAnnotatedPythonFunctions(pythonModule),
-                    this.#getExistingAnnotations(pythonModule.pathAsString()),
+                    this.#getExistingAnnotations(pythonModule.id),
                 ),
         );
     }
@@ -74,7 +74,7 @@ export class AnnotatedPythonPackageBuilder {
                     pythonClass.isPublic,
                     pythonClass.description,
                     pythonClass.fullDocstring,
-                    this.#getExistingAnnotations(pythonClass.pathAsString()),
+                    this.#getExistingAnnotations(pythonClass.id),
                 ),
         );
     }
@@ -101,7 +101,7 @@ export class AnnotatedPythonPackageBuilder {
             pythonFunction.isPublic,
             pythonFunction.description,
             pythonFunction.fullDocstring,
-            this.#getExistingAnnotations(pythonFunction.pathAsString()),
+            this.#getExistingAnnotations(pythonFunction.id),
         );
     }
 
@@ -119,7 +119,7 @@ export class AnnotatedPythonPackageBuilder {
                     pythonParameter.isPublic,
                     pythonParameter.typeInDocs,
                     pythonParameter.description,
-                    this.#getExistingAnnotations(pythonParameter.pathAsString()),
+                    this.#getExistingAnnotations(pythonParameter.id),
                 ),
         );
     }
@@ -132,7 +132,7 @@ export class AnnotatedPythonPackageBuilder {
                     pythonResult.typeInDocs,
                     pythonResult.typeInDocs,
                     pythonResult.description,
-                    this.#getExistingAnnotations(pythonResult.pathAsString()),
+                    this.#getExistingAnnotations(pythonResult.id),
                 ),
         );
     }

api-editor/gui/src/features/annotations/forms/AttributeForm.tsx

@@ -9,7 +9,7 @@ interface AttributeFormProps {
 }
 
 export const AttributeForm: React.FC<AttributeFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
 
     // Hooks -----------------------------------------------------------------------------------------------------------
     const previousAnnotation = useAppSelector(selectAttribute(targetPath));

api-editor/gui/src/features/annotations/forms/BoundaryForm.tsx

@@ -52,7 +52,7 @@ const initialFormState = function (previousInterval: Optional<Interval>): Bounda
 };
 
 export const BoundaryForm: React.FC<BoundaryFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const prevInterval = useAppSelector(selectBoundary(targetPath))?.interval;
 
     // Hooks -----------------------------------------------------------------------------------------------------------

api-editor/gui/src/features/annotations/forms/CalledAfterForm.tsx

@@ -16,7 +16,7 @@ interface CalledAfterFormState {
 }
 
 export const CalledAfterForm: React.FC<CalledAfterFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const currentCalledAfters = Object.keys(useAppSelector(selectCalledAfters(targetPath)));
 
     const remainingCalledAfters = target

api-editor/gui/src/features/annotations/forms/ConstantForm.tsx

@@ -9,7 +9,7 @@ interface ConstantFormProps {
 }
 
 export const ConstantForm: React.FC<ConstantFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
 
     // Hooks -----------------------------------------------------------------------------------------------------------
     const constantDefinition = useAppSelector(selectConstant(targetPath));

api-editor/gui/src/features/annotations/forms/DescriptionForm.tsx

@@ -18,7 +18,7 @@ interface DescriptionFormState {
 }
 
 export const DescriptionForm: React.FC<DescriptionFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const prevNewDescription = useAppSelector(selectDescription(targetPath))?.newDescription;
     const oldDescription = target.description;
 

api-editor/gui/src/features/annotations/forms/EnumForm.tsx

@@ -31,10 +31,10 @@ interface EnumFormState {
 }
 
 export const EnumForm: React.FC<EnumFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
 
     // Hooks -----------------------------------------------------------------------------------------------------------
-    const enumDefinition = useAppSelector(selectEnum(target.pathAsString()));
+    const enumDefinition = useAppSelector(selectEnum(target.id));
     const dispatch = useAppDispatch();
 
     const {

api-editor/gui/src/features/annotations/forms/GroupForm.tsx

@@ -22,7 +22,7 @@ interface GroupFormState {
 }
 
 export const GroupForm: React.FC<GroupFormProps> = function ({ target, groupName }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const currentGroups = useAppSelector(selectGroups(targetPath));
     let prevGroupAnnotation: GroupAnnotation | undefined;
     if (groupName && currentGroups) {

api-editor/gui/src/features/annotations/forms/MoveForm.tsx

@@ -17,7 +17,7 @@ interface MoveFormState {
 }
 
 export const MoveForm: React.FC<MoveFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const prevDestination = useAppSelector(selectMove(targetPath))?.destination;
     const oldModulePath = target?.parent()?.name;
 

api-editor/gui/src/features/annotations/forms/OptionalForm.tsx

@@ -9,7 +9,7 @@ interface OptionalFormProps {
 }
 
 export const OptionalForm: React.FC<OptionalFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
 
     // Hooks -----------------------------------------------------------------------------------------------------------
     const optionalDefinition = useAppSelector(selectOptional(targetPath));

api-editor/gui/src/features/annotations/forms/RenameForm.tsx

@@ -17,7 +17,7 @@ interface RenameFormState {
 }
 
 export const RenameForm: React.FC<RenameFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const prevNewName = useAppSelector(selectRenaming(targetPath))?.newName;
     const oldName = target.name;
 

api-editor/gui/src/features/annotations/forms/TodoForm.tsx

@@ -16,7 +16,7 @@ interface TodoFormState {
 }
 
 export const TodoForm: React.FC<TodoFormProps> = function ({ target }) {
-    const targetPath = target.pathAsString();
+    const targetPath = target.id;
     const prevNewTodo = useAppSelector(selectTodo(targetPath))?.newTodo;
 
     // Hooks -----------------------------------------------------------------------------------------------------------