Merge main into sweep/fix-vectorstoreindex-init

packages/core/src/indices/vectorStore/VectorStoreIndex.ts

@@ -93,13 +93,14 @@ export class VectorStoreIndex extends BaseIndex<IndexDict> {
         throw new Error(
           "Cannot initialize VectorStoreIndex without nodes or indexStruct"
         );
+      } else {
+        indexStruct = await VectorStoreIndex.buildIndexFromNodes(
+          options.nodes,
+          serviceContext,
+          vectorStore,
+          docStore
+        );
       }
-      indexStruct = await VectorStoreIndex.buildIndexFromNodes(
-        options.nodes,
-        serviceContext,
-        vectorStore,
-        docStore
-      );
 
       await indexStore.addIndexStruct(indexStruct);
     }
@@ -219,4 +220,4 @@ export class VectorStoreIndex extends BaseIndex<IndexDict> {
     const { retriever, responseSynthesizer } = options ?? {};
     return new RetrieverQueryEngine(retriever ?? this.asRetriever(), responseSynthesizer);
   }
-}
+}