chore: wip

stacksjs · Mar 8, 2024 · c4d734c · c4d734c
1 parent d4c203f
commit c4d734c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/app/Models/User.ts b/app/Models/User.ts
@@ -9,7 +9,7 @@ export default {
   autoIncrement: true, // defaults to true
 
   traits: {
-    authenticatable: true, // defaults to false
+    useAuth: true, // defaults to false
     useTimestamps: true, // defaults to true
     useSeeder: { // defaults to a count of 10
       count: 10,

diff --git a/storage/framework/core/cli/src/exec.ts b/storage/framework/core/cli/src/exec.ts
@@ -43,9 +43,8 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
     detached: options?.background || false,
     cwd: options?.cwd || import.meta.dir,
     // env: { ...e, ...options?.env },
-    onExit(_subprocess, exitCode, _signalCode, _error) {
-      if (exitCode && exitCode !== ExitCode.Success)
-        process.exit(exitCode)
+    onExit(subprocess, exitCode, signalCode, error) {
+      exitHandler('spawn', subprocess, exitCode, signalCode, error)
     },
   })
 
@@ -103,12 +102,26 @@ export async function execSync(command: string | string[], options?: CliOptions)
     stderr: options?.stderr ?? 'inherit',
     cwd: options?.cwd ?? import.meta.dir,
     // env: { ...Bun.env, ...options?.env },
-    onExit(_subprocess, exitCode, _signalCode, _error) {
-      // console.log('onExit', { subprocess, exitCode, signalCode, error })
-      if (exitCode !== ExitCode.Success && exitCode)
-        process.exit(exitCode)
+    onExit(subprocess, exitCode, signalCode, error) {
+      exitHandler('spawnSync', subprocess, exitCode, signalCode, error)
     },
   })
 
   return proc.stdout.toString()
 }
+
+// @ts-expect-error - missing types is okay here but can be improved later on
+function exitHandler(type: 'spawn' | 'spawnSync', subprocess, exitCode, signalCode, error) {
+  log.debug(`exitHandler: ${type}`)
+  log.debug('subprocess', subprocess)
+  log.debug('exitCode', exitCode)
+  log.debug('signalCode', signalCode)
+
+  if (error) {
+    log.error(error)
+    process.exit(ExitCode.FatalError)
+  }
+
+  if (exitCode !== ExitCode.Success && exitCode)
+    process.exit(exitCode)
+}
diff --git a/storage/framework/core/error-handling/build.ts b/storage/framework/core/error-handling/build.ts
@@ -9,7 +9,6 @@ await Bun.build({
   external: [
     '@stacksjs/cli',
     '@stacksjs/path',
-    '@stacksjs/storage',
   ],
 
   plugins: [

diff --git a/storage/framework/core/error-handling/package.json b/storage/framework/core/error-handling/package.json
@@ -49,13 +49,11 @@
   "peerDependencies": {
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/path": "workspace:*",
-    "@stacksjs/storage": "workspace:*",
     "@stacksjs/types": "workspace:*"
   },
   "dependencies": {
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/path": "workspace:*",
-    "@stacksjs/storage": "workspace:*",
     "@stacksjs/types": "workspace:*",
     "neverthrow": "^6.1.0"
   },

diff --git a/storage/framework/core/error-handling/src/handler.ts b/storage/framework/core/error-handling/src/handler.ts
@@ -1,5 +1,5 @@
 import { dirname, logsPath } from '@stacksjs/path'
-import { fs } from '@stacksjs/storage'
+import fs from 'fs-extra'
 
 interface ErrorOptions {
   silent?: boolean

diff --git a/storage/framework/docs/.vitepress/config.ts b/storage/framework/docs/.vitepress/config.ts
@@ -1,9 +1,9 @@
 import { defineConfig } from 'vitepress'
-import { alias } from '@stacksjs/alias'
 import { path as p } from '@stacksjs/path'
 import { pwaDocs as pwa } from '@stacksjs/docs'
 import { server } from '@stacksjs/server'
 import { transformerTwoslash } from 'vitepress-plugin-twoslash'
+import { alias } from '@stacksjs/alias'
 import { withPwa } from '@vite-pwa/vitepress'
 import userConfig from '../../../../config/docs'
 import { analyticsHead, faviconHead } from './head'