@ronin/compiler 0.13.3-leo-ron-1071-experimental-294 → 0.13.4-leo-ron-1071-experimental-295

package/dist/index.d.ts

@@ -147,7 +147,10 @@ interface Statement {
 }
 
 type ModelFieldCollation = 'BINARY' | 'NOCASE' | 'RTRIM';
+type ModelFieldLinkAction = 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT' | 'NO ACTION';
 type ModelFieldBasics = {
+    /** The kind of value that should be stored inside the field. */
+    type?: 'boolean' | 'date' | 'json';
     /** The label that should be used when displaying the field on the RONIN dashboard. */
     name?: string;
     /** Allows for addressing the field programmatically. */
@@ -180,31 +183,34 @@ type ModelFieldBasics = {
     };
     /** An expression that gets evaluated every time a value is provided for the field. */
     check?: Expression;
-    /**
-     * If the field is of type `string`, setting this attribute defines the collation
-     * sequence to use for the field value.
-     */
+};
+type ModelField = ModelFieldBasics | (Omit<ModelFieldBasics, 'type'> & {
+    /** The kind of value that should be stored inside the field. */
+    type: 'string';
+    /** The collation sequence to use for the field value. */
     collation?: ModelFieldCollation;
+}) | (Omit<ModelFieldBasics, 'type'> & {
+    /** The kind of value that should be stored inside the field. */
+    type: 'number';
     /**
-     * If the field is of type `number`, setting this attribute will automatically increment
-     * the value of the field with every new record that gets inserted.
+     * Automatically increments the value of the field with every new inserted record.
      */
     increment?: boolean;
-};
-type ModelFieldNormal = ModelFieldBasics & {
-    type?: 'string' | 'number' | 'boolean' | 'date' | 'json';
-};
-type ModelFieldReferenceAction = 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT' | 'NO ACTION';
-type ModelFieldReference = ModelFieldBasics & {
+}) | (Omit<ModelFieldBasics, 'type'> & {
+    /** The kind of value that should be stored inside the field. */
     type: 'link';
+    /** The target model of the relationship that is being established. */
     target: string;
+    /** Whether the field should be related to one record, or many records. */
     kind?: 'one' | 'many';
+    /**
+     * If the target record is updated or deleted, the defined actions maybe executed.
+     */
     actions?: {
-        onDelete?: ModelFieldReferenceAction;
-        onUpdate?: ModelFieldReferenceAction;
+        onDelete?: ModelFieldLinkAction;
+        onUpdate?: ModelFieldLinkAction;
     };
-};
-type ModelField = ModelFieldNormal | ModelFieldReference;
+});
 type ModelIndexField<T extends Array<ModelField> = Array<ModelField>> = {
     /** The collating sequence used for text placed inside the field. */
     collation?: ModelFieldCollation;

package/dist/index.js

@@ -840,8 +840,12 @@ var getFieldStatement = (models, model, field) => {
     if (symbol) value = `(${parseFieldExpression(model, "to", symbol.value)})`;
     statement += ` DEFAULT ${value}`;
   }
-  if (field.collation) statement += ` COLLATE ${field.collation}`;
-  if (field.increment === true) statement += " AUTOINCREMENT";
+  if (field.type === "string" && field.collation) {
+    statement += ` COLLATE ${field.collation}`;
+  }
+  if (field.type === "number" && field.increment === true) {
+    statement += " AUTOINCREMENT";
+  }
   if (typeof field.check !== "undefined") {
     const symbol = getSymbol(field.check);
     statement += ` CHECK (${parseFieldExpression(model, "to", symbol?.value)})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.13.3-leo-ron-1071-experimental-294",
+  "version": "0.13.4-leo-ron-1071-experimental-295",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {