spine-framework 0.1.3 → 0.1.6

package/.framework/cli/index.ts

@@ -41,21 +41,6 @@
 
 import './env-loader.ts'
 import { Command } from 'commander'
-import { createRequire } from 'module'
-import { resolve, dirname } from 'path'
-import { fileURLToPath } from 'url'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-
-function printWelcome() {
-  const require = createRequire(import.meta.url)
-  try {
-    require(resolve(__dirname, '../../bin/welcome.cjs'))
-  } catch {
-    console.log('Spine Framework — run `spine-framework --help` for commands.')
-  }
-}
 
 const program = new Command()
 
@@ -115,12 +100,6 @@ registerInstallAppCommands(program)
 registerStatusCommands(program)
 registerUninstallAppCommands(program)
 
-// Show welcome when run with no arguments
-if (process.argv.length === 2) {
-  printWelcome()
-  process.exit(0)
-}
-
 program.parseAsync(process.argv).catch((err) => {
   console.error('Error:', err.message)
   process.exit(1)

package/bin/spine-framework.cjs

@@ -4,8 +4,29 @@
 const { execFileSync } = require('child_process')
 const { resolve } = require('path')
 
-const tsx = resolve(__dirname, '../node_modules/.bin/tsx')
-const entry = resolve(__dirname, '../.framework/cli/index.ts')
+const pkgRoot = resolve(__dirname, '..')
+const projectRoot = resolve(pkgRoot, '../..')
+
+// Handle no-args case here — before spawning tsx or loading db.ts
+if (process.argv.length === 2) {
+  require(resolve(__dirname, 'welcome.cjs'))
+  process.exit(0)
+}
+
+const entry = resolve(pkgRoot, '.framework/cli/index.ts')
+
+// Find tsx: prefer consuming project's copy, fall back to our own
+const fs = require('fs')
+const tsxPaths = [
+  resolve(projectRoot, 'node_modules/.bin/tsx'),
+  resolve(pkgRoot, 'node_modules/.bin/tsx'),
+]
+const tsx = tsxPaths.find(p => { try { fs.accessSync(p); return true } catch { return false } })
+
+if (!tsx) {
+  console.error('spine-framework: tsx not found. Run: npm install tsx')
+  process.exit(1)
+}
 
 try {
   execFileSync(tsx, [entry, ...process.argv.slice(2)], { stdio: 'inherit' })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spine-framework",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "private": false,
   "description": "Spine — enterprise application framework built on Supabase + Netlify + React",
   "type": "module",