Exclude non-model exports from schemas in code (#30)

ronin-co · Jan 16, 2025 · ebef884 · ebef884
1 parent be36858
commit ebef884
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/src/commands/diff.ts b/src/commands/diff.ts
@@ -37,7 +37,9 @@ export default async (
       logModelDiffs(definedModels, existingModels);
     }
 
+    spinner.stop();
     const modelDiff = await diffModels(definedModels, existingModels);
+    spinner.start();
 
     if (modelDiff.length === 0) {
       spinner.succeed('No changes detected');

diff --git a/src/utils/field.ts b/src/utils/field.ts
@@ -40,7 +40,7 @@ export const diffFields = async (
       const confirmRename =
         rename ||
         (await confirm({
-          message: `Did you mean to rename: ${field.from.slug} -> ${field.to.slug}`,
+          message: `Did you mean to rename field: ${field.from.slug} -> ${field.to.slug}`,
           default: false,
         }));
 

diff --git a/src/utils/misc.ts b/src/utils/misc.ts
@@ -178,7 +178,10 @@ export const getModelDefinitions = async (): Promise<Array<Model>> => {
   }
 
   const sortedModels = sortModels(
-    Object.values(await import(MODEL_IN_CODE_PATH)) as Array<Model>,
+    Object.values(await import(MODEL_IN_CODE_PATH)).filter(
+      (value): value is Model =>
+        typeof value === 'object' && value !== null && 'slug' in value,
+    ) as Array<Model>,
   );
 
   // Check for duplicate model slugs

diff --git a/tests/fixtures/index.ts b/tests/fixtures/index.ts
@@ -2,6 +2,11 @@ import type { Model } from '@ronin/compiler';
 import { add } from 'ronin';
 import { blob, boolean, date, link, model, number, string } from 'ronin/schema';
 
+export const CONSTANTS = {
+  FIRSTNAME: 'Cornelius',
+  LASTNAME: 'Denninger',
+};
+
 const TestAccount = model({
   slug: 'account',
   fields: {

diff --git a/tests/utils/misc.test.ts b/tests/utils/misc.test.ts
@@ -1,5 +1,6 @@
 import { afterEach, describe, expect, mock, spyOn, test } from 'bun:test';
 
+import fs from 'node:fs';
 import {
   InvalidResponseError,
   MODEL_IN_CODE_PATH,
@@ -11,9 +12,7 @@ import {
   sortModels,
 } from '@/src/utils/misc';
 
-import fs from 'node:fs';
-
-import { Account, TestA, TestB } from '@/fixtures/index';
+import { Account, CONSTANTS, TestA, TestB } from '@/fixtures/index';
 import type { Model } from '@ronin/compiler';
 
 describe('misc', () => {
@@ -112,6 +111,20 @@ describe('misc', () => {
       expect(models).toStrictEqual([]);
     });
 
+    test('should return models in code definitions and ignore constants - empty', async () => {
+      mock.module(MODEL_IN_CODE_PATH, () => {
+        return { CONSTANTS };
+      });
+
+      const existsSync = spyOn(fs, 'existsSync');
+      existsSync.mockReturnValue(true);
+      existsSync.mockClear();
+
+      const models = await getModelDefinitions();
+      expect(models).toHaveLength(0);
+      expect(models).toStrictEqual([]);
+    });
+
     test('model file does not exist', async () => {
       const existSpy = spyOn(process, 'exit').mockImplementation(() => {
         throw new Error('process.exit called');