@ronin/compiler
Advanced tools
Comparing version 0.11.7 to 0.12.0-leo-ron-1071-experimental-249
@@ -1573,10 +1573,8 @@ // src/utils/helpers.ts | ||
var Transaction = class { | ||
statements; | ||
statements = []; | ||
models = []; | ||
queries; | ||
fields = []; | ||
internalStatements = []; | ||
constructor(queries, options) { | ||
const models = options?.models || []; | ||
this.statements = this.compileQueries(queries, models, options); | ||
this.queries = queries; | ||
this.compileQueries(queries, models, options); | ||
} | ||
@@ -1611,4 +1609,11 @@ /** | ||
); | ||
statements.push(...result.dependencies, result.main); | ||
this.fields.push(result.loadedFields); | ||
const subStatements = [...result.dependencies, result.main]; | ||
this.statements.push(...subStatements); | ||
this.internalStatements.push( | ||
...subStatements.map((statement) => ({ | ||
...statement, | ||
query, | ||
fields: result.loadedFields | ||
})) | ||
); | ||
} | ||
@@ -1660,6 +1665,3 @@ this.models = modelListWithPresets; | ||
formatResults(results, raw = true) { | ||
const relevantResults = results.filter((_, index) => { | ||
return this.statements[index].returning; | ||
}); | ||
const normalizedResults = raw ? relevantResults : relevantResults.map((rows) => { | ||
const normalizedResults = raw ? results : results.map((rows) => { | ||
return rows.map((row) => { | ||
@@ -1671,5 +1673,5 @@ if (Array.isArray(row)) return row; | ||
}); | ||
return normalizedResults.map((rows, index) => { | ||
const query = this.queries.at(-index); | ||
const rawModelFields = this.fields.at(-index); | ||
const formattedResults = normalizedResults.map((rows, index) => { | ||
const { returning, query, fields: rawModelFields } = this.internalStatements[index]; | ||
if (!returning) return null; | ||
const { queryType, queryModel, queryInstructions } = splitQuery(query); | ||
@@ -1726,2 +1728,3 @@ const model = getModelBySlug(this.models, queryModel); | ||
}); | ||
return formattedResults.filter((result) => result !== null); | ||
} | ||
@@ -1728,0 +1731,0 @@ }; |
{ | ||
"name": "@ronin/compiler", | ||
"version": "0.11.7", | ||
"version": "0.12.0-leo-ron-1071-experimental-249", | ||
"type": "module", | ||
@@ -5,0 +5,0 @@ "description": "Compiles RONIN queries to SQL statements.", |
Sorry, the diff of this file is too big to display
1071684
17411