@ronin/compiler 0.7.1 → 0.7.2

package/dist/index.d.ts

@@ -1,5 +1,12 @@
 import { z } from 'zod';
 
+declare const ExpressionSchema: z.ZodObject<{
+    __RONIN_EXPRESSION: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    __RONIN_EXPRESSION: string;
+}, {
+    __RONIN_EXPRESSION: string;
+}>;
 declare const WithInstructionSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull, z.ZodAny]>, z.ZodEffects<z.ZodObject<{
     being: z.ZodOptional<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull, z.ZodAny]>, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull, z.ZodAny]>, "many">]>>;
     notBeing: z.ZodOptional<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull, z.ZodAny]>, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull, z.ZodAny]>, "many">]>>;
@@ -5684,6 +5691,7 @@ declare const QuerySchema: z.ZodObject<{
 
 type GetInstructions = z.infer<typeof GetInstructionsSchema>;
 type WithInstruction = z.infer<typeof WithInstructionSchema>;
+type Expression = z.infer<typeof ExpressionSchema>;
 type Query = z.infer<typeof QuerySchema>;
 interface Statement {
     statement: string;
@@ -5698,13 +5706,14 @@ type ModelFieldBasics = {
     unique?: boolean;
     required?: boolean;
     defaultValue?: unknown;
+    check?: Expression;
 };
 type ModelFieldNormal = ModelFieldBasics & {
     type: 'string' | 'number' | 'boolean' | 'date' | 'json' | 'group';
 };
 type ModelFieldReferenceAction = 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT' | 'NO ACTION';
 type ModelFieldReference = ModelFieldBasics & {
-    type: 'reference';
+    type: 'link';
     target: Omit<Partial<Model>, 'slug'> & Pick<Model, 'slug'>;
     kind?: 'one' | 'many';
     actions?: {
@@ -5787,11 +5796,11 @@ interface Model {
     tableAlias?: string;
     /**
      * If the model is used to associate two models with each other (in the case of
-     * many-cardinality reference fields), this property should contain the field to which
-     * the associative model should be mounted.
+     * many-cardinality link fields), this property should contain the field slug to which
+     * the associative model should be mounted on the source model.
      */
     associationSlug?: string;
-    fields?: Array<ModelField>;
+    fields: Array<ModelField>;
     indexes?: Array<ModelIndex>;
     triggers?: Array<ModelTrigger>;
     presets?: Array<ModelPreset>;

package/dist/index.js

@@ -187,7 +187,7 @@ var composeConditions = (models, model, statementParams, instructionName, value,
         { ...options, fieldSlug: options.fieldSlug }
       );
     }
-    if (modelField.type === "reference" && isNested) {
+    if (modelField.type === "link" && isNested) {
       const keys = Object.keys(value);
       const values = Object.values(value);
       let recordTarget;
@@ -490,7 +490,7 @@ var SYSTEM_MODELS = [
       { slug: "type", type: "string", required: true },
       {
         slug: "model",
-        type: "reference",
+        type: "link",
         target: { slug: "model" },
         required: true
       },
@@ -498,8 +498,8 @@ var SYSTEM_MODELS = [
       { slug: "defaultValue", type: "string" },
       { slug: "unique", type: "boolean" },
       { slug: "autoIncrement", type: "boolean" },
-      // Only allowed for fields of type "reference".
-      { slug: "target", type: "reference", target: { slug: "model" } },
+      // Only allowed for fields of type "link".
+      { slug: "target", type: "link", target: { slug: "model" } },
       { slug: "kind", type: "string" },
       { slug: "actions", type: "group" },
       { slug: "actions.onDelete", type: "string" },
@@ -516,7 +516,7 @@ var SYSTEM_MODELS = [
       { slug: "slug", type: "string", required: true },
       {
         slug: "model",
-        type: "reference",
+        type: "link",
         target: { slug: "model" },
         required: true
       },
@@ -535,7 +535,7 @@ var SYSTEM_MODELS = [
       { slug: "slug", type: "string", required: true },
       {
         slug: "model",
-        type: "reference",
+        type: "link",
         target: { slug: "model" },
         required: true
       },
@@ -552,7 +552,7 @@ var SYSTEM_MODELS = [
       { slug: "slug", type: "string", required: true },
       {
         slug: "model",
-        type: "reference",
+        type: "link",
         target: { slug: "model" },
         required: true
       },
@@ -568,7 +568,7 @@ var addSystemModels = (models) => {
   const associativeModels = models.flatMap((model) => {
     const addedModels = [];
     for (const field of model.fields || []) {
-      if (field.type === "reference" && !field.slug.startsWith("ronin.")) {
+      if (field.type === "link" && !field.slug.startsWith("ronin.")) {
         const relatedModel = getModelBySlug(models, field.target.slug);
         let fieldSlug = relatedModel.slug;
         if (field.kind === "many") {
@@ -580,12 +580,12 @@ var addSystemModels = (models) => {
             fields: [
               {
                 slug: "source",
-                type: "reference",
+                type: "link",
                 target: { slug: model.slug }
               },
               {
                 slug: "target",
-                type: "reference",
+                type: "link",
                 target: { slug: relatedModel.slug }
               }
             ]
@@ -600,7 +600,7 @@ var addSystemModels = (models) => {
 var addDefaultModelPresets = (list, model) => {
   const defaultPresets = [];
   for (const field of model.fields || []) {
-    if (field.type === "reference" && !field.slug.startsWith("ronin.")) {
+    if (field.type === "link" && !field.slug.startsWith("ronin.")) {
       const relatedModel = getModelBySlug(list, field.target.slug);
       if (field.kind === "many") continue;
       defaultPresets.push({
@@ -611,7 +611,7 @@ var addDefaultModelPresets = (list, model) => {
                 get: {
                   [relatedModel.slug]: {
                     with: {
-                      // Compare the `id` field of the related model to the reference field on
+                      // Compare the `id` field of the related model to the link field on
                       // the root model (`field.slug`).
                       id: {
                         [RONIN_MODEL_SYMBOLS.EXPRESSION]: `${RONIN_MODEL_SYMBOLS.FIELD_PARENT}${field.slug}`
@@ -629,7 +629,7 @@ var addDefaultModelPresets = (list, model) => {
   }
   const childModels = list.map((subModel) => {
     const field = subModel.fields?.find((field2) => {
-      return field2.type === "reference" && field2.target.slug === model.slug;
+      return field2.type === "link" && field2.target.slug === model.slug;
     });
     if (!field) return null;
     return { model: subModel, field };
@@ -670,7 +670,7 @@ var mappedInstructions = {
   drop: "with"
 };
 var typesInSQLite = {
-  reference: "TEXT",
+  link: "TEXT",
   string: "TEXT",
   date: "DATETIME",
   blob: "TEXT",
@@ -678,7 +678,7 @@ var typesInSQLite = {
   number: "INTEGER",
   json: "TEXT"
 };
-var getFieldStatement = (field) => {
+var getFieldStatement = (model, field) => {
   if (field.type === "group") return null;
   let statement = `"${field.slug}" ${typesInSQLite[field.type]}`;
   if (field.slug === "id") statement += " PRIMARY KEY";
@@ -686,7 +686,11 @@ var getFieldStatement = (field) => {
   if (field.required === true) statement += " NOT NULL";
   if (typeof field.defaultValue !== "undefined")
     statement += ` DEFAULT ${field.defaultValue}`;
-  if (field.type === "reference") {
+  if (typeof field.check !== "undefined") {
+    const symbol = getSymbol(field.check);
+    statement += ` CHECK (${parseFieldExpression(model, "to", symbol?.value)})`;
+  }
+  if (field.type === "link") {
     const actions = field.actions || {};
     const targetTable = convertToSnakeCase(pluralize(field.target.slug));
     statement += ` REFERENCES ${targetTable}("id")`;
@@ -846,13 +850,14 @@ var addModelQueries = (models, queryDetails, dependencyStatements) => {
       queryInstructions.to = modelWithPresets;
     }
     if (queryType === "create") {
-      const { fields } = queryInstructions.to;
-      const columns = fields.map(getFieldStatement).filter(Boolean);
+      const newModel = queryInstructions.to;
+      const { fields } = newModel;
+      const columns = fields.map((field) => getFieldStatement(newModel, field)).filter(Boolean);
       dependencyStatements.push({
         statement: `${statement} (${columns.join(", ")})`,
         params: []
       });
-      models.push(queryInstructions.to);
+      models.push(newModel);
     } else if (queryType === "set") {
       const newSlug = queryInstructions.to?.pluralSlug;
       if (newSlug) {
@@ -879,7 +884,7 @@ var addModelQueries = (models, queryDetails, dependencyStatements) => {
         });
       }
       dependencyStatements.push({
-        statement: `${statement} ADD COLUMN ${getFieldStatement(instructionList)}`,
+        statement: `${statement} ADD COLUMN ${getFieldStatement(targetModel, instructionList)}`,
         params: []
       });
     } else if (queryType === "set") {
@@ -1201,7 +1206,7 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   for (const fieldSlug in toInstruction) {
     const fieldValue = toInstruction[fieldSlug];
     const fieldDetails = getFieldFromModel(model, fieldSlug, "to");
-    if (fieldDetails.field.type === "reference" && fieldDetails.field.kind === "many") {
+    if (fieldDetails.field.type === "link" && fieldDetails.field.kind === "many") {
       delete toInstruction[fieldSlug];
       const associativeModelSlug = composeAssociationModelSlug(model, fieldDetails.field);
       const composeStatement = (subQueryType, value) => {

package/package.json

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