@ronin/compiler 0.2.1 → 0.3.0

package/README.md

@@ -49,7 +49,6 @@ const query = {
 
 const schemas = [
   {
-    pluralSlug: 'accounts',
     slug: 'account',
   },
 ];

package/dist/index.d.ts

@@ -4667,7 +4667,7 @@ type SchemaFieldNormal = SchemaFieldBasics & {
 type SchemaFieldReferenceAction = 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT' | 'NO ACTION';
 type SchemaFieldReference = SchemaFieldBasics & {
     type: 'reference';
-    target: Omit<Partial<Schema>, 'pluralSlug'> & Pick<Schema, 'pluralSlug'>;
+    target: Omit<Partial<Schema>, 'slug'> & Pick<Schema, 'slug'>;
     kind?: 'one' | 'many';
     actions?: {
         onDelete?: SchemaFieldReferenceAction;
@@ -4679,7 +4679,7 @@ interface Schema {
     name?: string;
     pluralName?: string;
     slug: string;
-    pluralSlug: string;
+    pluralSlug?: string;
     identifiers?: {
         title?: string;
         slug?: string;

package/dist/index.js

@@ -1,8 +1,15 @@
 // src/utils/index.ts
 import { init as cuid } from "@paralleldrive/cuid2";
 var RONIN_SCHEMA_SYMBOLS = {
+  // Represents a sub query.
   QUERY: "__RONIN_QUERY",
+  // Represents the value of a field in a schema.
   FIELD: "__RONIN_FIELD_",
+  // Represents the old value of a field in a schema. Used for triggers.
+  FIELD_OLD: "__RONIN_FIELD_OLD_",
+  // Represents the new value of a field in a schema. Used for triggers.
+  FIELD_NEW: "__RONIN_FIELD_NEW_",
+  // Represents a value provided to a query preset.
   VALUE: "__RONIN_VALUE"
 };
 var RoninError = class extends Error {
@@ -44,15 +51,22 @@ var convertToCamelCase = (str) => {
   return sanitize(str).split(SPLIT_REGEX).map((part, index) => index === 0 ? part.toLowerCase() : capitalize(part)).join("");
 };
 var isObject = (value) => value != null && typeof value === "object" && Array.isArray(value) === false;
-var replaceInObject = (obj, pattern, replacer) => {
+var findInObject = (obj, pattern, replacer) => {
+  let found = false;
   for (const key in obj) {
     const value = obj[key];
     if (isObject(value)) {
-      replaceInObject(value, pattern, replacer);
+      found = findInObject(value, pattern, replacer);
     } else if (typeof value === "string" && value.startsWith(pattern)) {
-      obj[key] = value.replace(pattern, replacer);
+      found = true;
+      if (replacer) {
+        obj[key] = value.replace(pattern, replacer);
+      } else {
+        return found;
+      }
     }
   }
+  return found;
 };
 var flatten = (obj, prefix = "", res = {}) => {
   for (const key in obj) {
@@ -81,7 +95,211 @@ var splitQuery = (query) => {
   return { queryType, querySchema, queryInstructions };
 };
 
+// src/utils/statement.ts
+var prepareStatementValue = (statementValues, value, bindNull = false) => {
+  if (!bindNull && value === null) return "NULL";
+  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);
+  return `?${index}`;
+};
+var composeFieldValues = (schemas, schema, statementValues, instructionName, value, options) => {
+  const { field: schemaField, fieldSelector: selector } = getFieldFromSchema(
+    schema,
+    options.fieldSlug,
+    instructionName,
+    options.rootTable
+  );
+  const isSubQuery = isObject(value) && Object.hasOwn(value, RONIN_SCHEMA_SYMBOLS.QUERY);
+  const collectStatementValue = options.type !== "fields";
+  let conditionSelector = selector;
+  let conditionValue = value;
+  if (isSubQuery && collectStatementValue) {
+    conditionValue = `(${compileQueryInput(
+      value[RONIN_SCHEMA_SYMBOLS.QUERY],
+      schemas,
+      { statementValues }
+    ).readStatement})`;
+  } else if (typeof value === "string" && value.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD)) {
+    let targetTable = `"${options.rootTable}"`;
+    let toReplace = RONIN_SCHEMA_SYMBOLS.FIELD;
+    if (value.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD_OLD)) {
+      targetTable = "OLD";
+      toReplace = RONIN_SCHEMA_SYMBOLS.FIELD_OLD;
+    } else if (value.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD_NEW)) {
+      targetTable = "NEW";
+      toReplace = RONIN_SCHEMA_SYMBOLS.FIELD_NEW;
+    }
+    conditionSelector = `${options.customTable ? `"${options.customTable}".` : ""}"${schemaField.slug}"`;
+    conditionValue = `${targetTable}."${value.replace(toReplace, "")}"`;
+  } else if (schemaField.type === "json" && instructionName === "to") {
+    conditionSelector = `"${schemaField.slug}"`;
+    if (collectStatementValue) {
+      const preparedValue = prepareStatementValue(statementValues, value, false);
+      conditionValue = `IIF(${conditionSelector} IS NULL, ${preparedValue}, json_patch(${conditionSelector}, ${preparedValue}))`;
+    }
+  } else if (collectStatementValue) {
+    conditionValue = prepareStatementValue(statementValues, value, false);
+  }
+  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) => {
+  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, {
+        ...options,
+        condition: conditionType
+      })
+    );
+    return conditions.join(" AND ");
+  }
+  if (options.fieldSlug) {
+    const fieldDetails = getFieldFromSchema(
+      schema,
+      options.fieldSlug,
+      instructionName,
+      options.rootTable
+    );
+    const { field: schemaField } = fieldDetails;
+    const consumeJSON = schemaField.type === "json" && instructionName === "to";
+    const isSubQuery = isNested && Object.hasOwn(value, RONIN_SCHEMA_SYMBOLS.QUERY);
+    if (!(isObject(value) || Array.isArray(value)) || isSubQuery || consumeJSON) {
+      return composeFieldValues(
+        schemas,
+        schema,
+        statementValues,
+        instructionName,
+        value,
+        { ...options, fieldSlug: options.fieldSlug }
+      );
+    }
+    if (schemaField.type === "reference" && isNested) {
+      const keys = Object.keys(value);
+      const values = Object.values(value);
+      let recordTarget;
+      if (keys.length === 1 && keys[0] === "id") {
+        recordTarget = values[0];
+      } else {
+        const relatedSchema = getSchemaBySlug(schemas, schemaField.target.slug);
+        const subQuery = {
+          get: {
+            [relatedSchema.slug]: {
+              with: value,
+              selecting: ["id"]
+            }
+          }
+        };
+        recordTarget = {
+          [RONIN_SCHEMA_SYMBOLS.QUERY]: subQuery
+        };
+      }
+      return composeConditions(
+        schemas,
+        schema,
+        statementValues,
+        instructionName,
+        recordTarget,
+        options
+      );
+    }
+  }
+  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, {
+        ...options,
+        fieldSlug: nestedFieldSlug
+      });
+    });
+    const joiner = instructionName === "to" ? ", " : " AND ";
+    if (instructionName === "to") return `${conditions.join(joiner)}`;
+    return conditions.length === 1 ? conditions[0] : options.fieldSlug ? `(${conditions.join(joiner)})` : conditions.join(joiner);
+  }
+  if (Array.isArray(value)) {
+    const conditions = value.map(
+      (filter) => composeConditions(
+        schemas,
+        schema,
+        statementValues,
+        instructionName,
+        filter,
+        options
+      )
+    );
+    return conditions.join(" OR ");
+  }
+  throw new RoninError({
+    message: `The \`with\` instruction must not contain an empty field. The following fields are empty: \`${options.fieldSlug}\`. If you meant to query by an empty field, try using \`null\` instead.`,
+    code: "INVALID_WITH_VALUE",
+    queries: null
+  });
+};
+var formatIdentifiers = ({ identifiers }, queryInstructions) => {
+  if (!queryInstructions) return queryInstructions;
+  const type = "with" in queryInstructions ? "with" : null;
+  if (!type) return queryInstructions;
+  const nestedInstructions = queryInstructions[type];
+  if (!nestedInstructions || Array.isArray(nestedInstructions))
+    return queryInstructions;
+  const newNestedInstructions = { ...nestedInstructions };
+  for (const oldKey of Object.keys(newNestedInstructions)) {
+    if (oldKey !== "titleIdentifier" && oldKey !== "slugIdentifier") continue;
+    const identifierName = oldKey === "titleIdentifier" ? "title" : "slug";
+    const value = newNestedInstructions[oldKey];
+    const newKey = identifiers?.[identifierName] || "id";
+    newNestedInstructions[newKey] = value;
+    delete newNestedInstructions[oldKey];
+  }
+  return {
+    ...queryInstructions,
+    [type]: newNestedInstructions
+  };
+};
+
+// src/instructions/with.ts
+var getMatcher = (value, negative) => {
+  if (negative) {
+    if (value === null) return "IS NOT";
+    return "!=";
+  }
+  if (value === null) return "IS";
+  return "=";
+};
+var WITH_CONDITIONS = {
+  being: (value, baseValue) => `${getMatcher(baseValue, false)} ${value}`,
+  notBeing: (value, baseValue) => `${getMatcher(baseValue, true)} ${value}`,
+  startingWith: (value) => `LIKE ${value}%`,
+  notStartingWith: (value) => `NOT LIKE ${value}%`,
+  endingWith: (value) => `LIKE %${value}`,
+  notEndingWith: (value) => `NOT LIKE %${value}`,
+  containing: (value) => `LIKE %${value}%`,
+  notContaining: (value) => `NOT LIKE %${value}%`,
+  greaterThan: (value) => `> ${value}`,
+  greaterOrEqual: (value) => `>= ${value}`,
+  lessThan: (value) => `< ${value}`,
+  lessOrEqual: (value) => `<= ${value}`
+};
+var handleWith = (schemas, schema, statementValues, instruction, rootTable) => {
+  const subStatement = composeConditions(
+    schemas,
+    schema,
+    statementValues,
+    "with",
+    instruction,
+    { rootTable }
+  );
+  return `(${subStatement})`;
+};
+
 // src/utils/schema.ts
+import title from "title";
 var getSchemaBySlug = (schemas, slug) => {
   const schema = schemas.find((schema2) => {
     return schema2.slug === slug || schema2.pluralSlug === slug;
@@ -97,13 +315,11 @@ var getSchemaBySlug = (schemas, slug) => {
 var getTableForSchema = (schema) => {
   return convertToSnakeCase(schema.pluralSlug);
 };
-var getSchemaName = (schema) => {
-  return schema.name || schema.slug;
-};
 var composeMetaSchemaSlug = (suffix) => convertToCamelCase(`ronin_${suffix}`);
 var composeAssociationSchemaSlug = (schema, field) => composeMetaSchemaSlug(`${schema.pluralSlug}_${field.slug}`);
 var getFieldSelector = (field, fieldPath, rootTable) => {
-  const tablePrefix = rootTable ? `"${rootTable}".` : "";
+  const symbol = rootTable?.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD) ? `${rootTable.replace(RONIN_SCHEMA_SYMBOLS.FIELD, "").slice(0, -1)}.` : "";
+  const tablePrefix = symbol || (rootTable ? `"${rootTable}".` : "");
   if (field.type === "json") {
     const dotParts = fieldPath.split(".");
     const columnName = tablePrefix + dotParts.shift();
@@ -126,7 +342,7 @@ var getFieldFromSchema = (schema, fieldPath, instructionName, rootTable) => {
   schemaField = schemaFields.find((field) => field.slug === fieldPath);
   if (!schemaField) {
     throw new RoninError({
-      message: `${errorPrefix} does not exist in schema "${getSchemaName(schema)}".`,
+      message: `${errorPrefix} does not exist in schema "${schema.name}".`,
       code: "FIELD_NOT_FOUND",
       field: fieldPath,
       queries: null
@@ -201,27 +417,76 @@ var SYSTEM_SCHEMAS = [
       { slug: "name", type: "string" },
       { slug: "slug", type: "string", required: true },
       { slug: "type", type: "string", required: true },
-      { slug: "schema", type: "reference", target: { pluralSlug: "schemas" } },
+      {
+        slug: "schema",
+        type: "reference",
+        target: { slug: "schema" },
+        required: true
+      },
       { slug: "required", type: "boolean" },
       { slug: "defaultValue", type: "string" },
       { slug: "unique", type: "boolean" },
       { slug: "autoIncrement", type: "boolean" },
       // Only allowed for fields of type "reference".
-      { slug: "target", type: "reference", target: { pluralSlug: "schemas" } },
+      { slug: "target", type: "reference", target: { slug: "schema" } },
       { slug: "kind", type: "string" },
       { slug: "actions", type: "group" },
       { slug: "actions.onDelete", type: "string" },
       { slug: "actions.onUpdate", type: "string" }
     ]
+  },
+  {
+    name: "Index",
+    pluralName: "Indexes",
+    slug: "index",
+    pluralSlug: "indexes",
+    fields: [
+      ...SYSTEM_FIELDS,
+      { slug: "slug", type: "string", required: true },
+      {
+        slug: "schema",
+        type: "reference",
+        target: { slug: "schema" },
+        required: true
+      },
+      { slug: "unique", type: "boolean" },
+      { slug: "filter", type: "json" }
+    ]
+  },
+  {
+    name: "Trigger",
+    pluralName: "Triggers",
+    slug: "trigger",
+    pluralSlug: "triggers",
+    fields: [
+      ...SYSTEM_FIELDS,
+      { slug: "slug", type: "string", required: true },
+      { slug: "schema", type: "reference", target: { slug: "schema" }, required: true },
+      { slug: "cause", type: "string", required: true },
+      { slug: "filter", type: "json" },
+      { slug: "effects", type: "json", required: true }
+    ]
   }
 ];
+var SYSTEM_SCHEMA_SLUGS = SYSTEM_SCHEMAS.flatMap(({ slug, pluralSlug }) => [
+  slug,
+  pluralSlug
+]);
+var prepareSchema = (schema) => {
+  const copiedSchema = { ...schema };
+  if (!copiedSchema.pluralSlug) copiedSchema.pluralSlug = pluralize(copiedSchema.slug);
+  if (!copiedSchema.name) copiedSchema.name = slugToName(copiedSchema.slug);
+  if (!copiedSchema.pluralName)
+    copiedSchema.pluralName = slugToName(copiedSchema.pluralSlug);
+  return copiedSchema;
+};
 var addSystemSchemas = (schemas) => {
-  const list = [...SYSTEM_SCHEMAS, ...schemas].map((schema) => ({ ...schema }));
+  const list = [...SYSTEM_SCHEMAS, ...schemas].map(prepareSchema);
   for (const schema of list) {
     const defaultIncluding = {};
     for (const field of schema.fields || []) {
       if (field.type === "reference" && !field.slug.startsWith("ronin.")) {
-        const relatedSchema = getSchemaBySlug(list, field.target.pluralSlug);
+        const relatedSchema = getSchemaBySlug(list, field.target.slug);
         let fieldSlug = relatedSchema.slug;
         if (field.kind === "many") {
           fieldSlug = composeAssociationSchemaSlug(schema, field);
@@ -253,7 +518,7 @@ var addSystemSchemas = (schemas) => {
             }
           }
         };
-        const relatedSchemaToModify = getSchemaBySlug(list, field.target.pluralSlug);
+        const relatedSchemaToModify = getSchemaBySlug(list, field.target.slug);
         if (!relatedSchemaToModify) throw new Error("Missing related schema");
         relatedSchemaToModify.including = {
           [schema.pluralSlug]: {
@@ -298,7 +563,7 @@ var getFieldStatement = (field) => {
     statement += ` DEFAULT ${field.defaultValue}`;
   if (field.type === "reference") {
     const actions = field.actions || {};
-    const targetTable = convertToSnakeCase(field.target.pluralSlug);
+    const targetTable = convertToSnakeCase(pluralize(field.target.slug));
     statement += ` REFERENCES ${targetTable}("id")`;
     for (const trigger in actions) {
       const triggerName = trigger.toUpperCase().slice(2);
@@ -308,68 +573,129 @@ var getFieldStatement = (field) => {
   }
   return statement;
 };
-var addSchemaQueries = (queryDetails, writeStatements) => {
+var addSchemaQueries = (schemas, statementValues, queryDetails, writeStatements) => {
   const { queryType, querySchema, queryInstructions } = queryDetails;
   if (!["create", "set", "drop"].includes(queryType)) return;
-  if (!["schema", "schemas", "field", "fields"].includes(querySchema)) return;
+  if (!SYSTEM_SCHEMA_SLUGS.includes(querySchema)) return;
   const instructionName = mappedInstructions[queryType];
   const instructionList = queryInstructions[instructionName];
-  const kind = ["schema", "schemas"].includes(querySchema) ? "schemas" : "fields";
-  const instructionTarget = kind === "schemas" ? instructionList : instructionList?.schema;
+  const kind = getSchemaBySlug(SYSTEM_SCHEMAS, querySchema).pluralSlug;
   let tableAction = "ALTER";
-  let schemaPluralSlug = null;
   let queryTypeReadable = null;
   switch (queryType) {
     case "create": {
-      if (kind === "schemas") tableAction = "CREATE";
-      schemaPluralSlug = instructionTarget?.pluralSlug;
+      if (kind === "schemas" || kind === "indexes" || kind === "triggers") {
+        tableAction = "CREATE";
+      }
       queryTypeReadable = "creating";
       break;
     }
     case "set": {
       if (kind === "schemas") tableAction = "ALTER";
-      schemaPluralSlug = instructionTarget?.pluralSlug?.being || instructionTarget?.pluralSlug;
       queryTypeReadable = "updating";
       break;
     }
     case "drop": {
-      if (kind === "schemas") tableAction = "DROP";
-      schemaPluralSlug = instructionTarget?.pluralSlug?.being || instructionTarget?.pluralSlug;
+      if (kind === "schemas" || kind === "indexes" || kind === "triggers") {
+        tableAction = "DROP";
+      }
       queryTypeReadable = "deleting";
       break;
     }
   }
-  if (!schemaPluralSlug) {
-    const field = kind === "schemas" ? "pluralSlug" : "schema.pluralSlug";
+  const slug = instructionList?.slug?.being || instructionList?.slug;
+  if (!slug) {
     throw new RoninError({
-      message: `When ${queryTypeReadable} ${kind}, a \`${field}\` field must be provided in the \`${instructionName}\` instruction.`,
+      message: `When ${queryTypeReadable} ${kind}, a \`slug\` field must be provided in the \`${instructionName}\` instruction.`,
       code: "MISSING_FIELD",
-      fields: [field]
+      fields: ["slug"]
     });
   }
-  const table = convertToSnakeCase(schemaPluralSlug);
-  const fields = [...SYSTEM_FIELDS];
-  let statement = `${tableAction} TABLE "${table}"`;
+  const schemaInstruction = instructionList?.schema;
+  const schemaSlug = schemaInstruction?.slug?.being || schemaInstruction?.slug;
+  if (kind !== "schemas" && !schemaSlug) {
+    throw new RoninError({
+      message: `When ${queryTypeReadable} ${kind}, a \`schema.slug\` field must be provided in the \`${instructionName}\` instruction.`,
+      code: "MISSING_FIELD",
+      fields: ["schema.slug"]
+    });
+  }
+  const tableName = convertToSnakeCase(pluralize(kind === "schemas" ? slug : schemaSlug));
+  if (kind === "indexes") {
+    const indexName = convertToSnakeCase(slug);
+    const unique = instructionList?.unique;
+    const filterQuery = instructionList?.filter;
+    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,
+          filterQuery
+        );
+        statement2 += ` WHERE (${withStatement})`;
+      }
+    }
+    writeStatements.push(statement2);
+    return;
+  }
+  if (kind === "triggers") {
+    const triggerName = convertToSnakeCase(slug);
+    let statement2 = `${tableAction} TRIGGER "${triggerName}"`;
+    if (queryType === "create") {
+      const cause = slugToName(instructionList?.cause).toUpperCase();
+      const statementParts = [cause, "ON", `"${tableName}"`];
+      const effectQueries = instructionList?.effects;
+      const filterQuery = instructionList?.filter;
+      if (filterQuery || effectQueries.some((query) => findInObject(query, RONIN_SCHEMA_SYMBOLS.FIELD))) {
+        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,
+          filterQuery,
+          tablePlaceholder
+        );
+        statementParts.push("WHEN", `(${withStatement})`);
+      }
+      const effectStatements = effectQueries.map((effectQuery) => {
+        return compileQueryInput(effectQuery, schemas, {
+          statementValues,
+          disableReturning: true
+        }).readStatement;
+      });
+      if (effectStatements.length > 1) statementParts.push("BEGIN");
+      statementParts.push(effectStatements.join("; "));
+      if (effectStatements.length > 1) statementParts.push("END");
+      statement2 += ` ${statementParts.join(" ")}`;
+    }
+    writeStatements.push(statement2);
+    return;
+  }
+  let statement = `${tableAction} TABLE "${tableName}"`;
   if (kind === "schemas") {
+    const fields = [...SYSTEM_FIELDS];
     if (queryType === "create") {
       const columns = fields.map(getFieldStatement).filter(Boolean);
       statement += ` (${columns.join(", ")})`;
     } else if (queryType === "set") {
-      const newSlug = queryInstructions.to?.pluralSlug;
+      const newSlug = queryInstructions.to?.slug;
       if (newSlug) {
-        const newTable = convertToSnakeCase(newSlug);
+        const newTable = convertToSnakeCase(pluralize(newSlug));
         statement += ` RENAME TO "${newTable}"`;
       }
     }
-  } else if (kind === "fields") {
-    const fieldSlug = instructionTarget?.slug?.being || instructionList?.slug;
-    if (!fieldSlug) {
-      throw new RoninError({
-        message: `When ${queryTypeReadable} fields, a \`slug\` field must be provided in the \`${instructionName}\` instruction.`,
-        code: "MISSING_FIELD",
-        fields: ["slug"]
-      });
-    }
+    writeStatements.push(statement);
+    return;
+  }
+  if (kind === "fields") {
     if (queryType === "create") {
       if (!instructionList.type) {
         throw new RoninError({
@@ -382,207 +708,29 @@ var addSchemaQueries = (queryDetails, writeStatements) => {
     } else if (queryType === "set") {
       const newSlug = queryInstructions.to?.slug;
       if (newSlug) {
-        statement += ` RENAME COLUMN "${fieldSlug}" TO "${newSlug}"`;
+        statement += ` RENAME COLUMN "${slug}" TO "${newSlug}"`;
       }
     } else if (queryType === "drop") {
-      statement += ` DROP COLUMN "${fieldSlug}"`;
+      statement += ` DROP COLUMN "${slug}"`;
     }
+    writeStatements.push(statement);
   }
-  writeStatements.push(statement);
-};
-
-// src/instructions/with.ts
-var getMatcher = (value, negative) => {
-  if (negative) {
-    if (value === null) return "IS NOT";
-    return "!=";
-  }
-  if (value === null) return "IS";
-  return "=";
-};
-var WITH_CONDITIONS = {
-  being: (value, baseValue) => `${getMatcher(baseValue, false)} ${value}`,
-  notBeing: (value, baseValue) => `${getMatcher(baseValue, true)} ${value}`,
-  startingWith: (value) => `LIKE ${value}%`,
-  notStartingWith: (value) => `NOT LIKE ${value}%`,
-  endingWith: (value) => `LIKE %${value}`,
-  notEndingWith: (value) => `NOT LIKE %${value}`,
-  containing: (value) => `LIKE %${value}%`,
-  notContaining: (value) => `NOT LIKE %${value}%`,
-  greaterThan: (value) => `> ${value}`,
-  greaterOrEqual: (value) => `>= ${value}`,
-  lessThan: (value) => `< ${value}`,
-  lessOrEqual: (value) => `<= ${value}`
-};
-var handleWith = (schemas, schema, statementValues, instruction, rootTable) => {
-  const subStatement = composeConditions(
-    schemas,
-    schema,
-    statementValues,
-    "with",
-    instruction,
-    { rootTable }
-  );
-  return `(${subStatement})`;
-};
-
-// src/utils/statement.ts
-var prepareStatementValue = (statementValues, value, bindNull = false) => {
-  if (!bindNull && value === null) return "NULL";
-  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);
-  return `?${index}`;
 };
-var composeFieldValues = (schemas, schema, statementValues, instructionName, value, options) => {
-  const { field: schemaField, fieldSelector: selector } = getFieldFromSchema(
-    schema,
-    options.fieldSlug,
-    instructionName,
-    options.rootTable
-  );
-  const isSubQuery = isObject(value) && Object.hasOwn(value, RONIN_SCHEMA_SYMBOLS.QUERY);
-  const collectStatementValue = options.type !== "fields";
-  let conditionSelector = selector;
-  let conditionValue = value;
-  if (isSubQuery && collectStatementValue) {
-    conditionValue = `(${compileQueryInput(
-      value[RONIN_SCHEMA_SYMBOLS.QUERY],
-      schemas,
-      { statementValues }
-    ).readStatement})`;
-  } else if (typeof value === "string" && value.startsWith(RONIN_SCHEMA_SYMBOLS.FIELD)) {
-    conditionSelector = `"${options.customTable}"."${schemaField.slug}"`;
-    conditionValue = `"${options.rootTable}"."${value.replace(RONIN_SCHEMA_SYMBOLS.FIELD, "")}"`;
-  } else if (schemaField.type === "json" && instructionName === "to") {
-    conditionSelector = `"${schemaField.slug}"`;
-    if (collectStatementValue) {
-      const preparedValue = prepareStatementValue(statementValues, value, false);
-      conditionValue = `IIF(${conditionSelector} IS NULL, ${preparedValue}, json_patch(${conditionSelector}, ${preparedValue}))`;
-    }
-  } else if (collectStatementValue) {
-    conditionValue = prepareStatementValue(statementValues, value, false);
-  }
-  if (options.type === "fields") return conditionSelector;
-  if (options.type === "values") return conditionValue;
-  return `${conditionSelector} ${WITH_CONDITIONS[options.condition || "being"](conditionValue, value)}`;
+var slugToName = (slug) => {
+  const name = slug.replace(/([a-z])([A-Z])/g, "$1 $2");
+  return title(name);
 };
-var composeConditions = (schemas, schema, statementValues, 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, {
-        ...options,
-        condition: conditionType
-      })
-    );
-    return conditions.join(" AND ");
-  }
-  if (options.fieldSlug) {
-    const fieldDetails = getFieldFromSchema(
-      schema,
-      options.fieldSlug,
-      instructionName,
-      options.rootTable
-    );
-    const { field: schemaField } = fieldDetails;
-    const consumeJSON = schemaField.type === "json" && instructionName === "to";
-    const isSubQuery = isNested && Object.hasOwn(value, RONIN_SCHEMA_SYMBOLS.QUERY);
-    if (!(isObject(value) || Array.isArray(value)) || isSubQuery || consumeJSON) {
-      return composeFieldValues(
-        schemas,
-        schema,
-        statementValues,
-        instructionName,
-        value,
-        { ...options, fieldSlug: options.fieldSlug }
-      );
-    }
-    if (schemaField.type === "reference" && isNested) {
-      const keys = Object.keys(value);
-      const values = Object.values(value);
-      let recordTarget;
-      if (keys.length === 1 && keys[0] === "id") {
-        recordTarget = values[0];
-      } else {
-        const relatedSchema = getSchemaBySlug(schemas, schemaField.target.pluralSlug);
-        const subQuery = {
-          get: {
-            [relatedSchema.slug]: {
-              with: value,
-              selecting: ["id"]
-            }
-          }
-        };
-        recordTarget = {
-          [RONIN_SCHEMA_SYMBOLS.QUERY]: subQuery
-        };
-      }
-      return composeConditions(
-        schemas,
-        schema,
-        statementValues,
-        instructionName,
-        recordTarget,
-        options
-      );
-    }
+var VOWELS = ["a", "e", "i", "o", "u"];
+var pluralize = (word) => {
+  const lastLetter = word.slice(-1).toLowerCase();
+  const secondLastLetter = word.slice(-2, -1).toLowerCase();
+  if (lastLetter === "y" && !VOWELS.includes(secondLastLetter)) {
+    return `${word.slice(0, -1)}ies`;
   }
-  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, {
-        ...options,
-        fieldSlug: nestedFieldSlug
-      });
-    });
-    const joiner = instructionName === "to" ? ", " : " AND ";
-    if (instructionName === "to") return `${conditions.join(joiner)}`;
-    return conditions.length === 1 ? conditions[0] : options.fieldSlug ? `(${conditions.join(joiner)})` : conditions.join(joiner);
-  }
-  if (Array.isArray(value)) {
-    const conditions = value.map(
-      (filter) => composeConditions(
-        schemas,
-        schema,
-        statementValues,
-        instructionName,
-        filter,
-        options
-      )
-    );
-    return conditions.join(" OR ");
+  if (lastLetter === "s" || word.slice(-2).toLowerCase() === "ch" || word.slice(-2).toLowerCase() === "sh" || word.slice(-2).toLowerCase() === "ex") {
+    return `${word}es`;
   }
-  throw new RoninError({
-    message: `The \`with\` instruction must not contain an empty field. The following fields are empty: \`${options.fieldSlug}\`. If you meant to query by an empty field, try using \`null\` instead.`,
-    code: "INVALID_WITH_VALUE",
-    queries: null
-  });
-};
-var formatIdentifiers = ({ identifiers }, queryInstructions) => {
-  if (!queryInstructions) return queryInstructions;
-  const type = "with" in queryInstructions ? "with" : null;
-  if (!type) return queryInstructions;
-  const nestedInstructions = queryInstructions[type];
-  if (!nestedInstructions || Array.isArray(nestedInstructions))
-    return queryInstructions;
-  const newNestedInstructions = { ...nestedInstructions };
-  for (const oldKey of Object.keys(newNestedInstructions)) {
-    if (oldKey !== "titleIdentifier" && oldKey !== "slugIdentifier") continue;
-    const identifierName = oldKey === "titleIdentifier" ? "title" : "slug";
-    const value = newNestedInstructions[oldKey];
-    const newKey = identifiers?.[identifierName] || "id";
-    newNestedInstructions[newKey] = value;
-    delete newNestedInstructions[oldKey];
-  }
-  return {
-    ...queryInstructions,
-    [type]: newNestedInstructions
-  };
+  return `${word}s`;
 };
 
 // src/instructions/before-after.ts
@@ -673,12 +821,12 @@ var handleFor = (schemas, schema, statementValues, instruction, rootTable) => {
     const forFilter = schema.for?.[shortcut];
     if (!forFilter) {
       throw new RoninError({
-        message: `The provided \`for\` shortcut "${shortcut}" does not exist in schema "${getSchemaName(schema)}".`,
+        message: `The provided \`for\` shortcut "${shortcut}" does not exist in schema "${schema.name}".`,
         code: "INVALID_FOR_VALUE"
       });
     }
     const replacedForFilter = structuredClone(forFilter);
-    replaceInObject(
+    findInObject(
       replacedForFilter,
       RONIN_SCHEMA_SYMBOLS.VALUE,
       (match) => match.replace(RONIN_SCHEMA_SYMBOLS.VALUE, args)
@@ -705,7 +853,7 @@ var handleIncluding = (schemas, statementValues, schema, instruction, rootTable)
     const includingQuery = schema.including?.[shortcut];
     if (!includingQuery) {
       throw new RoninError({
-        message: `The provided \`including\` shortcut "${shortcut}" does not exist in schema "${getSchemaName(schema)}".`,
+        message: `The provided \`including\` shortcut "${shortcut}" does not exist in schema "${schema.name}".`,
         code: "INVALID_INCLUDING_VALUE"
       });
     }
@@ -943,7 +1091,7 @@ var compileQueryInput = (query, defaultSchemas, options) => {
   let table = getTableForSchema(schema);
   const statementValues = options?.statementValues || [];
   const writeStatements = [];
-  addSchemaQueries(parsedQuery, writeStatements);
+  addSchemaQueries(schemas, statementValues, parsedQuery, writeStatements);
   const columns = handleSelecting(schema, statementValues, {
     selecting: instructions?.selecting,
     including: instructions?.including

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {
@@ -28,11 +28,13 @@
   "author": "ronin",
   "license": "Apache-2.0",
   "dependencies": {
-    "@paralleldrive/cuid2": "2.2.2"
+    "@paralleldrive/cuid2": "2.2.2",
+    "title": "3.5.3"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.2",
     "@types/bun": "1.1.10",
+    "@types/title": "3.4.3",
     "tsup": "8.3.0",
     "typescript": "5.6.2",
     "zod": "3.23.8"