@kubun/store-graph 0.16.0 → 0.17.0

package/lib/query-builder.js

@@ -75,7 +75,9 @@ function getOrderByFieldEntry(field) {
     const keys = [];
     let current = field;
     do {
-        const [key, value] = Object.entries(current)[0];
+        const entry = Object.entries(current)[0];
+        if (entry == null) break;
+        const [key, value] = entry;
         keys.push(key);
         if (typeof value === 'string') {
             return {
@@ -181,11 +183,15 @@ function buildKeysetPredicate(eb, orderBy, values, nullKeys, id, forward, coerce
     const idCmp = forward ? '>' : '<';
     const clauses = [];
     for(let level = 0; level < fields.length; level += 1){
+        const advanceField = fields[level];
+        if (advanceField == null) continue;
         const conjuncts = [];
         for(let prior = 0; prior < level; prior += 1){
-            conjuncts.push(equalTerm(eb, fields[prior]));
+            const priorField = fields[prior];
+            if (priorField == null) continue;
+            conjuncts.push(equalTerm(eb, priorField));
         }
-        conjuncts.push(advanceTerm(eb, fields[level]));
+        conjuncts.push(advanceTerm(eb, advanceField));
         clauses.push(eb.and(conjuncts));
     }
     const tieBreak = [];
@@ -232,10 +238,11 @@ function applyBackwardPagination(queryBuilder, limit, before, orderBy, coerce) {
 }
 export function applyDocumentFilter(eb, filter, adapter, path = [], coerce) {
     const entries = Object.entries(filter);
-    if (entries.length !== 1) {
+    const entry = entries[0];
+    if (entries.length !== 1 || entry == null) {
         throw new Error('Invalid document filter');
     }
-    const [type, value] = entries[0];
+    const [type, value] = entry;
     switch(type){
         case 'where':
             return applyObjectFilter(eb, value, adapter, path, coerce);
@@ -273,11 +280,12 @@ export function escapeLikePattern(value) {
 }
 export function applyValueFilter(eb, keys, filter, adapter, coerce) {
     const entries = Object.entries(filter);
-    if (entries.length !== 1) {
+    const entry = entries[0];
+    if (entries.length !== 1 || entry == null) {
         throw new Error('Invalid value filter');
     }
     const fieldName = getKeyPath(eb, keys);
-    const [type, value] = entries[0];
+    const [type, value] = entry;
     const c = coerce ?? ((v)=>v);
     switch(type){
         case 'isNull':
@@ -365,10 +373,11 @@ export function knownFieldColumn(keys) {
 }
 function applyOrderByField(query, adapter, orderBy, isReverse, path = []) {
     const entries = Object.entries(orderBy);
-    if (entries.length !== 1) {
+    const entry = entries[0];
+    if (entries.length !== 1 || entry == null) {
         throw new Error('Invalid order by field');
     }
-    const [key, value] = entries[0];
+    const [key, value] = entry;
     const keys = [
         ...path,
         key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/store-graph",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -15,16 +15,16 @@
     "LICENSE.md"
   ],
   "dependencies": {
-    "@kubun/db": "^0.16.0",
-    "@kubun/db-adapter": "^0.16.0",
-    "@kubun/id": "^0.16.0",
-    "@kubun/protocol": "^0.16.0",
+    "@kubun/db": "^0.17.0",
+    "@kubun/db-adapter": "^0.17.0",
+    "@kubun/id": "^0.17.0",
+    "@kubun/protocol": "^0.17.0",
     "@sozai/codec": "^0.4.0",
     "kysely": "^0.29.5"
   },
   "devDependencies": {
-    "@kubun/db-better-sqlite": "^0.16.0",
-    "@kubun/db-postgres": "^0.16.0",
+    "@kubun/db-better-sqlite": "^0.17.0",
+    "@kubun/db-postgres": "^0.17.0",
     "@testcontainers/postgresql": "^12.1.0"
   },
   "publishConfig": {
@@ -33,8 +33,8 @@
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "build:clean": "del lib",
-    "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
-    "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
+    "build:js": "del 'lib/**/*.js' && swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
+    "build:types": "del 'lib/**/*.d.ts' 'lib/**/*.d.ts.map' && tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "test": "pnpm run test:types && pnpm run test:unit",
     "test:types": "tsc --noEmit -p tsconfig.test.json",