@ronin/compiler 0.17.14 → 0.17.15-leo-ron-1113-experimental-406

package/dist/index.d.ts

@@ -1,11 +1,13 @@
 /** Query types used for reading data. */
-declare const DML_READ_QUERY_TYPES: readonly ["get", "count"];
+declare const DML_QUERY_TYPES_READ: readonly ["get", "count"];
 /** Query types used for writing data. */
-declare const DML_WRITE_QUERY_TYPES: readonly ["set", "add", "remove"];
+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"];
+/** All query types. */
+declare const QUERY_TYPES: readonly ["get", "count", "set", "add", "remove", "create", "alter", "drop"];
 /**
  * A list of placeholders that can be located inside queries after those queries were
  * serialized into JSON objects.
@@ -473,4 +475,4 @@ declare class Transaction {
 
 declare const CLEAN_ROOT_MODEL: PublicModel;
 
-export { type AddInstructions, type AddQuery, type AddInstructions as AddQueryInstructions, type AlterQuery, type CombinedInstructions, type CountInstructions, type CountQuery, type CountInstructions as CountQueryInstructions, type CreateQuery, DDL_QUERY_TYPES, DML_QUERY_TYPES, DML_READ_QUERY_TYPES, DML_WRITE_QUERY_TYPES, type DropQuery, type ExpandedResult, type GetInstructions, type GetQuery, type GetInstructions as GetQueryInstructions, type PublicModel as Model, type ModelField, type ModelIndex, type ModelPreset, type ModelTrigger, QUERY_SYMBOLS, type Query, type QueryInstructionType as QueryInstruction, type QuerySchemaType, type QueryType, CLEAN_ROOT_MODEL as ROOT_MODEL, type RegularResult, type RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, type ResultRecord, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, type StoredObject, Transaction, type WithInstruction, getQuerySymbol };
+export { type AddInstructions, type AddQuery, type AddInstructions as AddQueryInstructions, type AlterQuery, type CombinedInstructions, type CountInstructions, type CountQuery, type CountInstructions as CountQueryInstructions, type CreateQuery, DDL_QUERY_TYPES, DML_QUERY_TYPES, DML_QUERY_TYPES_READ, DML_QUERY_TYPES_WRITE, type DropQuery, type ExpandedResult, type GetInstructions, type GetQuery, type GetInstructions as GetQueryInstructions, type PublicModel as Model, type ModelField, type ModelIndex, type ModelPreset, type ModelTrigger, QUERY_SYMBOLS, QUERY_TYPES, type Query, type QueryInstructionType as QueryInstruction, type QuerySchemaType, type QueryType, CLEAN_ROOT_MODEL as ROOT_MODEL, type RegularResult, type RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, type ResultRecord, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, type StoredObject, Transaction, type WithInstruction, getQuerySymbol };

package/dist/index.js

@@ -1,11 +1,12 @@
 // src/utils/constants.ts
-var DML_READ_QUERY_TYPES = ["get", "count"];
-var DML_WRITE_QUERY_TYPES = ["set", "add", "remove"];
+var DML_QUERY_TYPES_READ = ["get", "count"];
+var DML_QUERY_TYPES_WRITE = ["set", "add", "remove"];
 var DML_QUERY_TYPES = [
-  ...DML_READ_QUERY_TYPES,
-  ...DML_WRITE_QUERY_TYPES
+  ...DML_QUERY_TYPES_READ,
+  ...DML_QUERY_TYPES_WRITE
 ];
 var DDL_QUERY_TYPES = ["create", "alter", "drop"];
+var QUERY_TYPES = [...DML_QUERY_TYPES, ...DDL_QUERY_TYPES];
 var QUERY_SYMBOLS = {
   // Represents a sub query.
   QUERY: "__RONIN_QUERY",
@@ -1201,7 +1202,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   if (queryType === "get" && !isJoiningMultipleRows && (single || instructions?.limitedTo)) {
     statement += handleLimitedTo(single, instructions?.limitedTo);
   }
-  if (DML_WRITE_QUERY_TYPES.includes(queryType) && returning) {
+  if (DML_QUERY_TYPES_WRITE.includes(queryType) && returning) {
     statement += `RETURNING ${columns}`;
   }
   const mainStatement = {
@@ -1252,18 +1253,18 @@ var filterSelectedFields = (model, instruction) => {
   return selectedFields;
 };
 var prepareStatementValue = (statementParams, value) => {
+  const inlineParams = !statementParams;
   if (value === null) return "NULL";
-  if (!statementParams) {
-    if (typeof value === "string") return `'${value}'`;
-    const valueString = typeof value === "object" ? `json('${JSON.stringify(value, replaceJSON)}')` : value.toString();
-    return valueString;
-  }
   let formattedValue = value;
   if (Array.isArray(value) || isObject(value)) {
-    formattedValue = JSON.stringify(value);
+    formattedValue = JSON.stringify(value, inlineParams ? replaceJSON : void 0);
   } else if (typeof value === "boolean") {
     formattedValue = value ? 1 : 0;
   }
+  if (!statementParams) {
+    if (typeof formattedValue === "string") return `'${formattedValue}'`;
+    return formattedValue.toString();
+  }
   const index = statementParams.push(formattedValue);
   return `?${index}`;
 };
@@ -2037,7 +2038,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
     case "create": {
       const { slug: slug2, ...entityValue } = jsonValue;
       const value = prepareStatementValue(statementParams, entityValue);
-      json = `json_insert(${field}, '$.${slug2}', ${value})`;
+      json = `json_insert(${field}, '$.${slug2}', json(${value}))`;
       if (!existingModel[pluralType]) existingModel[pluralType] = {};
       existingModel[pluralType][slug2] = jsonValue;
       break;
@@ -2054,7 +2055,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
         Object.assign(targetEntities[newSlug], entityValue);
         delete targetEntities[slug];
         const value = prepareStatementValue(statementParams, targetEntities[newSlug]);
-        json = `json_insert(json_remove(${field}, '$.${slug}'), '$.${newSlug}', ${value})`;
+        json = `json_insert(json_remove(${field}, '$.${slug}'), '$.${newSlug}', json(${value}))`;
       } else {
         Object.assign(targetEntities[slug], jsonValue);
         const value = prepareStatementValue(statementParams, jsonValue);
@@ -2378,9 +2379,10 @@ var CLEAN_ROOT_MODEL = omit(ROOT_MODEL, ["system"]);
 export {
   DDL_QUERY_TYPES,
   DML_QUERY_TYPES,
-  DML_READ_QUERY_TYPES,
-  DML_WRITE_QUERY_TYPES,
+  DML_QUERY_TYPES_READ,
+  DML_QUERY_TYPES_WRITE,
   QUERY_SYMBOLS,
+  QUERY_TYPES,
   CLEAN_ROOT_MODEL as ROOT_MODEL,
   RoninError,
   Transaction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.14",
+  "version": "0.17.15-leo-ron-1113-experimental-406",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {