@ronin/compiler 0.17.22-leo-ron-1140-experimental-432 → 0.17.22-leo-ron-1140-experimental-434

package/dist/index.d.ts

@@ -5,9 +5,9 @@ declare const DML_QUERY_TYPES_WRITE: readonly ["set", "add", "remove"];
 /** Query types used for interacting with data. */
 declare const DML_QUERY_TYPES: readonly ["get", "count", "set", "add", "remove"];
 /** Query types used for interacting with the database schema. */
-declare const DDL_QUERY_TYPES: readonly ["create", "alter", "drop"];
+declare const DDL_QUERY_TYPES: readonly ["list", "create", "alter", "drop"];
 /** All query types. */
-declare const QUERY_TYPES: readonly ["get", "count", "set", "add", "remove", "create", "alter", "drop"];
+declare const QUERY_TYPES: readonly ["get", "count", "set", "add", "remove", "list", "create", "alter", "drop"];
 /**
  * A list of placeholders that can be located inside queries after those queries were
  * serialized into JSON objects.

package/dist/index.js

@@ -5,7 +5,7 @@ var DML_QUERY_TYPES = [
   ...DML_QUERY_TYPES_READ,
   ...DML_QUERY_TYPES_WRITE
 ];
-var DDL_QUERY_TYPES = ["create", "alter", "drop"];
+var DDL_QUERY_TYPES = ["list", "create", "alter", "drop"];
 var QUERY_TYPES = [...DML_QUERY_TYPES, ...DDL_QUERY_TYPES];
 var QUERY_SYMBOLS = {
   // Represents a sub query.
@@ -1091,7 +1091,8 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       dependencies: [],
       main: dependencyStatements[0],
       selectedFields: [],
-      model: ROOT_MODEL_WITH_ATTRIBUTES
+      model: ROOT_MODEL_WITH_ATTRIBUTES,
+      updatedQuery: defaultQuery
     };
   const parsedQuery = splitQuery(query);
   const { queryType, queryModel, queryInstructions } = parsedQuery;
@@ -1253,7 +1254,8 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     dependencies: dependencyStatements,
     main: mainStatement,
     selectedFields,
-    model
+    model,
+    updatedQuery: query
   };
 };
 
@@ -1593,11 +1595,13 @@ var getSystemFields = (idPrefix) => ({
   }
 });
 var ROOT_MODEL = {
-  slug: "model",
+  slug: "roninModel",
   identifiers: {
     name: "name",
     slug: "slug"
   },
+  // The default ID prefix would be `ron_` based on the slug, but we want `mod_`.
+  idPrefix: "mod",
   // This name mimics the `sqlite_schema` table in SQLite.
   table: "ronin_schema",
   // Indicates that the model was automatically generated by RONIN.
@@ -1791,9 +1795,9 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
   let jsonValue;
   if ("list" in query && query.list) {
     if (slug) {
-      return { get: { model: { with: { slug } } } };
+      return { get: { roninModel: { with: { slug } } } };
     }
-    return { get: { models: {} } };
+    return { get: { roninModels: {} } };
   }
   if ("create" in query && query.create) {
     const init = query.create.model;
@@ -1926,11 +1930,11 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
       });
     }
     const modelSlug2 = "to" in queryTypeDetails ? queryTypeDetails?.to?.slug : "with" in queryTypeDetails ? queryTypeDetails?.with?.slug : void 0;
-    if (modelSlug2 === "model") return null;
+    if (modelSlug2 === "roninModel") return null;
     const queryTypeAction = action === "create" ? "add" : action === "alter" ? "set" : "remove";
     return {
       [queryTypeAction]: {
-        model: queryTypeDetails
+        roninModel: queryTypeDetails
       }
     };
   }
@@ -2124,7 +2128,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
   );
   return {
     set: {
-      model: {
+      roninModel: {
         with: { slug: modelSlug },
         to: {
           [pluralType]: { [QUERY_SYMBOLS.EXPRESSION]: json }
@@ -2200,13 +2204,13 @@ var Transaction = class {
           const query2 = {
             [queryType]: { [model.pluralSlug]: instructions }
           };
-          return { query: query2, index };
+          return { query: query2, index, resultingFromExpansion: true };
         });
       }
       return { query, index };
     });
-    for (const { query, index } of expandedQueries) {
-      const { dependencies, main, selectedFields, model } = compileQueryInput(
+    for (const { query, index, resultingFromExpansion } of expandedQueries) {
+      const { dependencies, main, selectedFields, model, updatedQuery } = compileQueryInput(
         query,
         modelsWithPresets,
         options?.inlineParams ? null : [],
@@ -2219,6 +2223,7 @@ var Transaction = class {
       this.statements.push(...subStatements);
       this.#internalQueries[index].selectedFields.push(selectedFields);
       this.#internalQueries[index].models.push(model);
+      if (!resultingFromExpansion) this.#internalQueries[index].query = updatedQuery;
     }
     this.models = modelsWithPresets;
     return statements;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.22-leo-ron-1140-experimental-432",
+  "version": "0.17.22-leo-ron-1140-experimental-434",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {