@ronin/compiler 0.4.0 → 0.5.0

package/dist/index.js

@@ -96,19 +96,19 @@ var splitQuery = (query) => {
 };
 
 // src/utils/statement.ts
-var prepareStatementValue = (statementValues, value) => {
+var prepareStatementValue = (statementParams, value) => {
   if (value === null) return "NULL";
-  if (!statementValues) return JSON.stringify(value);
+  if (!statementParams) return JSON.stringify(value);
   let formattedValue = value;
   if (Array.isArray(value) || isObject(value)) {
     formattedValue = JSON.stringify(value);
   } else if (typeof value === "boolean") {
     formattedValue = value ? 1 : 0;
   }
-  const index = statementValues.push(formattedValue);
+  const index = statementParams.push(formattedValue);
   return `?${index}`;
 };
-var composeFieldValues = (schemas, schema, statementValues, instructionName, value, options) => {
+var composeFieldValues = (schemas, schema, statementParams, instructionName, value, options) => {
   const { field: schemaField, fieldSelector: selector } = getFieldFromSchema(
     schema,
     options.fieldSlug,
@@ -123,8 +123,8 @@ var composeFieldValues = (schemas, schema, statementValues, instructionName, val
     conditionValue = `(${compileQueryInput(
       value[RONIN_SCHEMA_SYMBOLS.QUERY],
       schemas,
-      statementValues
-    ).readStatement})`;
+      statementParams
+    ).main.statement})`;
   } else if (typeof value === "string" && value.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD)) {
     let targetTable = `"${options.rootTable}"`;
     let toReplace = RONIN_SCHEMA_SYMBOLS.FIELD;
@@ -140,21 +140,21 @@ var composeFieldValues = (schemas, schema, statementValues, instructionName, val
   } else if (schemaField.type === "json" && instructionName === "to") {
     conditionSelector = `"${schemaField.slug}"`;
     if (collectStatementValue) {
-      const preparedValue = prepareStatementValue(statementValues, value);
+      const preparedValue = prepareStatementValue(statementParams, value);
       conditionValue = `IIF(${conditionSelector} IS NULL, ${preparedValue}, json_patch(${conditionSelector}, ${preparedValue}))`;
     }
   } else if (collectStatementValue) {
-    conditionValue = prepareStatementValue(statementValues, value);
+    conditionValue = prepareStatementValue(statementParams, value);
   }
   if (options.type === "fields") return conditionSelector;
   if (options.type === "values") return conditionValue;
   return `${conditionSelector} ${WITH_CONDITIONS[options.condition || "being"](conditionValue, value)}`;
 };
-var composeConditions = (schemas, schema, statementValues, instructionName, value, options) => {
+var composeConditions = (schemas, schema, statementParams, instructionName, value, options) => {
   const isNested = isObject(value) && Object.keys(value).length > 0;
   if (isNested && Object.keys(value).every((key) => key in WITH_CONDITIONS)) {
     const conditions = Object.entries(value).map(
-      ([conditionType, checkValue]) => composeConditions(schemas, schema, statementValues, instructionName, checkValue, {
+      ([conditionType, checkValue]) => composeConditions(schemas, schema, statementParams, instructionName, checkValue, {
         ...options,
         condition: conditionType
       })
@@ -175,7 +175,7 @@ var composeConditions = (schemas, schema, statementValues, instructionName, valu
       return composeFieldValues(
         schemas,
         schema,
-        statementValues,
+        statementParams,
         instructionName,
         value,
         { ...options, fieldSlug: options.fieldSlug }
@@ -204,7 +204,7 @@ var composeConditions = (schemas, schema, statementValues, instructionName, valu
       return composeConditions(
         schemas,
         schema,
-        statementValues,
+        statementParams,
         instructionName,
         recordTarget,
         options
@@ -214,7 +214,7 @@ var composeConditions = (schemas, schema, statementValues, instructionName, valu
   if (isNested) {
     const conditions = Object.entries(value).map(([field, value2]) => {
       const nestedFieldSlug = options.fieldSlug ? `${options.fieldSlug}.${field}` : field;
-      return composeConditions(schemas, schema, statementValues, instructionName, value2, {
+      return composeConditions(schemas, schema, statementParams, instructionName, value2, {
         ...options,
         fieldSlug: nestedFieldSlug
       });
@@ -228,7 +228,7 @@ var composeConditions = (schemas, schema, statementValues, instructionName, valu
       (filter) => composeConditions(
         schemas,
         schema,
-        statementValues,
+        statementParams,
         instructionName,
         filter,
         options
@@ -287,11 +287,11 @@ var WITH_CONDITIONS = {
   lessThan: (value) => `< ${value}`,
   lessOrEqual: (value) => `<= ${value}`
 };
-var handleWith = (schemas, schema, statementValues, instruction, rootTable) => {
+var handleWith = (schemas, schema, statementParams, instruction, rootTable) => {
   const subStatement = composeConditions(
     schemas,
     schema,
-    statementValues,
+    statementParams,
     "with",
     instruction,
     { rootTable }
@@ -601,7 +601,7 @@ var getFieldStatement = (field) => {
   }
   return statement;
 };
-var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements) => {
+var addSchemaQueries = (schemas, queryDetails, dependencyStatements) => {
   const {
     queryType,
     querySchema,
@@ -653,30 +653,33 @@ var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements)
       fields: ["schema.slug"]
     });
   }
-  const tableName = convertToSnakeCase(pluralize(kind === "schemas" ? slug : schemaSlug));
+  const usableSlug = kind === "schemas" ? slug : schemaSlug;
+  const tableName = convertToSnakeCase(pluralize(usableSlug));
+  const targetSchema = kind === "schemas" && queryType === "create" ? null : getSchemaBySlug(schemas, usableSlug);
   if (kind === "indexes") {
     const indexName = convertToSnakeCase(slug);
     const unique = instructionList?.unique;
     const filterQuery = instructionList?.filter;
+    const params = [];
     let statement2 = `${tableAction}${unique ? " UNIQUE" : ""} INDEX "${indexName}"`;
     if (queryType === "create") {
       statement2 += ` ON "${tableName}"`;
       if (filterQuery) {
-        const targetSchema = getSchemaBySlug(schemas, schemaSlug);
         const withStatement = handleWith(
           schemas,
           targetSchema,
-          statementValues,
+          params,
           filterQuery
         );
         statement2 += ` WHERE (${withStatement})`;
       }
     }
-    writeStatements.push(statement2);
+    dependencyStatements.push({ statement: statement2, params });
     return queryInstructions;
   }
   if (kind === "triggers") {
     const triggerName = convertToSnakeCase(slug);
+    const params = [];
     let statement2 = `${tableAction} TRIGGER "${triggerName}"`;
     if (queryType === "create") {
       const cause = slugToName(instructionList?.cause).toUpperCase();
@@ -687,28 +690,27 @@ var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements)
         statementParts.push("FOR EACH ROW");
       }
       if (filterQuery) {
-        const targetSchema = getSchemaBySlug(schemas, schemaSlug);
         const tablePlaceholder = cause.endsWith("DELETE") ? RONIN_SCHEMA_SYMBOLS.FIELD_OLD : RONIN_SCHEMA_SYMBOLS.FIELD_NEW;
         const withStatement = handleWith(
           schemas,
           targetSchema,
-          statementValues,
+          params,
           filterQuery,
           tablePlaceholder
         );
         statementParts.push("WHEN", `(${withStatement})`);
       }
       const effectStatements = effectQueries.map((effectQuery) => {
-        return compileQueryInput(effectQuery, schemas, statementValues, {
-          disableReturning: true
-        }).readStatement;
+        return compileQueryInput(effectQuery, schemas, params, {
+          returning: false
+        }).main.statement;
       });
       if (effectStatements.length > 1) statementParts.push("BEGIN");
       statementParts.push(effectStatements.join("; "));
       if (effectStatements.length > 1) statementParts.push("END");
       statement2 += ` ${statementParts.join(" ")}`;
     }
-    writeStatements.push(statement2);
+    dependencyStatements.push({ statement: statement2, params });
     return queryInstructions;
   }
   let statement = `${tableAction} TABLE "${tableName}"`;
@@ -721,14 +723,18 @@ var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements)
     if (queryType === "create") {
       const columns = fields.map(getFieldStatement).filter(Boolean);
       statement += ` (${columns.join(", ")})`;
+      schemas.push(queryInstructions.to);
     } else if (queryType === "set") {
       const newSlug = queryInstructions.to?.pluralSlug;
       if (newSlug) {
         const newTable = convertToSnakeCase(newSlug);
         statement += ` RENAME TO "${newTable}"`;
       }
+      Object.assign(targetSchema, queryInstructions.to);
+    } else if (queryType === "drop") {
+      schemas.splice(schemas.indexOf(targetSchema), 1);
     }
-    writeStatements.push(statement);
+    dependencyStatements.push({ statement, params: [] });
     return queryInstructions;
   }
   if (kind === "fields") {
@@ -749,7 +755,7 @@ var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements)
     } else if (queryType === "drop") {
       statement += ` DROP COLUMN "${slug}"`;
     }
-    writeStatements.push(statement);
+    dependencyStatements.push({ statement, params: [] });
   }
   return queryInstructions;
 };
@@ -773,7 +779,7 @@ var pluralize = (word) => {
 // src/instructions/before-after.ts
 var CURSOR_SEPARATOR = ",";
 var CURSOR_NULL_PLACEHOLDER = "RONIN_NULL";
-var handleBeforeOrAfter = (schema, statementValues, instructions, rootTable) => {
+var handleBeforeOrAfter = (schema, statementParams, instructions, rootTable) => {
   if (!(instructions.before || instructions.after)) {
     throw new RoninError({
       message: "The `before` or `after` instruction must not be empty.",
@@ -799,15 +805,15 @@ var handleBeforeOrAfter = (schema, statementValues, instructions, rootTable) =>
     }
     const { field } = getFieldFromSchema(schema, key, "orderedBy");
     if (field.type === "boolean") {
-      return prepareStatementValue(statementValues, value === "true");
+      return prepareStatementValue(statementParams, value === "true");
     }
     if (field.type === "number") {
-      return prepareStatementValue(statementValues, Number.parseInt(value));
+      return prepareStatementValue(statementParams, Number.parseInt(value));
     }
     if (field.type === "date") {
       return `'${new Date(Number.parseInt(value)).toJSON()}'`;
     }
-    return prepareStatementValue(statementValues, value);
+    return prepareStatementValue(statementParams, value);
   });
   const compareOperators = [
     // Reverse the comparison operators if we're querying for records before.
@@ -850,7 +856,7 @@ var handleBeforeOrAfter = (schema, statementValues, instructions, rootTable) =>
 };
 
 // src/instructions/for.ts
-var handleFor = (schemas, schema, statementValues, instruction, rootTable) => {
+var handleFor = (schemas, schema, statementParams, instruction, rootTable) => {
   let statement = "";
   if (!instruction) return statement;
   for (const shortcut in instruction) {
@@ -871,7 +877,7 @@ var handleFor = (schemas, schema, statementValues, instruction, rootTable) => {
     const subStatement = composeConditions(
       schemas,
       schema,
-      statementValues,
+      statementParams,
       "for",
       replacedForFilter,
       { rootTable }
@@ -882,7 +888,7 @@ var handleFor = (schemas, schema, statementValues, instruction, rootTable) => {
 };
 
 // src/instructions/including.ts
-var handleIncluding = (schemas, statementValues, schema, instruction, rootTable) => {
+var handleIncluding = (schemas, statementParams, schema, instruction, rootTable) => {
   let statement = "";
   let rootTableSubQuery;
   let rootTableName = rootTable;
@@ -916,9 +922,9 @@ var handleIncluding = (schemas, statementValues, schema, instruction, rootTable)
           }
         },
         schemas,
-        statementValues
+        statementParams
       );
-      relatedTableSelector = `(${subSelect.readStatement})`;
+      relatedTableSelector = `(${subSelect.main.statement})`;
     }
     statement += `${joinType} JOIN ${relatedTableSelector} as ${tableAlias}`;
     if (joinType === "LEFT") {
@@ -929,7 +935,7 @@ var handleIncluding = (schemas, statementValues, schema, instruction, rootTable)
       const subStatement = composeConditions(
         schemas,
         relatedSchema,
-        statementValues,
+        statementParams,
         "including",
         queryInstructions?.with,
         {
@@ -983,7 +989,7 @@ var handleOrderedBy = (schema, instruction, rootTable) => {
 };
 
 // src/instructions/selecting.ts
-var handleSelecting = (schema, statementValues, instructions) => {
+var handleSelecting = (schema, statementParams, instructions) => {
   let statement = instructions.selecting ? instructions.selecting.map((slug) => {
     return getFieldFromSchema(schema, slug, "selecting").fieldSelector;
   }).join(", ") : "*";
@@ -994,14 +1000,14 @@ var handleSelecting = (schema, statementValues, instructions) => {
     ).filter(([_, value]) => {
       return !(isObject(value) && Object.hasOwn(value, RONIN_SCHEMA_SYMBOLS.QUERY));
     }).map(([key, value]) => {
-      return `${prepareStatementValue(statementValues, value)} as "${key}"`;
+      return `${prepareStatementValue(statementParams, value)} as "${key}"`;
     }).join(", ");
   }
   return statement;
 };
 
 // src/instructions/to.ts
-var handleTo = (schemas, schema, statementValues, queryType, writeStatements, instructions, rootTable) => {
+var handleTo = (schemas, schema, statementParams, queryType, dependencyStatements, instructions, rootTable) => {
   const currentTime = (/* @__PURE__ */ new Date()).toISOString();
   const { with: withInstruction, to: toInstruction } = instructions;
   const defaultFields = {};
@@ -1043,7 +1049,7 @@ var handleTo = (schemas, schema, statementValues, queryType, writeStatements, in
         ...subQueryInstructions.including
       };
     }
-    return compileQueryInput(subQuery, schemas, statementValues).readStatement;
+    return compileQueryInput(subQuery, schemas, statementParams).main.statement;
   }
   Object.assign(toInstruction, defaultFields);
   for (const fieldSlug in toInstruction) {
@@ -1059,29 +1065,28 @@ var handleTo = (schemas, schema, statementValues, queryType, writeStatements, in
         const source = queryType === "create" ? { id: toInstruction.id } : withInstruction;
         const recordDetails = { source };
         if (value) recordDetails.target = value;
-        const { readStatement } = compileQueryInput(
+        return compileQueryInput(
           {
             [subQueryType]: {
               [associativeSchemaSlug]: subQueryType === "create" ? { to: recordDetails } : { with: recordDetails }
             }
           },
           schemas,
-          statementValues,
-          { disableReturning: true }
-        );
-        return readStatement;
+          [],
+          { returning: false }
+        ).main;
       };
       if (Array.isArray(fieldValue)) {
-        writeStatements.push(composeStatement("drop"));
+        dependencyStatements.push(composeStatement("drop"));
         for (const record of fieldValue) {
-          writeStatements.push(composeStatement("create", record));
+          dependencyStatements.push(composeStatement("create", record));
         }
       } else if (isObject(fieldValue)) {
         for (const recordToAdd of fieldValue.containing || []) {
-          writeStatements.push(composeStatement("create", recordToAdd));
+          dependencyStatements.push(composeStatement("create", recordToAdd));
         }
         for (const recordToRemove of fieldValue.notContaining || []) {
-          writeStatements.push(composeStatement("drop", recordToRemove));
+          dependencyStatements.push(composeStatement("drop", recordToRemove));
         }
       }
     }
@@ -1089,7 +1094,7 @@ var handleTo = (schemas, schema, statementValues, queryType, writeStatements, in
   let statement = composeConditions(
     schemas,
     schema,
-    statementValues,
+    statementParams,
     "to",
     toInstruction,
     {
@@ -1101,7 +1106,7 @@ var handleTo = (schemas, schema, statementValues, queryType, writeStatements, in
     const deepStatement = composeConditions(
       schemas,
       schema,
-      statementValues,
+      statementParams,
       "to",
       toInstruction,
       {
@@ -1117,22 +1122,21 @@ var handleTo = (schemas, schema, statementValues, queryType, writeStatements, in
 };
 
 // src/utils/index.ts
-var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
+var compileQueryInput = (query, schemas, statementParams, options) => {
   const parsedQuery = splitQuery(query);
   const { queryType, querySchema, queryInstructions } = parsedQuery;
-  const schemas = addSystemSchemas(defaultSchemas);
   const schema = getSchemaBySlug(schemas, querySchema);
   const single = querySchema !== schema.pluralSlug;
   let instructions = formatIdentifiers(schema, queryInstructions);
   let table = getTableForSchema(schema);
-  const writeStatements = [];
+  const dependencyStatements = [];
+  const returning = options?.returning ?? true;
   instructions = addSchemaQueries(
     schemas,
-    statementValues,
     { queryType, querySchema, queryInstructions: instructions },
-    writeStatements
+    dependencyStatements
   );
-  const columns = handleSelecting(schema, statementValues, {
+  const columns = handleSelecting(schema, statementParams, {
     selecting: instructions?.selecting,
     including: instructions?.including
   });
@@ -1161,7 +1165,7 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
       statement: including,
       rootTableSubQuery,
       rootTableName
-    } = handleIncluding(schemas, statementValues, schema, instructions?.including, table);
+    } = handleIncluding(schemas, statementParams, schema, instructions?.including, table);
     if (rootTableSubQuery && rootTableName) {
       table = rootTableName;
       statement += `(${rootTableSubQuery}) as ${rootTableName} `;
@@ -1184,9 +1188,9 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
     const toStatement = handleTo(
       schemas,
       schema,
-      statementValues,
+      statementParams,
       queryType,
-      writeStatements,
+      dependencyStatements,
       { with: instructions.with, to: instructions.to },
       isJoining ? table : void 0
     );
@@ -1197,7 +1201,7 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
     const withStatement = handleWith(
       schemas,
       schema,
-      statementValues,
+      statementParams,
       instructions?.with,
       isJoining ? table : void 0
     );
@@ -1207,7 +1211,7 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
     const forStatement = handleFor(
       schemas,
       schema,
-      statementValues,
+      statementParams,
       instructions?.for,
       isJoining ? table : void 0
     );
@@ -1235,7 +1239,7 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
     }
     const beforeAndAfterStatement = handleBeforeOrAfter(
       schema,
-      statementValues,
+      statementParams,
       {
         before: instructions.before,
         after: instructions.after,
@@ -1264,22 +1268,36 @@ var compileQueryInput = (query, defaultSchemas, statementValues, options) => {
   if (queryType === "get" && !isJoiningMultipleRows) {
     statement += handleLimitedTo(single, instructions?.limitedTo);
   }
-  if (["create", "set", "drop"].includes(queryType) && !options?.disableReturning) {
+  if (["create", "set", "drop"].includes(queryType) && returning) {
     statement += "RETURNING * ";
   }
-  const finalStatement = statement.trimEnd();
+  const mainStatement = {
+    statement: statement.trimEnd(),
+    params: statementParams || []
+  };
+  if (returning) mainStatement.returning = true;
   return {
-    writeStatements,
-    readStatement: finalStatement,
-    values: statementValues || []
+    dependencies: dependencyStatements,
+    main: mainStatement
   };
 };
 
 // src/index.ts
-var compileQuery = (query, schemas, options) => {
-  const statementValues = options?.inlineValues ? null : [];
-  return compileQueryInput(query, schemas, statementValues);
+var compileQueries = (queries, schemas, options) => {
+  const schemaList = addSystemSchemas(schemas);
+  const dependencyStatements = [];
+  const mainStatements = [];
+  for (const query of queries) {
+    const result = compileQueryInput(
+      query,
+      schemaList,
+      options?.inlineValues ? null : []
+    );
+    dependencyStatements.push(...result.dependencies);
+    mainStatements.push(result.main);
+  }
+  return [...dependencyStatements, ...mainStatements];
 };
 export {
-  compileQuery
+  compileQueries
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {