joist-knex 2.5.0-next.3 → 2.5.0-next.4

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.
@@ -65,6 +65,7 @@ function buildKnexQuery(knex$1, parsed, settings) {
65
65
  } else if (cte.query.kind === "ast") args.push(buildKnexQuery(knex$1, cte.query.query, {}));
66
66
  else require_utils.assertNever(cte.query);
67
67
  if (cte.recursive) query.withRecursive(...args);
68
+ else if (cte.materialized) query.withMaterialized(...args);
68
69
  else query.with(...args);
69
70
  }
70
71
  if (limit) query.limit(limit);
@@ -1 +1 @@
1
- {"version":3,"file":"buildKnexQuery.cjs","names":["knex","kq","internals","kqDot"],"sources":["../src/buildKnexQuery.ts"],"sourcesContent":["import { type ParsedFindQuery, type ParsedTable, internals, kq, kqDot } from \"joist-core\";\nimport { type Knex } from \"knex\";\n\nimport { assertNever } from \"./utils.ts\";\n\n/** Transforms Joist's internal `ParsedFindQuery` AST into a Knex query builder. */\nexport function buildKnexQuery(\n knex: Knex,\n parsed: ParsedFindQuery,\n settings: { limit?: number; offset?: number },\n): Knex.QueryBuilder<{}, unknown[]> {\n const { limit, offset } = settings;\n\n // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates\n const needsDistinct = parsed.tables.some((t) => t.join === \"outer\" && t.distinct !== false);\n\n // We need the `knex` param to call `knex.raw`\n const asRaw = (t: ParsedTable) => knex.raw(`${kq(t.table)} as ${kq(t.alias)}`);\n\n const primary = parsed.tables.find((t) => t.join === \"primary\")!;\n\n let query: Knex.QueryBuilder<any, any> = knex.from(asRaw(primary));\n\n parsed.selects.forEach((s, i) => {\n const maybeDistinct = i === 0 && needsDistinct ? \"distinct \" : \"\";\n if (typeof s === \"string\") {\n query.select(knex.raw(`${maybeDistinct}${s}`));\n } else if (\"sql\" in s) {\n query.select(knex.raw(`${maybeDistinct}${s.sql}`, s.bindings));\n }\n });\n\n parsed.tables.forEach((t) => {\n switch (t.join) {\n case \"inner\":\n query.join(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"outer\":\n query.leftOuterJoin(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"primary\":\n // ignore\n break;\n case \"lateral\":\n const { sql, bindings } = buildKnexQuery(knex, t.query, {}).toSQL();\n query.crossJoin(knex.raw(`lateral (${sql}) as ${kq(t.alias)}`, bindings));\n break;\n case \"cross\":\n query.crossJoin(asRaw(t));\n break;\n default:\n assertNever(t);\n }\n });\n\n if (parsed.condition) {\n const subqueryRenderer = (q: ParsedFindQuery) => {\n const { sql, bindings } = buildKnexQuery(knex, q, {}).toSQL();\n return { sql, bindings };\n };\n const where = internals.buildWhereClause(parsed.condition, true, subqueryRenderer);\n if (where) {\n const [sql, bindings] = where;\n query.whereRaw(sql, bindings);\n }\n }\n\n parsed.orderBys &&\n parsed.orderBys.forEach(({ alias, column, order }) => {\n // If we're doing \"select distinct\" for o2m joins, then all order bys must be selects\n if (needsDistinct) {\n query.select(knex.raw(kqDot(alias, column)));\n }\n query.orderBy(knex.raw(kqDot(alias, column)) as any, order);\n });\n\n parsed.groupBys &&\n parsed.groupBys.forEach((groupBy) => {\n query.groupByRaw(\"expression\" in groupBy ? groupBy.expression : kqDot(groupBy.alias, groupBy.column));\n });\n\n if (parsed.ctes && parsed.ctes.length > 0) {\n for (let i = 0; i < parsed.ctes.length; i++) {\n const cte = parsed.ctes[i];\n const args: Parameters<(typeof query)[\"with\"]> = [cte.alias] as any;\n if (cte.columns && cte.columns.length > 0) args.push(cte.columns.map((c) => c.columnName) as any);\n if (cte.query.kind === \"raw\") {\n args.push(knex.raw(cte.query.sql) as any);\n if (cte.query.bindings) args.push(cte.query.bindings as any);\n } else if (cte.query.kind === \"ast\") {\n args.push(buildKnexQuery(knex, cte.query.query, {}) as any);\n } else {\n assertNever(cte.query);\n }\n if (cte.recursive) {\n query.withRecursive(...args);\n } else {\n query.with(...args);\n }\n }\n }\n\n if (limit) query.limit(limit);\n if (offset) query.offset(offset);\n\n return query;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"buildKnexQuery.cjs","names":["knex","kq","internals","kqDot"],"sources":["../src/buildKnexQuery.ts"],"sourcesContent":["import { type ParsedFindQuery, type ParsedTable, internals, kq, kqDot } from \"joist-core\";\nimport { type Knex } from \"knex\";\n\nimport { assertNever } from \"./utils.ts\";\n\n/** Transforms Joist's internal `ParsedFindQuery` AST into a Knex query builder. */\nexport function buildKnexQuery(\n knex: Knex,\n parsed: ParsedFindQuery,\n settings: { limit?: number; offset?: number },\n): Knex.QueryBuilder<{}, unknown[]> {\n const { limit, offset } = settings;\n\n // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates\n const needsDistinct = parsed.tables.some((t) => t.join === \"outer\" && t.distinct !== false);\n\n // We need the `knex` param to call `knex.raw`\n const asRaw = (t: ParsedTable) => knex.raw(`${kq(t.table)} as ${kq(t.alias)}`);\n\n const primary = parsed.tables.find((t) => t.join === \"primary\")!;\n\n let query: Knex.QueryBuilder<any, any> = knex.from(asRaw(primary));\n\n parsed.selects.forEach((s, i) => {\n const maybeDistinct = i === 0 && needsDistinct ? \"distinct \" : \"\";\n if (typeof s === \"string\") {\n query.select(knex.raw(`${maybeDistinct}${s}`));\n } else if (\"sql\" in s) {\n query.select(knex.raw(`${maybeDistinct}${s.sql}`, s.bindings));\n }\n });\n\n parsed.tables.forEach((t) => {\n switch (t.join) {\n case \"inner\":\n query.join(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"outer\":\n query.leftOuterJoin(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"primary\":\n // ignore\n break;\n case \"lateral\":\n const { sql, bindings } = buildKnexQuery(knex, t.query, {}).toSQL();\n query.crossJoin(knex.raw(`lateral (${sql}) as ${kq(t.alias)}`, bindings));\n break;\n case \"cross\":\n query.crossJoin(asRaw(t));\n break;\n default:\n assertNever(t);\n }\n });\n\n if (parsed.condition) {\n const subqueryRenderer = (q: ParsedFindQuery) => {\n const { sql, bindings } = buildKnexQuery(knex, q, {}).toSQL();\n return { sql, bindings };\n };\n const where = internals.buildWhereClause(parsed.condition, true, subqueryRenderer);\n if (where) {\n const [sql, bindings] = where;\n query.whereRaw(sql, bindings);\n }\n }\n\n parsed.orderBys &&\n parsed.orderBys.forEach(({ alias, column, order }) => {\n // If we're doing \"select distinct\" for o2m joins, then all order bys must be selects\n if (needsDistinct) {\n query.select(knex.raw(kqDot(alias, column)));\n }\n query.orderBy(knex.raw(kqDot(alias, column)) as any, order);\n });\n\n parsed.groupBys &&\n parsed.groupBys.forEach((groupBy) => {\n query.groupByRaw(\"expression\" in groupBy ? groupBy.expression : kqDot(groupBy.alias, groupBy.column));\n });\n\n if (parsed.ctes && parsed.ctes.length > 0) {\n for (let i = 0; i < parsed.ctes.length; i++) {\n const cte = parsed.ctes[i];\n const args: Parameters<(typeof query)[\"with\"]> = [cte.alias] as any;\n if (cte.columns && cte.columns.length > 0) args.push(cte.columns.map((c) => c.columnName) as any);\n if (cte.query.kind === \"raw\") {\n args.push(knex.raw(cte.query.sql) as any);\n if (cte.query.bindings) args.push(cte.query.bindings as any);\n } else if (cte.query.kind === \"ast\") {\n args.push(buildKnexQuery(knex, cte.query.query, {}) as any);\n } else {\n assertNever(cte.query);\n }\n if (cte.recursive) {\n query.withRecursive(...args);\n } else if (cte.materialized) {\n query.withMaterialized(...args);\n } else {\n query.with(...args);\n }\n }\n }\n\n if (limit) query.limit(limit);\n if (offset) query.offset(offset);\n\n return query;\n}\n"],"mappings":"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"}
@@ -64,6 +64,7 @@ function buildKnexQuery(knex, parsed, settings) {
64
64
  } else if (cte.query.kind === "ast") args.push(buildKnexQuery(knex, cte.query.query, {}));
65
65
  else assertNever(cte.query);
66
66
  if (cte.recursive) query.withRecursive(...args);
67
+ else if (cte.materialized) query.withMaterialized(...args);
67
68
  else query.with(...args);
68
69
  }
69
70
  if (limit) query.limit(limit);
@@ -1 +1 @@
1
- {"version":3,"file":"buildKnexQuery.js","names":[],"sources":["../src/buildKnexQuery.ts"],"sourcesContent":["import { type ParsedFindQuery, type ParsedTable, internals, kq, kqDot } from \"joist-core\";\nimport { type Knex } from \"knex\";\n\nimport { assertNever } from \"./utils.ts\";\n\n/** Transforms Joist's internal `ParsedFindQuery` AST into a Knex query builder. */\nexport function buildKnexQuery(\n knex: Knex,\n parsed: ParsedFindQuery,\n settings: { limit?: number; offset?: number },\n): Knex.QueryBuilder<{}, unknown[]> {\n const { limit, offset } = settings;\n\n // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates\n const needsDistinct = parsed.tables.some((t) => t.join === \"outer\" && t.distinct !== false);\n\n // We need the `knex` param to call `knex.raw`\n const asRaw = (t: ParsedTable) => knex.raw(`${kq(t.table)} as ${kq(t.alias)}`);\n\n const primary = parsed.tables.find((t) => t.join === \"primary\")!;\n\n let query: Knex.QueryBuilder<any, any> = knex.from(asRaw(primary));\n\n parsed.selects.forEach((s, i) => {\n const maybeDistinct = i === 0 && needsDistinct ? \"distinct \" : \"\";\n if (typeof s === \"string\") {\n query.select(knex.raw(`${maybeDistinct}${s}`));\n } else if (\"sql\" in s) {\n query.select(knex.raw(`${maybeDistinct}${s.sql}`, s.bindings));\n }\n });\n\n parsed.tables.forEach((t) => {\n switch (t.join) {\n case \"inner\":\n query.join(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"outer\":\n query.leftOuterJoin(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"primary\":\n // ignore\n break;\n case \"lateral\":\n const { sql, bindings } = buildKnexQuery(knex, t.query, {}).toSQL();\n query.crossJoin(knex.raw(`lateral (${sql}) as ${kq(t.alias)}`, bindings));\n break;\n case \"cross\":\n query.crossJoin(asRaw(t));\n break;\n default:\n assertNever(t);\n }\n });\n\n if (parsed.condition) {\n const subqueryRenderer = (q: ParsedFindQuery) => {\n const { sql, bindings } = buildKnexQuery(knex, q, {}).toSQL();\n return { sql, bindings };\n };\n const where = internals.buildWhereClause(parsed.condition, true, subqueryRenderer);\n if (where) {\n const [sql, bindings] = where;\n query.whereRaw(sql, bindings);\n }\n }\n\n parsed.orderBys &&\n parsed.orderBys.forEach(({ alias, column, order }) => {\n // If we're doing \"select distinct\" for o2m joins, then all order bys must be selects\n if (needsDistinct) {\n query.select(knex.raw(kqDot(alias, column)));\n }\n query.orderBy(knex.raw(kqDot(alias, column)) as any, order);\n });\n\n parsed.groupBys &&\n parsed.groupBys.forEach((groupBy) => {\n query.groupByRaw(\"expression\" in groupBy ? groupBy.expression : kqDot(groupBy.alias, groupBy.column));\n });\n\n if (parsed.ctes && parsed.ctes.length > 0) {\n for (let i = 0; i < parsed.ctes.length; i++) {\n const cte = parsed.ctes[i];\n const args: Parameters<(typeof query)[\"with\"]> = [cte.alias] as any;\n if (cte.columns && cte.columns.length > 0) args.push(cte.columns.map((c) => c.columnName) as any);\n if (cte.query.kind === \"raw\") {\n args.push(knex.raw(cte.query.sql) as any);\n if (cte.query.bindings) args.push(cte.query.bindings as any);\n } else if (cte.query.kind === \"ast\") {\n args.push(buildKnexQuery(knex, cte.query.query, {}) as any);\n } else {\n assertNever(cte.query);\n }\n if (cte.recursive) {\n query.withRecursive(...args);\n } else {\n query.with(...args);\n }\n }\n }\n\n if (limit) query.limit(limit);\n if (offset) query.offset(offset);\n\n return query;\n}\n"],"mappings":";;;;;AAMA,SAAgB,eACd,MACA,QACA,UACkC;CAClC,MAAM,EAAE,OAAO,WAAW;CAG1B,MAAM,gBAAgB,OAAO,OAAO,MAAM,MAAM,EAAE,SAAS,WAAW,EAAE,aAAa,KAAK;CAG1F,MAAM,SAAS,MAAmB,KAAK,IAAI,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,EAAE,KAAK,GAAG;CAE7E,MAAM,UAAU,OAAO,OAAO,MAAM,MAAM,EAAE,SAAS,SAAS;CAE9D,IAAI,QAAqC,KAAK,KAAK,MAAM,OAAO,CAAC;CAEjE,OAAO,QAAQ,SAAS,GAAG,MAAM;EAC/B,MAAM,gBAAgB,MAAM,KAAK,gBAAgB,cAAc;EAC/D,IAAI,OAAO,MAAM,UACf,MAAM,OAAO,KAAK,IAAI,GAAG,gBAAgB,GAAG,CAAC;OACxC,IAAI,SAAS,GAClB,MAAM,OAAO,KAAK,IAAI,GAAG,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC;CAEjE,CAAC;CAED,OAAO,OAAO,SAAS,MAAM;EAC3B,QAAQ,EAAE,MAAV;GACE,KAAK;IACH,MAAM,KAAK,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE,IAAI,GAAU,KAAK,IAAI,EAAE,IAAI,CAAC;IAC9D;GACF,KAAK;IACH,MAAM,cAAc,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE,IAAI,GAAU,KAAK,IAAI,EAAE,IAAI,CAAC;IACvE;GACF,KAAK,WAEH;GACF,KAAK;IACH,MAAM,EAAE,KAAK,aAAa,eAAe,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM;IAClE,MAAM,UAAU,KAAK,IAAI,YAAY,IAAI,OAAO,GAAG,EAAE,KAAK,KAAK,QAAQ,CAAC;IACxE;GACF,KAAK;IACH,MAAM,UAAU,MAAM,CAAC,CAAC;IACxB;GACF,SACE,YAAY,CAAC;EACjB;CACF,CAAC;CAED,IAAI,OAAO,WAAW;EACpB,MAAM,oBAAoB,MAAuB;GAC/C,MAAM,EAAE,KAAK,aAAa,eAAe,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM;GAC5D,OAAO;IAAE;IAAK;GAAS;EACzB;EACA,MAAM,QAAQ,UAAU,iBAAiB,OAAO,WAAW,MAAM,gBAAgB;EACjF,IAAI,OAAO;GACT,MAAM,CAAC,KAAK,YAAY;GACxB,MAAM,SAAS,KAAK,QAAQ;EAC9B;CACF;CAEA,OAAO,YACL,OAAO,SAAS,SAAS,EAAE,OAAO,QAAQ,YAAY;EAEpD,IAAI,eACF,MAAM,OAAO,KAAK,IAAI,MAAM,OAAO,MAAM,CAAC,CAAC;EAE7C,MAAM,QAAQ,KAAK,IAAI,MAAM,OAAO,MAAM,CAAC,GAAU,KAAK;CAC5D,CAAC;CAEH,OAAO,YACL,OAAO,SAAS,SAAS,YAAY;EACnC,MAAM,WAAW,gBAAgB,UAAU,QAAQ,aAAa,MAAM,QAAQ,OAAO,QAAQ,MAAM,CAAC;CACtG,CAAC;CAEH,IAAI,OAAO,QAAQ,OAAO,KAAK,SAAS,GACtC,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,KAAK,QAAQ,KAAK;EAC3C,MAAM,MAAM,OAAO,KAAK;EACxB,MAAM,OAA2C,CAAC,IAAI,KAAK;EAC3D,IAAI,IAAI,WAAW,IAAI,QAAQ,SAAS,GAAG,KAAK,KAAK,IAAI,QAAQ,KAAK,MAAM,EAAE,UAAU,CAAQ;EAChG,IAAI,IAAI,MAAM,SAAS,OAAO;GAC5B,KAAK,KAAK,KAAK,IAAI,IAAI,MAAM,GAAG,CAAQ;GACxC,IAAI,IAAI,MAAM,UAAU,KAAK,KAAK,IAAI,MAAM,QAAe;EAC7D,OAAO,IAAI,IAAI,MAAM,SAAS,OAC5B,KAAK,KAAK,eAAe,MAAM,IAAI,MAAM,OAAO,CAAC,CAAC,CAAQ;OAE1D,YAAY,IAAI,KAAK;EAEvB,IAAI,IAAI,WACN,MAAM,cAAc,GAAG,IAAI;OAE3B,MAAM,KAAK,GAAG,IAAI;CAEtB;CAGF,IAAI,OAAO,MAAM,MAAM,KAAK;CAC5B,IAAI,QAAQ,MAAM,OAAO,MAAM;CAE/B,OAAO;AACT"}
1
+ {"version":3,"file":"buildKnexQuery.js","names":[],"sources":["../src/buildKnexQuery.ts"],"sourcesContent":["import { type ParsedFindQuery, type ParsedTable, internals, kq, kqDot } from \"joist-core\";\nimport { type Knex } from \"knex\";\n\nimport { assertNever } from \"./utils.ts\";\n\n/** Transforms Joist's internal `ParsedFindQuery` AST into a Knex query builder. */\nexport function buildKnexQuery(\n knex: Knex,\n parsed: ParsedFindQuery,\n settings: { limit?: number; offset?: number },\n): Knex.QueryBuilder<{}, unknown[]> {\n const { limit, offset } = settings;\n\n // If we're doing o2m joins, add a `DISTINCT` clause to avoid duplicates\n const needsDistinct = parsed.tables.some((t) => t.join === \"outer\" && t.distinct !== false);\n\n // We need the `knex` param to call `knex.raw`\n const asRaw = (t: ParsedTable) => knex.raw(`${kq(t.table)} as ${kq(t.alias)}`);\n\n const primary = parsed.tables.find((t) => t.join === \"primary\")!;\n\n let query: Knex.QueryBuilder<any, any> = knex.from(asRaw(primary));\n\n parsed.selects.forEach((s, i) => {\n const maybeDistinct = i === 0 && needsDistinct ? \"distinct \" : \"\";\n if (typeof s === \"string\") {\n query.select(knex.raw(`${maybeDistinct}${s}`));\n } else if (\"sql\" in s) {\n query.select(knex.raw(`${maybeDistinct}${s.sql}`, s.bindings));\n }\n });\n\n parsed.tables.forEach((t) => {\n switch (t.join) {\n case \"inner\":\n query.join(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"outer\":\n query.leftOuterJoin(asRaw(t), knex.raw(t.col1) as any, knex.raw(t.col2));\n break;\n case \"primary\":\n // ignore\n break;\n case \"lateral\":\n const { sql, bindings } = buildKnexQuery(knex, t.query, {}).toSQL();\n query.crossJoin(knex.raw(`lateral (${sql}) as ${kq(t.alias)}`, bindings));\n break;\n case \"cross\":\n query.crossJoin(asRaw(t));\n break;\n default:\n assertNever(t);\n }\n });\n\n if (parsed.condition) {\n const subqueryRenderer = (q: ParsedFindQuery) => {\n const { sql, bindings } = buildKnexQuery(knex, q, {}).toSQL();\n return { sql, bindings };\n };\n const where = internals.buildWhereClause(parsed.condition, true, subqueryRenderer);\n if (where) {\n const [sql, bindings] = where;\n query.whereRaw(sql, bindings);\n }\n }\n\n parsed.orderBys &&\n parsed.orderBys.forEach(({ alias, column, order }) => {\n // If we're doing \"select distinct\" for o2m joins, then all order bys must be selects\n if (needsDistinct) {\n query.select(knex.raw(kqDot(alias, column)));\n }\n query.orderBy(knex.raw(kqDot(alias, column)) as any, order);\n });\n\n parsed.groupBys &&\n parsed.groupBys.forEach((groupBy) => {\n query.groupByRaw(\"expression\" in groupBy ? groupBy.expression : kqDot(groupBy.alias, groupBy.column));\n });\n\n if (parsed.ctes && parsed.ctes.length > 0) {\n for (let i = 0; i < parsed.ctes.length; i++) {\n const cte = parsed.ctes[i];\n const args: Parameters<(typeof query)[\"with\"]> = [cte.alias] as any;\n if (cte.columns && cte.columns.length > 0) args.push(cte.columns.map((c) => c.columnName) as any);\n if (cte.query.kind === \"raw\") {\n args.push(knex.raw(cte.query.sql) as any);\n if (cte.query.bindings) args.push(cte.query.bindings as any);\n } else if (cte.query.kind === \"ast\") {\n args.push(buildKnexQuery(knex, cte.query.query, {}) as any);\n } else {\n assertNever(cte.query);\n }\n if (cte.recursive) {\n query.withRecursive(...args);\n } else if (cte.materialized) {\n query.withMaterialized(...args);\n } else {\n query.with(...args);\n }\n }\n }\n\n if (limit) query.limit(limit);\n if (offset) query.offset(offset);\n\n return query;\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joist-knex",
3
- "version": "2.5.0-next.3",
3
+ "version": "2.5.0-next.4",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "repository": {
@@ -36,7 +36,7 @@
36
36
  "build"
37
37
  ],
38
38
  "peerDependencies": {
39
- "joist-core": "2.5.0-next.3",
39
+ "joist-core": "2.5.0-next.4",
40
40
  "knex": "^3.1.0",
41
41
  "pg": "^8.23.0"
42
42
  },