@ronin/compiler 0.17.1 → 0.17.2-leo-ron-1099-experimental-380

package/dist/index.d.ts

@@ -324,7 +324,7 @@ type ModelPreset = {
 };
 type ModelEntityList<T extends {
     slug: string;
-}> = Record<NonNullable<T['slug']>, Partial<T>>;
+}> = Record<NonNullable<T['slug']>, T extends infer U ? Omit<U, 'slug'> : never>;
 interface Model<T extends ModelEntityList<ModelField> = ModelEntityList<ModelField>> {
     id: string;
     name: string;

package/dist/index.js

@@ -587,7 +587,8 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
 var handleUsing = (model, instructions) => {
   const normalizedUsing = Array.isArray(instructions.using) ? Object.fromEntries(instructions.using.map((presetSlug) => [presetSlug, null])) : instructions.using;
   if ("links" in normalizedUsing) {
-    for (const [fieldSlug, field] of Object.entries(model.fields)) {
+    for (const [fieldSlug, rest] of Object.entries(model.fields)) {
+      const field = { slug: fieldSlug, ...rest };
       if (field.type !== "link" || field.kind === "many") continue;
       normalizedUsing[fieldSlug] = null;
     }
@@ -1270,11 +1271,11 @@ var pluralize = (word2) => {
   return `${word2}s`;
 };
 var modelAttributes = [
-  ["pluralSlug", "slug", pluralize],
-  ["name", "slug", slugToName],
-  ["pluralName", "pluralSlug", slugToName],
-  ["idPrefix", "slug", (slug) => slug.slice(0, 3).toLowerCase()],
-  ["table", "pluralSlug", convertToSnakeCase]
+  ["pluralSlug", "slug", pluralize, true],
+  ["name", "slug", slugToName, false],
+  ["pluralName", "pluralSlug", slugToName, false],
+  ["idPrefix", "slug", (slug) => slug.slice(0, 3).toLowerCase(), false],
+  ["table", "pluralSlug", convertToSnakeCase, true]
 ];
 var getModelIdentifier = () => {
   return `mod_${Array.from(crypto.getRandomValues(new Uint8Array(12))).map((b) => b.toString(16).padStart(2, "0")).join("").slice(0, 16).toLowerCase()}`;
@@ -1282,7 +1283,8 @@ var getModelIdentifier = () => {
 var addDefaultModelAttributes = (model, isNew) => {
   const copiedModel = { ...model };
   if (isNew && !copiedModel.id) copiedModel.id = getModelIdentifier();
-  for (const [setting, base, generator] of modelAttributes) {
+  for (const [setting, base, generator, mustRegenerate] of modelAttributes) {
+    if (!(isNew || mustRegenerate)) continue;
     if (copiedModel[setting] || !copiedModel[base]) continue;
     copiedModel[setting] = generator(copiedModel[base]);
   }
@@ -1394,7 +1396,8 @@ var addDefaultModelPresets = (list, model) => {
   }
   const childModels = list.map((subModel) => {
     if (subModel.system?.associationSlug) return null;
-    const field = Object.entries(subModel.fields).find(([_, field2]) => {
+    const field = Object.entries(subModel.fields).find(([fieldSlug, rest]) => {
+      const field2 = { slug: fieldSlug, ...rest };
       return field2.type === "link" && field2.target === model.slug;
     });
     if (!field) return null;
@@ -1497,30 +1500,25 @@ var getSystemFields = (idPrefix) => ({
   id: {
     name: "ID",
     type: "string",
-    slug: "id",
     defaultValue: ID_EXPRESSION(idPrefix)
   },
   "ronin.createdAt": {
     name: "RONIN - Created At",
     type: "date",
-    slug: "ronin.createdAt",
     defaultValue: CURRENT_TIME_EXPRESSION
   },
   "ronin.createdBy": {
     name: "RONIN - Created By",
-    type: "string",
-    slug: "ronin.createdBy"
+    type: "string"
   },
   "ronin.updatedAt": {
     name: "RONIN - Updated At",
     type: "date",
-    slug: "ronin.updatedAt",
     defaultValue: CURRENT_TIME_EXPRESSION
   },
   "ronin.updatedBy": {
     name: "RONIN - Updated By",
-    type: "string",
-    slug: "ronin.updatedBy"
+    type: "string"
   }
 });
 var ROOT_MODEL = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.1",
+  "version": "0.17.2-leo-ron-1099-experimental-380",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {