feat: 不要な関数とインポートを削除し、FirestoreのURL生成を修正

Author: nabettu

src/client.ts

@@ -5,7 +5,7 @@ import {
   convertToFirestoreDocument,
   convertToFirestoreValue,
 } from "./utils/converter";
-import { getFirestoreBasePath, getFirestoreCollectionPath } from "./utils/path";
+import { getFirestoreBasePath } from "./utils/path";
 import { formatPrivateKey } from "./utils/config";
 import { FirestorePath, createFirestorePath } from "./utils/path";
 
@@ -615,9 +615,9 @@ export class FirestoreClient {
 
     const url = `${getFirestoreBasePath(
       this.config.projectId,
-      collectionName,
-      this.config.databaseId
-    )}/${documentId}`;
+      this.config.databaseId,
+      this.config
+    )}/${collectionName}/${documentId}`;
 
     const firestoreData = convertToFirestoreDocument(data);
 

src/index.ts

@@ -23,7 +23,7 @@ export {
   convertFromFirestoreDocument,
 } from "./utils/converter";
 export { getFirestoreBasePath, getDocumentId } from "./utils/path";
-export { formatPrivateKey, formatConfig } from "./utils/config";
+export { formatPrivateKey } from "./utils/config";
 
 // クライアント関連のエクスポート
 export {

src/utils/config.ts

@@ -12,14 +12,3 @@ export function formatPrivateKey(privateKey: string): string {
   return privateKey;
 }
 
-/**
- * FirestoreConfigオブジェクトの秘密鍵をフォーマットする
- * @param config 元のconfigオブジェクト
- * @returns 秘密鍵をフォーマットしたconfigオブジェクト
- */
-export function formatConfig(config: FirestoreConfig): FirestoreConfig {
-  return {
-    ...config,
-    privateKey: formatPrivateKey(config.privateKey),
-  };
-}

src/utils/path.ts

@@ -141,7 +141,7 @@ export class FirestorePath {
    */
   getRunQueryPath(collectionPath: string): string {
     // コレクションパス情報を取得
-    const { url, collectionId, parentPath } = this.getQueryPath(collectionPath);
+    const { collectionId, parentPath } = this.getQueryPath(collectionPath);
 
     // parentPathがある場合は、親ドキュメントパスを使用してURLを作成
     if (parentPath) {
@@ -209,26 +209,6 @@ export function getFirestoreBasePath(
   }/documents`;
 }
 
-/**
- * Get Firestore URL with collection path
- * @param projectId Project ID
- * @param collectionPath Collection path
- * @param databaseId Database ID (defaults to default)
- * @param config Firestore configuration (for emulator settings)
- * @returns Firestore URL with collection path
- */
-export function getFirestoreCollectionPath(
-  projectId: string,
-  collectionPath: string,
-  databaseId?: string,
-  config?: FirestoreConfig
-): string {
-  // Remove leading and trailing slashes
-  const cleanPath = collectionPath.replace(/^\/+|\/+$/g, '');
-  
-  // ベースパスを取得して、コレクションパスを追加
-  return `${getFirestoreBasePath(projectId, databaseId, config)}/${cleanPath}`;
-}
 
 /**
  * Extract document ID from document path

test/helpers.ts

@@ -62,22 +62,3 @@ export function getTestCollectionName(prefix: string = "test"): string {
   return `${prefix}_${timestamp}_${random}`;
 }
 
-/**
- * Cleanup process for test data
- * @param client FirestoreClient
- * @param collectionName Collection name
- * @param docIds Array of document IDs
- */
-export async function cleanupTestData(
-  client: any,
-  collectionName: string,
-  docIds: string[]
-): Promise<void> {
-  for (const id of docIds) {
-    try {
-      await client.delete(collectionName, id);
-    } catch (err) {
-      console.error(`Clean up failed for document ${id}: ${err}`);
-    }
-  }
-}