@shisyamo4131/air-firebase-v2-client-adapter 2.1.2 → 2.1.3-dev.1

package/error.js

@@ -70,6 +70,11 @@ export const ERRORS = {
     message: "search string cannot be empty",
     userMessage: "検索文字列を入力してください",
   },
+  VALIDATION_FIELD_ERROR: {
+    code: "VALIDATION/FIELD_ERROR",
+    message: "validation failed",
+    userMessage: "入力内容に誤りがあります",
+  },
 
   // データベース操作エラー (DATABASE)
   DATABASE_DOCUMENT_NOT_FOUND: {

package/index.js

@@ -62,7 +62,7 @@ class ClientAdapter {
   get auth() {
     if (!ClientAdapter.auth) {
       throw new ClientAdapterError(
-        ERRORS.SYSTEM_AUTHENTICATION_NOT_INITIALIZED
+        ERRORS.SYSTEM_AUTHENTICATION_NOT_INITIALIZED,
       );
     }
     return ClientAdapter.auth;
@@ -129,7 +129,7 @@ class ClientAdapter {
       const collectionPath = this.constructor.getCollectionPath(prefix);
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
 
       return doc(colRef, docId);
@@ -171,7 +171,7 @@ class ClientAdapter {
       const docSnap = await transaction.get(docRef);
       if (!docSnap.exists()) {
         throw new ClientAdapterError(
-          ERRORS.BUSINESS_AUTONUMBER_DOCUMENT_NOT_FOUND
+          ERRORS.BUSINESS_AUTONUMBER_DOCUMENT_NOT_FOUND,
         );
       }
 
@@ -298,7 +298,7 @@ class ClientAdapter {
         const collectionPath = this.constructor.getCollectionPath(prefix);
         const colRef = collection(
           ClientAdapter.firestore,
-          collectionPath
+          collectionPath,
         ).withConverter(this.constructor.converter());
         const docRef = docId ? doc(colRef, docId) : doc(colRef);
 
@@ -332,9 +332,13 @@ class ClientAdapter {
     } catch (err) {
       if (err instanceof ClientAdapterError) {
         throw err;
+      } else if (err.name === "ValidationError") {
+        // BaseClass のエラーをそのままスローする
+        // throw new ClientAdapterError(ERRORS.VALIDATION_FIELD_ERROR, err);
+        throw err;
       } else {
         this._outputErrorConsole("create", err);
-        throw new ClientAdapterError(ERRORS.SYSTEM_UNKNOWN_ERROR);
+        throw new ClientAdapterError(ERRORS.SYSTEM_UNKNOWN_ERROR, err);
       }
     }
   }
@@ -361,7 +365,7 @@ class ClientAdapter {
       // Prepare document reference.
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
       const docRef = doc(colRef, docId);
 
@@ -406,7 +410,7 @@ class ClientAdapter {
       // Prepare document reference.
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
       const docRef = doc(colRef, docId);
 
@@ -448,7 +452,7 @@ class ClientAdapter {
         case "orderBy":
           if (!["asc", "desc"].includes(args[1] || "asc")) {
             throw new ClientAdapterError(
-              ERRORS.VALIDATION_INVALID_ORDERBY_DIRECTION
+              ERRORS.VALIDATION_INVALID_ORDERBY_DIRECTION,
             );
           }
           result.push(orderBy(args[0], args[1] || "asc"));
@@ -486,7 +490,7 @@ class ClientAdapter {
     // サロゲートペア文字（絵文字など）を除外
     const target = constraints.replace(
       /[\uD800-\uDBFF]|[\uDC00-\uDFFF]|~|\*|\[|\]|\s+/g,
-      ""
+      "",
     );
 
     // 1 文字・2 文字のトークンを生成
@@ -548,7 +552,7 @@ class ClientAdapter {
       const collectionPath = this.constructor.getCollectionPath(prefix);
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
 
       const queryRef = query(colRef, ...queryConstraints);
@@ -602,7 +606,7 @@ class ClientAdapter {
       const collectionPath = this.constructor.getCollectionPath(prefix);
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
 
       const querySnapshotArray = await Promise.all(
@@ -611,11 +615,11 @@ class ClientAdapter {
           return getDocs(q);
           /** transaction.get() が Query に対応した場合は以下を使用 */
           // return transaction ? transaction.get(q) : getDocs(q);
-        })
+        }),
       );
 
       return querySnapshotArray.flatMap((snapshot) =>
-        snapshot.docs.map((doc) => doc.data())
+        snapshot.docs.map((doc) => doc.data()),
       );
     } catch (err) {
       if (err instanceof ClientAdapterError) {
@@ -672,7 +676,7 @@ class ClientAdapter {
         const collectionPath = this.constructor.getCollectionPath(prefix);
         const colRef = collection(
           ClientAdapter.firestore,
-          collectionPath
+          collectionPath,
         ).withConverter(this.constructor.converter());
         const docRef = doc(colRef, this.docId);
 
@@ -692,9 +696,13 @@ class ClientAdapter {
     } catch (err) {
       if (err instanceof ClientAdapterError) {
         throw err;
+      } else if (err.name === "ValidationError") {
+        // BaseClass のエラーをそのままスローする
+        // throw new ClientAdapterError(ERRORS.VALIDATION_FIELD_ERROR, err);
+        throw err;
       } else {
         this._outputErrorConsole("update", err);
-        throw new ClientAdapterError(ERRORS.SYSTEM_UNKNOWN_ERROR);
+        throw new ClientAdapterError(ERRORS.SYSTEM_UNKNOWN_ERROR, err);
       }
     }
   }
@@ -830,7 +838,7 @@ class ClientAdapter {
           const sourceDocData = sourceDocSnap.data();
           const archiveColRef = collection(
             ClientAdapter.firestore,
-            `${collectionPath}_archive`
+            `${collectionPath}_archive`,
           );
           const archiveDocRef = doc(archiveColRef, this.docId);
           txn.set(archiveDocRef, sourceDocData);
@@ -909,7 +917,7 @@ class ClientAdapter {
       } else {
         return await runTransaction(
           ClientAdapter.firestore,
-          performTransaction
+          performTransaction,
         );
       }
     } catch (err) {
@@ -966,7 +974,7 @@ class ClientAdapter {
       // const colRef = collection(ClientAdapter.firestore, collectionPath);
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
       const docRef = doc(colRef, docId);
       this.listener = onSnapshot(docRef, (docSnapshot) => {
@@ -1004,7 +1012,7 @@ class ClientAdapter {
       prefix = null,
       callback: deprecatedCallback = null,
     } = {},
-    callback = null
+    callback = null,
   ) {
     /**
      * [DEPRECATION NOTICE]
@@ -1013,13 +1021,13 @@ class ClientAdapter {
      */
     if (deprecatedCallback) {
       console.warn(
-        "[FireModel-subscribeDocs] The 'callback' parameter has been moved from the options object to a separate parameter. Please update your code accordingly."
+        "[FireModel-subscribeDocs] The 'callback' parameter has been moved from the options object to a separate parameter. Please update your code accordingly.",
       );
       if (!callback) {
         callback = deprecatedCallback;
       } else {
         console.warn(
-          "[FireModel-subscribeDocs] The 'callback' parameter was provided both in the options object and as a separate parameter. The separate parameter will take precedence."
+          "[FireModel-subscribeDocs] The 'callback' parameter was provided both in the options object and as a separate parameter. The separate parameter will take precedence.",
         );
       }
     }
@@ -1043,7 +1051,7 @@ class ClientAdapter {
       const collectionPath = this.constructor.getCollectionPath(prefix);
       const colRef = collection(
         ClientAdapter.firestore,
-        collectionPath
+        collectionPath,
       ).withConverter(this.constructor.converter());
       const queryRef = query(colRef, ...queryConstraints);
 
@@ -1051,7 +1059,7 @@ class ClientAdapter {
         snapshot.docChanges().forEach((change) => {
           const item = change.doc.data();
           const index = this.docs.findIndex(
-            ({ docId }) => docId === item.docId
+            ({ docId }) => docId === item.docId,
           );
           if (change.type === "added") this.docs.push(item);
           if (change.type === "modified") this.docs.splice(index, 1, item);

package/package.json

@@ -1,43 +1,43 @@
-{
-  "name": "@shisyamo4131/air-firebase-v2-client-adapter",
-  "version": "2.1.2",
-  "description": "client adapter for FireModel",
-  "type": "module",
-  "main": "index.js",
-  "exports": {
-    ".": "./index.js"
-  },
-  "files": [
-    "index.js",
-    "error.js"
-  ],
-  "keywords": [
-    "firebase",
-    "firestore",
-    "client",
-    "adapter"
-  ],
-  "author": "shisyamo4131",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/shisyamo4131/air-firebase-v2-client-adapter.git"
-  },
-  "scripts": {
-    "dev:publish": "npm version prerelease --preid=dev && npm publish --tag dev",
-    "release:patch": "npm version patch && npm publish",
-    "release:minor": "npm version minor && npm publish",
-    "release:major": "npm version major && npm publish",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "firebase": "^10.0.0 || ^11.0.0"
-  },
-  "devDependencies": {
-    "@jest/globals": "^30.2.0",
-    "jest": "^30.2.0"
-  }
-}
+{
+  "name": "@shisyamo4131/air-firebase-v2-client-adapter",
+  "version": "2.1.3-dev.1",
+  "description": "client adapter for FireModel",
+  "type": "module",
+  "main": "index.js",
+  "exports": {
+    ".": "./index.js"
+  },
+  "files": [
+    "index.js",
+    "error.js"
+  ],
+  "keywords": [
+    "firebase",
+    "firestore",
+    "client",
+    "adapter"
+  ],
+  "author": "shisyamo4131",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/shisyamo4131/air-firebase-v2-client-adapter.git"
+  },
+  "scripts": {
+    "dev:publish": "npm version prerelease --preid=dev && npm publish --tag dev",
+    "release:patch": "npm version patch && npm publish",
+    "release:minor": "npm version minor && npm publish",
+    "release:major": "npm version major && npm publish",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "peerDependencies": {
+    "firebase": "^10.0.0 || ^11.0.0"
+  },
+  "devDependencies": {
+    "@jest/globals": "^30.2.0",
+    "jest": "^30.2.0"
+  }
+}