chore: wip

Author: glennmichael123

app/Actions/Payment/CreateInvoiceSubscription.ts

@@ -9,7 +9,7 @@ export default new Action({
     const user = await User.find(1)
 
     const subscription = await user?.newSubscriptionInvoice('stacks_pro_yearly', {
-      allowPromotions: true, // Example option for allowing promotions
+      allowPromotions: true,
     })
 
     return subscription

app/Models/User.ts

@@ -43,7 +43,7 @@ export default {
   },
 
   hasOne: ['Post', 'Subscriber'],
-  hasMany: ['Deployment'],
+  hasMany: ['Deployment', 'Subscription'],
 
   belongsToMany: ['Team'],
 

storage/framework/core/components/modal/src/components/Transitions.vue

@@ -13,8 +13,6 @@ function handleClose() {
 }
 
 const renderedCode = computed(() => {
-
-
   if (currentTransition.value === 'custom') {
     return `<Modal :visible="visible" @close="handleClose" transition="custom">
   <template #closeButton />

storage/framework/core/components/notification/src/components/Expand.vue

@@ -63,7 +63,7 @@ async function handleCopyCode() {
         Default
       </button>
     </div>
-    <div class="code-block group relative">
+    <div class="group code-block relative">
       <Highlight
         language="javascript"
         class-name="rounded-md text-xs"

storage/framework/core/components/notification/src/components/Usage.vue

@@ -33,7 +33,7 @@ async function handleCopyCode() {
     <p class="my-3 text-base">
       Render the toaster in the root of your app.
     </p>
-    <div class="group code-block relative">
+    <div class="code-block group relative">
       <Highlight
         class-name="rounded-md text-xs"
         language="xml"

storage/framework/core/orm/src/utils.ts

@@ -66,13 +66,19 @@ export async function getRelations(model: Model, modelName: string): Promise<Rel
     if (hasRelations(model, relation)) {
       for (const relationInstance of (model[relation as keyof Model] as any[]) || []) {
         let relationModel = relationInstance.model
-
+        let modelRelation: Model
         if (isString(relationInstance)) {
           relationModel = relationInstance
         }
 
         const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
-        const modelRelation = (await import(modelRelationPath)).default as Model
+        const coreModelRelationPath = path.storagePath(`framework/database/models/generated/${relationModel}.ts`)
+
+        if (fs.existsSync(modelRelationPath))
+          modelRelation = (await import(modelRelationPath)).default as Model
+        else
+          modelRelation = (await import(coreModelRelationPath)).default as Model
+
         const modelRelationTable = getTableName(modelRelation, modelRelationPath)
         const formattedModelName = modelName.toLowerCase()
 
@@ -165,8 +171,9 @@ export async function getPivotTables(
   return []
 }
 
-export async function fetchOtherModelRelations(model: Model, modelName?: string): Promise<RelationConfig[]> {
+export async function fetchOtherModelRelations(modelName?: string): Promise<RelationConfig[]> {
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
+
   const modelRelations = []
 
   for (let i = 0; i < modelFiles.length; i++) {
@@ -224,6 +231,7 @@ export function getFillableAttributes(attributes: Attributes | undefined): strin
 
 export async function writeModelNames(): Promise<void> {
   const models = globSync([path.userModelsPath('*.ts')], { absolute: true })
+  const coreModelFiles = globSync([path.storagePath('framework/database/models/generated/*.ts')], { absolute: true })
   let fileString = `export type ModelNames = `
 
   for (let i = 0; i < models.length; i++) {
@@ -236,15 +244,30 @@ export async function writeModelNames(): Promise<void> {
     if (i < models.length - 1) {
       fileString += ' | '
     }
+  }
+
+  fileString += ' | '
 
-    // Ensure the directory exists
-    const typesDir = path.dirname(path.typesPath(`src/model-names.ts`))
-    await fs.promises.mkdir(typesDir, { recursive: true })
+  for (let j = 0; j < coreModelFiles.length; j++) {
+    const modelPath = coreModelFiles[j] as string
 
-    // Write to the file
-    const typeFilePath = path.typesPath(`src/model-names.ts`)
-    await fs.promises.writeFile(typeFilePath, fileString, 'utf8')
+    const model = (await import(modelPath)).default as Model
+    const modelName = getModelName(model, modelPath)
+
+    fileString += `'${modelName}'`
+
+    if (j < coreModelFiles.length - 1) {
+      fileString += ' | '
+    }
   }
+
+  // Ensure the directory exists
+  const typesDir = path.dirname(path.typesPath(`src/model-names.ts`))
+  await fs.promises.mkdir(typesDir, { recursive: true })
+
+  // Write to the file
+  const typeFilePath = path.typesPath(`src/model-names.ts`)
+  await fs.promises.writeFile(typeFilePath, fileString, 'utf8')
 }
 
 export async function writeModelRequest(): Promise<void> {
@@ -316,7 +339,8 @@ export async function writeModelRequest(): Promise<void> {
       fieldStringType += ` get(key: ${concatenatedFields}): ${entity}\n`
     }
 
-    const otherModelRelations = await fetchOtherModelRelations(model, modelName)
+    const otherModelRelations = await fetchOtherModelRelations(modelName)
+
     for (const otherModel of otherModelRelations) {
       fieldString += ` ${otherModel.foreignKey}: number\n     `
       fieldStringType += ` get(key: '${otherModel.foreignKey}'): string \n`
@@ -1316,21 +1340,21 @@ export async function generateModelString(
 
   jsonFields += '}'
 
-  const otherModelRelations = await fetchOtherModelRelations(model, modelName)
+  const otherModelRelations = await fetchOtherModelRelations(modelName)
 
   for (const otherModelRelation of otherModelRelations) {
     fieldString += ` ${otherModelRelation.foreignKey}?: number \n`
     declareFields += `public ${otherModelRelation.foreignKey}: number | undefined \n   `
     constructorFields += `this.${otherModelRelation.foreignKey} = ${formattedModelName}?.${otherModelRelation.foreignKey}\n   `
   }
 
-  if (useTwoFactor)
+  if (useTwoFactor && tableName === 'users')
     fieldString += 'two_factor_secret?: string \n'
 
-  if (usePasskey)
+  if (usePasskey && tableName === 'users')
     fieldString += 'public_passkey?: string \n'
 
-  if (useBillable)
+  if (useBillable && tableName === 'users')
     fieldString += 'stripe_id?: string \n'
 
   if (useTimestamps) {
@@ -1490,7 +1514,7 @@ export async function generateModelString(
       }
 
       // Method to get a User by criteria
-      static async get(): Promise<UserModel[]> {
+      static async get(): Promise<${modelName}Model[]> {
         const instance = new ${modelName}Model(null)
 
         if (instance.hasSelect) {

storage/framework/core/payments/src/billable/subscription.ts

@@ -1,7 +1,8 @@
 import type Stripe from 'stripe'
+import type { SubscriptionModel } from '../../../../orm/src/models/Subscription'
 import type { UserModel } from '../../../../orm/src/models/User'
-import { stripe } from '..'
 
+import { stripe } from '..'
 import Subscription from '../../../../orm/src/models/Subscription'
 
 export interface SubscriptionManager {
@@ -33,20 +34,21 @@ export const manageSubscription: SubscriptionManager = (() => {
     return subscription
   }
 
-  async function storeSubscription(options: Stripe.Subscription): Promise<any> {
+  async function storeSubscription(options: Stripe.Subscription): Promise<SubscriptionModel> {
     const data = {
       user_id: 1,
-      type: 'subscription',
+      type: 'premium',
       stripe_id: options.id,
       stripe_status: options.status,
       stripe_price: options.items.data[0].price.id,
       quantity: options.items.data[0].quantity,
-      trial_ends_at: options.trial_end,
-      ends_at: options.cancel_at,
-      last_used_at: options.current_period_end,
+      trial_ends_at: String(options.trial_end),
+      last_used_at: String(options.current_period_end),
     }
 
-    const subscriptionModel = Subscription.create(data)
+    const subscriptionModel = await Subscription.create(data)
+
+    return subscriptionModel
   }
 
   return { create }

storage/framework/core/types/src/model-names.ts

@@ -1 +1 @@
-export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post'
+export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post' | 'Subscription' | 'Error'

storage/framework/orm/src/models/AccessToken.ts

@@ -166,7 +166,7 @@ export class AccessTokenModel {
   }
 
   // Method to get a User by criteria
-  static async get(): Promise<UserModel[]> {
+  static async get(): Promise<AccessTokenModel[]> {
     const instance = new AccessTokenModel(null)
 
     if (instance.hasSelect) {

storage/framework/orm/src/models/Deployment.ts

@@ -175,7 +175,7 @@ export class DeploymentModel {
   }
 
   // Method to get a User by criteria
-  static async get(): Promise<UserModel[]> {
+  static async get(): Promise<DeploymentModel[]> {
     const instance = new DeploymentModel(null)
 
     if (instance.hasSelect) {