@livestore/common 0.0.0-snapshot-0ea0f9cf4fb7c87dd5ca044f8ba1174a4abfdbf5 → 0.0.0-snapshot-8e23ca9deecae64b6db144b5968c53749e32d627

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/query-builder/impl.d.ts.map +1 -1
  3. package/dist/query-builder/impl.js +21 -4
  4. package/dist/query-builder/impl.js.map +1 -1
  5. package/package.json +3 -3
  6. package/src/query-builder/impl.ts +20 -4
package/dist/query-builder/impl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG7D,eAAO,MAAM,gBAAgB,GAAI,OAAO,EAAE,SAAS,SAAS,QAAQ,CAAC,YAAY,YACrE,SAAS,QACd,eAAe,KACnB,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAsJxD,CAAA;AAsFD,eAAO,MAAM,mBAAmB,SAAU,MAAM,UAE/C,CAAA;AAED,eAAO,MAAM,eAAe,OAAQ,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;;;WAkB9D,CAAA"}
1
+ {"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG7D,eAAO,MAAM,gBAAgB,GAAI,OAAO,EAAE,SAAS,SAAS,QAAQ,CAAC,YAAY,YACrE,SAAS,QACd,eAAe,KACnB,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CA6JxD,CAAA;AA+FD,eAAO,MAAM,mBAAmB,SAAU,MAAM,UAE/C,CAAA;AAED,eAAO,MAAM,eAAe,OAAQ,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;;;WAkB9D,CAAA"}
package/dist/query-builder/impl.js CHANGED
@@ -124,7 +124,15 @@ export const makeQueryBuilder = (tableDef, ast = emptyAst(tableDef)) => {
124
124
  [TypeId]: TypeId,
125
125
  [QueryBuilderAstSymbol]: ast,
126
126
  asSql: () => astToSql(ast),
127
- toString: () => astToSql(ast).query,
127
+ toString: () => {
128
+ try {
129
+ return astToSql(ast).query;
130
+ }
131
+ catch (cause) {
132
+ console.debug(`QueryBuilder.toString(): Error converting query builder to string`, cause, ast);
133
+ return `Error converting query builder to string`;
134
+ }
135
+ },
128
136
  ...api,
129
137
  };
130
138
  };
@@ -162,9 +170,18 @@ const astToSql = (ast) => {
162
170
  if (colDef === undefined) {
163
171
  throw new Error(`Column ${col} not found`);
164
172
  }
165
- const encodedValue = Schema.encodeSync(colDef.schema)(value);
166
- bindValues.push(encodedValue);
167
- return `${col} ${op} ?`;
173
+ const isArray = op === 'IN' || op === 'NOT IN';
174
+ const colSchema = isArray ? Schema.Array(colDef.schema) : colDef.schema;
175
+ const encodedValue = Schema.encodeSync(colSchema)(value);
176
+ if (isArray) {
177
+ bindValues.push(...encodedValue);
178
+ const placeholders = Array.from({ length: encodedValue.length }, () => '?').join(', ');
179
+ return `${col} ${op} (${placeholders})`;
180
+ }
181
+ else {
182
+ bindValues.push(encodedValue);
183
+ return `${col} ${op} ?`;
184
+ }
168
185
  }
169
186
  })
170
187
  .join(' AND ')}`
package/dist/query-builder/impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/query-builder/impl.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@livestore/common",
3
- "version": "0.0.0-snapshot-0ea0f9cf4fb7c87dd5ca044f8ba1174a4abfdbf5",
3
+ "version": "0.0.0-snapshot-8e23ca9deecae64b6db144b5968c53749e32d627",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": {
@@ -46,8 +46,8 @@
46
46
  "graphology": "0.26.0-alpha1",
47
47
  "graphology-dag": "0.4.1",
48
48
  "graphology-types": "0.24.7",
49
- "@livestore/utils": "0.0.0-snapshot-0ea0f9cf4fb7c87dd5ca044f8ba1174a4abfdbf5",
50
- "@livestore/db-schema": "0.0.0-snapshot-0ea0f9cf4fb7c87dd5ca044f8ba1174a4abfdbf5"
49
+ "@livestore/utils": "0.0.0-snapshot-8e23ca9deecae64b6db144b5968c53749e32d627",
50
+ "@livestore/db-schema": "0.0.0-snapshot-8e23ca9deecae64b6db144b5968c53749e32d627"
51
51
  },
52
52
  "devDependencies": {
53
53
  "vitest": "^2.1.4"
package/src/query-builder/impl.ts CHANGED
@@ -155,7 +155,14 @@ export const makeQueryBuilder = <TResult, TTableDef extends DbSchema.TableDefBas
155
155
  [TypeId]: TypeId,
156
156
  [QueryBuilderAstSymbol]: ast,
157
157
  asSql: () => astToSql(ast),
158
- toString: () => astToSql(ast).query,
158
+ toString: () => {
159
+ try {
160
+ return astToSql(ast).query
161
+ } catch (cause) {
162
+ console.debug(`QueryBuilder.toString(): Error converting query builder to string`, cause, ast)
163
+ return `Error converting query builder to string`
164
+ }
165
+ },
159
166
  ...api,
160
167
  } satisfies QueryBuilder<TResult, TTableDef>
161
168
  }
@@ -198,9 +205,18 @@ const astToSql = (ast: QueryBuilderAst) => {
198
205
  if (colDef === undefined) {
199
206
  throw new Error(`Column ${col} not found`)
200
207
  }
201
- const encodedValue = Schema.encodeSync(colDef.schema)(value)
202
- bindValues.push(encodedValue)
203
- return `${col} ${op} ?`
208
+ const isArray = op === 'IN' || op === 'NOT IN'
209
+ const colSchema = isArray ? Schema.Array(colDef.schema) : colDef.schema
210
+ const encodedValue = Schema.encodeSync(colSchema)(value)
211
+
212
+ if (isArray) {
213
+ bindValues.push(...encodedValue)
214
+ const placeholders = Array.from({ length: encodedValue.length }, () => '?').join(', ')
215
+ return `${col} ${op} (${placeholders})`
216
+ } else {
217
+ bindValues.push(encodedValue)
218
+ return `${col} ${op} ?`
219
+ }
204
220
  }
205
221
  })
206
222
  .join(' AND ')}`