chore: wip

Author: chrisbbreuer

.stacks/core/types/src/model.ts

@@ -50,6 +50,10 @@ export interface Fields {
     unique?: boolean
     required?: boolean
     factory?: () => any
-    validation?: String | Number | Boolean | Date
+    validator?: {
+      rule: String | Number | Boolean | Date
+      message: string
+    }
+    // validation?: String | Number | Boolean | Date
   }
 }

.stacks/core/validation/src/validate.ts

@@ -15,4 +15,12 @@ declare module '@stacksjs/validation' {
 }
 
 const validate = validator.validate
-export { validate, validator, Validator }
+const string = validator.string
+const number = validator.number
+const boolean = validator.boolean
+const array = validator.array
+const object = validator.object
+const any = validator.any
+const email = () => validator.string().email()
+
+export { validate, validator, Validator, string, number, boolean, array, object, any, email }

.stacks/vcs/github/workflows/export-size.yml

@@ -30,4 +30,3 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths: .stacks/core/actions,.stacks/core/arrays,.stacks/core/auth,.stacks/core/build,.stacks/core/cache,.stacks/core/cli,.stacks/core/cloud,.stacks/core/config,.stacks/core/collections,.stacks/core/database,.stacks/core/datetime,.stacks/core/docs,.stacks/core/error-handling,.stacks/core/git,.stacks/core/lint,.stacks/core/modules,.stacks/core/notifications,.stacks/core/objects,.stacks/core/path,.stacks/core/realtime,.stacks/core/router,.stacks/core/security,.stacks/core/server,.stacks/core/storage,.stacks/core/strings,.stacks/core/testing,.stacks/core/types,.stacks/core/ui,.stacks/core/utils,.stacks/core/x-ray
-  commands

app/models/User.ts

@@ -1,93 +1,37 @@
 import { faker } from 'stacks/core/faker/src'
-import { validate } from 'stacks/core/validation/src'
-import type { Model } from 'stacks/core/types/src'
+import { email, string } from 'stacks/core/validation/src'
+import { defineModel } from 'stacks/core/utils/src'
 
-export default <Model> {
-  name: 'User',
+export default defineModel({
+  name: 'User', // defaults to the sanitized file name
   table: 'users',
-  authenticatable: true, // boolean | AuthSettings (including TokenSettings),
+  authenticatable: true, // boolean | AuthSettings (including TokenSettings)
   searchable: true, // boolean | IndexSettings,
   seedable: { // boolean | SeedSettings,
     count: 10,
   },
   fields: {
     name: {
-      validation: validate.string().min(3).max(255),
-      factory: () => faker.person.firstName(),
+      validator: {
+        rule: string().minLength(3).maxLength(255),
+        message: 'Name must be between 3 and 255 characters',
+      },
+      factory: () => faker.person.fullName(),
     },
     email: {
-      validation: validate.string().min(1).max(255),
       unique: true,
+      validator: {
+        rule: email(),
+        message: 'Email must be a valid email address',
+      },
       factory: () => faker.internet.email(),
     },
     password: {
-      validation: validate.string().min(6).max(255),
+      validator: {
+        rule: string().minLength(6).maxLength(255),
+        message: 'Password must be between 6 and 255 characters',
+      },
       factory: () => faker.internet.password(),
     },
   },
-  // dashboard: {
-  //   cards: [
-  //     {
-  //       title: 'Users',
-  //       icon: 'heroicon-o-user',
-  //       color: 'primary',
-  //       value: 'users',
-  //       query: {
-  //         model: 'User',
-  //         count: true,
-
-  // or
-
-  // model: 'User',
-  // count: true,
-  // where: {
-  //   id: 1,
-  // },
-
-  // or
-
-  // model: 'User',
-  // count: true,
-  // where: {
-  //   id: {
-  //     $gt: 1,
-  //   },
-  // },
-
-  // or
-
-  // model: 'User',
-  // count: true,
-  // where: {
-  //   id: {
-  //     $in: [1, 2, 3],
-  //   },
-  // },
-
-  // or
-
-  // model: 'User',
-  // count: true,
-  // where: {
-  //   id: {
-  //     $notIn: [1, 2, 3],
-  //   },
-  // },
-
-  // or
-
-  // model: 'User',
-  // count: true,
-  // where: {
-  //   id: {
-  //     // $notIn: [1, 2, 3],
-  //     $not: {
-  //       $in: [1, 2, 3],
-  //     },
-  //   },
-  // },
-  //       }
-  //     }
-  //   ]
-  // }
-}
+})