chore: wip

Author: chrisbbreuer

storage/framework/core/database/src/migrations.ts

@@ -1,6 +1,5 @@
 import type { Err, Ok, Result } from '@stacksjs/error-handling'
 import type { MigrationResult } from 'kysely'
-import { $ } from 'bun'
 import { log } from '@stacksjs/cli'
 import { database } from '@stacksjs/config'
 import { err, handleError, ok } from '@stacksjs/error-handling'
@@ -119,7 +118,7 @@ export async function haveModelFieldsChangedSinceLastMigration(modelPath: string
 
   // now that we know the date, we need to check the git history for changes to the model file since that date
   const cmd = ``
-  const gitHistory = await $`${cmd}`.text()
+  const gitHistory = await Bun.$`${cmd}`.text()
 
   // if there are updates, then we need to check whether
   // the updates include the any updates to the model

storage/framework/core/database/src/seeder.ts

@@ -1,5 +1,4 @@
 import type { Model, RelationConfig } from '@stacksjs/types'
-import { randomUUIDv7 } from 'bun'
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
 import { fetchOtherModelRelations, getModelName, getRelationType, getTableName } from '@stacksjs/orm'
@@ -112,12 +111,12 @@ async function seedPivotRelation(relation: RelationConfig): Promise<any> {
   }
 
   if (relationalModelUuid)
-    record.uuid = randomUUIDv7()
+    record.uuid = Bun.randomUUIDv7()
 
   const data = await db.insertInto(relationModelTable).values(record).executeTakeFirstOrThrow()
 
   if (useUuid)
-    record2.uuid = randomUUIDv7()
+    record2.uuid = Bun.randomUUIDv7()
 
   const data2 = await db.insertInto(relationTable).values(record2).executeTakeFirstOrThrow()
   const relationData = data.insertId || 1
@@ -161,7 +160,7 @@ async function seedModelRelation(modelName: string): Promise<bigint | number> {
   }
 
   if (useUuid)
-    record.uuid = randomUUIDv7()
+    record.uuid = Bun.randomUUIDv7()
 
   const data = await db.insertInto(tableName).values(record).executeTakeFirstOrThrow()
 

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

@@ -1,7 +1,7 @@
-import type { TransactionModel } from '../../../../orm/src/models/Transaction'
+// import type { TransactionModel } from '../../../../orm/src/models/Transaction'
 import type { UserModel } from '../../../../orm/src/models/User'
-import Product from '../../../../orm/src/models/Product'
-import { Transaction } from '../../../../orm/src/models/Transaction'
+// import Product from '../../../../orm/src/models/Product'
+// import { Transaction } from '../../../../orm/src/models/Transaction'
 
 export interface ManageTransaction {
   store: (user: UserModel, productId: number) => Promise<TransactionModel>

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

@@ -1,11 +1,11 @@
 import { config } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
-import { path as p } from '@stacksjs/path'
+import { path } from '@stacksjs/path'
 import { hashPaths } from '@stacksjs/storage'
 
 export function originRequestFunctionHash(): string | undefined {
   try {
-    return hashPaths(p.cloudPath('src/edge'))
+    return hashPaths(path.cloudPath('src/edge'))
   }
   catch (error: any) {
     log.error('Are we in a Docker container? Failed to hash paths. Error below:')
@@ -14,21 +14,21 @@ export function originRequestFunctionHash(): string | undefined {
   }
 }
 
-const docsSrc = [p.projectPath('docs'), p.frameworkPath('docs/dist')]
+const docsSrc = [path.projectPath('docs'), path.frameworkPath('docs/dist')]
 
 export function websiteSourceHash(): string | undefined {
   const websiteSrc = [
-    p.projectPath('resources/views'),
-    p.projectPath('resources/assets'),
-    p.projectPath('resources/lang'),
-    p.projectPath('resources/functions'),
-    p.projectPath('resources/components'),
-    p.projectPath('resources/modules'),
-    p.projectPath('resources/stores'),
-    p.frameworkPath('views/web'),
+    path.projectPath('resources/views'),
+    path.projectPath('resources/assets'),
+    path.projectPath('resources/lang'),
+    path.projectPath('resources/functions'),
+    path.projectPath('resources/components'),
+    path.projectPath('resources/modules'),
+    path.projectPath('resources/stores'),
+    path.frameworkPath('views/web'),
   ]
 
-  return config.app.docMode === true ? hashPaths(docsSrc) : hashPaths(websiteSrc)
+  return config.appath.docMode === true ? hashPaths(docsSrc) : hashPaths(websiteSrc)
 }
 
 export function docsSourceHash(): string | undefined {

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

@@ -1,4 +1,25 @@
-import { semver } from 'bun'
 import { version } from '../package.json'
 
-export { semver, version }
+export const semver: typeof Bun.semver = Bun.semver
+
+export function isVersionGreaterThan(version: string, compareVersion: string): boolean {
+  return Bun.semver.order(version, compareVersion) === 1
+}
+
+export function isVersionLessThan(version: string, compareVersion: string): boolean {
+  return Bun.semver.order(version, compareVersion) === -1
+}
+
+export function isVersionEqual(version: string, compareVersion: string): boolean {
+  return Bun.semver.order(version, compareVersion) === 0
+}
+
+export function isVersionGreaterThanOrEqual(version: string, compareVersion: string): boolean {
+  return Bun.semver.order(version, compareVersion) >= 0
+}
+
+export function isVersionLessThanOrEqual(version: string, compareVersion: string): boolean {
+  return Bun.semver.order(version, compareVersion) <= 0
+}
+
+export { version }