@ronin/compiler 0.14.5 → 0.14.6-corny-ron-1099-experimental-331

package/dist/index.d.ts

@@ -57,7 +57,21 @@ type QueryTypeEnum = 'get' | 'set' | 'add' | 'remove' | 'count';
 type ModelQueryTypeEnum = 'create' | 'alter' | 'drop';
 type ModelEntityEnum = 'field' | 'index' | 'trigger' | 'preset';
 type FieldValue = string | number | boolean | null | unknown;
-type FieldSelector = Record<string, FieldValue>;
+type FieldSelector = Record<string, FieldValue | StoredObject>;
+type StoredObject = {
+    key: string;
+    src: string;
+    name: string | null;
+    placeholder: {
+        base64: string | null;
+    } | null;
+    meta: {
+        size: number;
+        type: string;
+        width?: number;
+        height?: number;
+    };
+};
 type Expression = {
     [QUERY_SYMBOLS.EXPRESSION]: string;
 };
@@ -185,7 +199,7 @@ type ModelFieldBasics = {
      * The value that should be inserted into the field in the case that no value was
      * explicitly provided for it when a record is created.
      */
-    defaultValue?: Expression | unknown;
+    defaultValue?: Expression | unknown | (() => Expression);
     /**
      * An expression that should be evaluated to form the value of the field. The
      * expression can either be VIRTUAL (evaluated whenever a record is read) or STORED
@@ -193,10 +207,10 @@ type ModelFieldBasics = {
      */
     computedAs?: {
         kind: 'VIRTUAL' | 'STORED';
-        value: Expression;
+        value: Expression | unknown | ((fields: Record<string, unknown>) => Expression);
     };
     /** An expression that gets evaluated every time a value is provided for the field. */
-    check?: Expression;
+    check?: Expression | ((fields: Record<string, unknown>) => Expression);
 };
 type ModelField = ModelFieldBasics & ({
     /** The kind of value that should be stored inside the field. */
@@ -394,4 +408,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, type DropQuery, 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 RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, 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, type DropQuery, 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 RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, type StoredObject, Transaction, type WithInstruction, getQuerySymbol };

package/dist/index.js

@@ -882,7 +882,7 @@ var composeConditions = (models, model, statementParams, instructionName, value,
         instructionName
       });
       const { field: modelField } = fieldDetails || {};
-      const consumeJSON = modelField?.type === "json" && instructionName === "to";
+      const consumeJSON = (modelField?.type === "json" || modelField?.type === "blob") && instructionName === "to";
       if (modelField && !(isObject(value) || Array.isArray(value)) || getQuerySymbol(value) || consumeJSON) {
         return composeFieldValues(
           models,
@@ -1389,7 +1389,7 @@ var composeAssociationModelSlug = (model, field) => convertToCamelCase(`ronin_li
 var getFieldSelector = (model, field, fieldPath, writing) => {
   const symbol = model.tableAlias?.startsWith(QUERY_SYMBOLS.FIELD_PARENT) ? `${model.tableAlias.replace(QUERY_SYMBOLS.FIELD_PARENT, "").slice(0, -1)}.` : "";
   const tablePrefix = symbol || (model.tableAlias ? `"${model.tableAlias}".` : "");
-  if (field.type === "json" && !writing) {
+  if ((field.type === "json" || field.type === "blob") && !writing) {
     const dotParts = fieldPath.split(".");
     const columnName = tablePrefix + dotParts.shift();
     if (dotParts.length > 0) {
@@ -1407,7 +1407,7 @@ function getFieldFromModel(model, fieldPath, source, shouldThrow = true) {
   let modelField;
   if (fieldPath.includes(".")) {
     modelField = modelFields.find((field) => field.slug === fieldPath.split(".")[0]);
-    if (modelField?.type === "json") {
+    if (modelField?.type === "json" || modelField?.type === "blob") {
       const fieldSelector2 = getFieldSelector(model, modelField, fieldPath, writingField);
       return { field: modelField, fieldSelector: fieldSelector2 };
     }
@@ -2009,7 +2009,7 @@ var Transaction = class {
       const record = fields.reduce((acc, field, fieldIndex) => {
         let newSlug = field.mountingPath;
         let newValue = row[fieldIndex];
-        if (field.type === "json") {
+        if (field.type === "json" || field.type === "blob") {
           newValue = JSON.parse(newValue);
         } else if (field.type === "boolean") {
           newValue = Boolean(newValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.14.5",
+  "version": "0.14.6-corny-ron-1099-experimental-331",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {