stacks 0.51.0 → 0.52.1

package/core/actions/src/helpers/package-json.ts

@@ -1,33 +1,32 @@
 import { log } from '@stacksjs/logging'
 import { writeTextFile } from '@stacksjs/storage'
 import { packageJsonPath } from '@stacksjs/path'
-import { library } from '@stacksjs/config'
-import { packageManager } from '../../package.json' assert { type: 'json' }
+import { library, packageManager } from '@stacksjs/config'
 
 export async function generatePackageJson(type: 'vue-components' | 'web-components' | 'functions') {
   let name, description, directory, keywords, config, prettyName
 
   if (type === 'vue-components') {
-    name = library.vueComponents.name
-    description = library.vueComponents.description
+    name = library.vueComponents?.name
+    description = library.vueComponents?.description
     directory = 'components'
-    keywords = library.vueComponents.keywords
+    keywords = library.vueComponents?.keywords
     config = 'vue-components'
   }
 
   else if (type === 'web-components') {
-    name = library.webComponents.name
-    description = library.webComponents.description
+    name = library.webComponents?.name
+    description = library.webComponents?.description
     directory = 'components'
-    keywords = library.webComponents.keywords
+    keywords = library.webComponents?.keywords
     config = 'web-components'
   }
 
   else if (type === 'functions') {
-    name = library.functions.name
-    description = library.functions.description
+    name = library.functions?.name
+    description = library.functions?.description
     directory = 'functions'
-    keywords = library.functions.keywords
+    keywords = library.functions?.keywords
     config = 'functions'
   }
 

package/core/actions/src/helpers/utils.ts

@@ -1,30 +1,27 @@
 import storage from '@stacksjs/storage'
-import { log, runCommand, runCommands } from '@stacksjs/cli'
+import { italic, log, runCommand, runCommands } from '@stacksjs/cli'
 import { actionsPath, functionsPath } from '@stacksjs/path'
-import type { CliOptions, CommandResult } from '@stacksjs/types'
-import type { Err, Result } from '@stacksjs/error-handling'
+import type { ActionOptions, CommandResult } from '@stacksjs/types'
 import { err } from '@stacksjs/error-handling'
 
-const parseOptions = (options?: CliOptions) => {
+function parseOptions(options?: ActionOptions) {
   if (!options)
     return ''
 
   const parsedOptions = Object.entries(options).map(([key, value]) => {
-    if (typeof value === 'boolean')
+    if (key.length === 1)
+      return `-${key}=${value}`
+    if (typeof value === 'boolean' && value) // if the value is a boolean and true, just return the key
       return `--${key}`
     else
       return `--${key}=${value}`
   })
 
-  // ----= only happens when no flags are passed
-  return parsedOptions.join(' ').replace('----=', '')
+  // filter out undefined values and join the array
+  return parsedOptions.filter(Boolean).join(' ').replace('----=', '')
 }
 
-export type ActionResult = Promise<
-  Result<CommandResult<string>, Error>
-  | Result<CommandResult<string>, Error>[]
-  | Err<CommandResult<string>, string>
->
+export type ActionResult = CommandResult
 
 /**
  * Run an Action the Stacks way.
@@ -33,23 +30,21 @@ export type ActionResult = Promise<
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runAction(action: string, options?: CliOptions): Promise<
-  Result<CommandResult<string>, Error>
-  | Result<CommandResult<string>, Error>[]
-  | Err<CommandResult<string>, string>
-> {
+export async function runAction(action: string, options?: ActionOptions): Promise<CommandResult> {
   if (!hasAction(action))
-    return err(`The specified action "${action}" does not exist.`)
+    return err(`The specified action "${action}" does not exist`)
 
-  // we need to parse options here because we need to pass them to the action command
+  // we need to parse options here because they need to bw passed to the action
   const opts = parseOptions(options)
-  const cmd = `npx esno ${actionsPath(`${action}.ts ${opts}`)}`
+  const cmd = `npx tsx ${actionsPath(`${action}.ts ${opts}`)}`
+  // eslint-disable-next-line no-console
+  console.log('cmd', cmd)
 
-  if (options?.debug)
-    log.info('Running command:', cmd, options)
+  if (options?.verbose)
+    log.debug('running command:', italic(cmd))
 
   return options?.showSpinner
-    ? await runCommands([cmd], options)
+    ? await runCommands([cmd], options) as CommandResult
     : await runCommand(cmd, options)
 }
 
@@ -60,7 +55,7 @@ export async function runAction(action: string, options?: CliOptions): Promise<
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runActions(actions: string[], options?: CliOptions): Promise<Result<CommandResult<string>, Error>[] | Result<CommandResult<string>, Error> | Err<CommandResult<string>, string>> {
+export async function runActions(actions: string[], options?: ActionOptions): Promise<CommandResult | CommandResult[]> {
   if (!actions.length)
     return err('No actions were specified')
 
@@ -69,7 +64,7 @@ export async function runActions(actions: string[], options?: CliOptions): Promi
       return err(`The specified action "${action}" does not exist`)
   }
 
-  const commands = actions.map(action => `npx esno ${actionsPath(`${action}.ts`)}`)
+  const commands = actions.map(action => `npx tsx ${actionsPath(`${action}.ts`)}`)
 
   return await runCommands(commands, options)
 }

package/core/actions/src/helpers/vscode-custom-data.ts

@@ -18,7 +18,7 @@ export async function generateVsCodeCustomData() {
 }
 
 function generateComponentInfoData() {
-  const componentsData = JSON.stringify(library.vueComponents.tags)
+  const componentsData = JSON.stringify(library.vueComponents?.tags)
 
   return `{
   "version": 1.1,

package/core/actions/src/key-generate.ts

@@ -1,10 +1,10 @@
 import { runCommand } from '@stacksjs/cli'
 import { isFile } from '@stacksjs/storage'
 import { setEnvValue } from '@stacksjs/utils'
-import { options } from 'kolorist'
+import { projectPath } from '@stacksjs/path'
 import { generateAppKey } from '@stacksjs/security'
 
 if (!isFile('.env'))
-  await runCommand('cp .env.example .env', { ...options, cwd: projectPath() })
+  await runCommand('cp .env.example .env', { cwd: projectPath() })
 
 await setEnvValue('APP_KEY', await generateAppKey())

package/core/actions/src/make.ts

@@ -1,6 +1,6 @@
 import { italic, log, spawn } from '@stacksjs/cli'
 import { createFolder, doesFolderExist, writeTextFile } from '@stacksjs/storage'
-import { resolve } from '@stacksjs/path'
+import { frameworkPath, projectPath, resolve } from '@stacksjs/path'
 import type { MakeOptions } from '@stacksjs/types'
 
 export async function invoke(options: MakeOptions) {
@@ -108,24 +108,6 @@ export async function createFactory(options: MakeOptions) {
   console.log('options', options) // wip
 }
 
-export async function migration(options: MakeOptions) {
-  try {
-    const name = options.name
-    log.info(`Creating your ${italic(name)} migration...`)
-    await createMigration(options)
-    log.success(`Created the ${italic(name)} migration.`)
-  }
-  catch (error) {
-    log.error('There was an error creating your migration.', error)
-    process.exit()
-  }
-}
-
-export async function createMigration(options: MakeOptions) {
-  // eslint-disable-next-line no-console
-  console.log('options', options) // wip
-}
-
 export async function notification(options: MakeOptions) {
   try {
     const name = options.name
@@ -278,3 +260,65 @@ function send(): ${importOption} {
     return false
   }
 }
+
+export async function createMigration(options: MakeOptions) {
+  const optionName = options.name
+  const table = options.tableName
+  const name = optionName[0].toUpperCase() + optionName.slice(1)
+  const path = frameworkPath(`database/migrations/${name}.ts`)
+
+  try {
+    await writeTextFile({
+      path: `${path}`,
+      data: `import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createTable('${table}')
+    .addColumn('id', 'integer', (col) => col.autoIncrement().primaryKey())
+    .execute()
+}`,
+    })
+
+    log.success(`Successfully created your migration file at .stacks/database/migrations/${name}.ts`)
+  }
+  catch (error) {
+    log.error(error)
+  }
+}
+
+export async function createModel(options: MakeOptions) {
+  const optionName = options.name
+  const name = optionName[0].toUpperCase() + optionName.slice(1)
+  const path = projectPath(`app/models/${name}.ts`)
+  try {
+    await writeTextFile({
+      path: `${path}`,
+      data: `import { faker } from '../../.stacks/core/faker/src' // stacks/faker or @stacksjs/faker
+import { validate } from '../../.stacks/core/validation/src' // stacks/validate or @stacksjs/validate
+import type { Model } from '../../.stacks/core/types/src' // stacks/types or @stacksjs/types
+
+export default <Model> {
+  name: '${name}',
+  searchable: true, // boolean | IndexSettings,
+  authenticatable: true, // boolean | AuthSettings,
+  seeder: {
+    count: 10,
+  },
+  fields: {
+    name: {
+      type: 'String',
+      validation: validate.string().min(3).max(255),
+      factory: () => faker.name,
+    },
+    // more fields here
+  },
+}`,
+    })
+
+    log.success(`Successfully created your model at app/models/${name}.ts`)
+  }
+  catch (error) {
+    log.error(error)
+  }
+}

package/core/actions/src/migrate.ts

@@ -0,0 +1,3 @@
+import { migrations } from '@stacksjs/actions/generate'
+
+await migrations()

package/core/actions/src/preinstall.ts

@@ -1,11 +1,11 @@
 import { log, spawn } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 import type { PreinstallOptions } from '@stacksjs/types'
-import { determineDebugMode } from '@stacksjs/config'
+import { determineDebugLevel } from '@stacksjs/utils'
 
 export async function invoke(options?: PreinstallOptions) {
   try {
-    const stdio = determineDebugMode(options) ? 'inherit' : 'ignore'
+    const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
 
     log.info('Preinstall check...')
     await spawn('npx only-allow pnpm', { stdio, cwd: projectPath() })

package/core/actions/src/release.ts

@@ -2,13 +2,14 @@
 import { frameworkPath } from '@stacksjs/path'
 import { runActions } from '@stacksjs/actions'
 import { Action } from '@stacksjs/types'
-// import { log } from '@stacksjxs/cli'
+
+// import { log } from '@stacksjs/cli'
 
 await runActions([
-  Action.GeneratePackageJsons, // generate the package.json's for each package
-  Action.LintFix, // ensure there are no lint errors
+  // Action.GeneratePackageJsons, // generate the package.json's for each package
+  // Action.LintFix, // ensure there are no lint errors
   // Action.Test, // run the tests
   Action.Bump, // bump the versions, create the git (version) tag, generate the changelog, commit & push the changes
-], { verbose: true, cwd: frameworkPath() }) // debug mode needs to be enabled to see the output due to the interactive prompts
+], { verbose: true, cwd: frameworkPath(), shell: true }) // debug mode needs to be enabled to see the output due to the interactive prompts
 
 // log.success('Successfully released the Stacks framework')

package/core/actions/src/seed.ts

@@ -0,0 +1,3 @@
+import { seeder } from '@stacksjs/actions/generate'
+
+await seeder()

package/core/actions/src/tinker.ts

@@ -0,0 +1,10 @@
+import { parseArgs } from '@stacksjs/cli'
+
+const options = parseArgs()
+
+// eslint-disable-next-line no-console
+console.log('options are:', options)
+
+// await runCommands([
+//   'npx tinker',
+// ], { verbose: true })

package/core/actions/src/upgrade/framework.ts

@@ -0,0 +1,29 @@
+import { log, outro } from '@stacksjs/cli'
+import storage from '@stacksjs/storage'
+import { determineDebugLevel, loop } from '@stacksjs/utils'
+import { frameworkPath, projectPath } from '@stacksjs/path'
+
+// await runCommand(NpmScript.UpgradeFramework, parseArgs())
+
+await checkForUncommittedChanges('./.stacks', options)
+await downloadFrameworkUpdate(options)
+
+log.info('Updating framework...')
+
+const exclude = ['functions/package.json', 'components/vue/package.json', 'components/web/package.json', 'auto-imports.d.ts', 'components.d.ts', 'dist']
+await storage.deleteFiles(frameworkPath(), exclude)
+
+// loop 5 times to make sure all "deep empty" folders are deleted
+loop(5, async () => {
+  await storage.deleteEmptyFolders(frameworkPath())
+})
+
+await storage.copyFolder(frameworkPath(), projectPath('./updates/.stacks'), exclude)
+
+if (determineDebugLevel(options))
+  log.info('Cleanup...')
+
+await storage.deleteFolder(projectPath('updates'))
+
+outro('Framework updated', { startTime: perf, useSeconds: true })
+process.exit()

package/core/actions/src/upgrade/index.ts

@@ -0,0 +1,27 @@
+import { ExitCode, parseArgs } from '@stacksjs/cli'
+import { Action } from '@stacksjs/types'
+import { runAction } from '../helpers'
+
+const options = parseArgs()
+// eslint-disable-next-line no-console
+console.log('here is opt', options)
+
+// run all the upgrade actions
+// if (options?.framework || options?.all)
+//   await updateFramework(options)
+
+// if (options?.dependencies || options?.all)
+//   await updateDependencies(options)
+
+if (options?.packageManager || options?.all)
+  await runAction(Action.UpgradePackageManager, options)
+
+if (options?.node || options?.all)
+  await runAction(Action.UpgradeNode, options)
+
+else
+  process.exit(ExitCode.InvalidArgument)
+
+//   // TODO: also update CI files & configurations, and other files, possibly
+//   // we want this to be smart enough to update only if files that have been updated
+//   // TODO: this script should trigger regeneration of auto-imports.d.ts & components.d.ts

package/core/actions/src/upgrade/node.ts

@@ -0,0 +1,4 @@
+import { parseArgs, runCommand } from '@stacksjs/cli'
+import { NpmScript } from '@stacksjs/types'
+
+await runCommand(NpmScript.UpgradeNode, parseArgs())

package/core/actions/src/upgrade/package-manager.ts

@@ -0,0 +1,4 @@
+import { parseArgs, runCommand } from '@stacksjs/cli'
+import { NpmScript } from '@stacksjs/types'
+
+await runCommand(NpmScript.UpgradePackageManager, parseArgs())

package/core/actions/src/upgrade.ts

@@ -0,0 +1,75 @@
+import { intro, log, outro, prompt, runCommand, spawn } from '@stacksjs/cli'
+import storage from '@stacksjs/storage'
+import { determineDebugLevel } from '@stacksjs/utils'
+import { projectPath } from '@stacksjs/path'
+import type { UpgradeOptions } from '@stacksjs/types'
+import { ExitCode, NpmScript } from '@stacksjs/types'
+
+export async function checkForUncommittedChanges(path = './.stacks', options: UpgradeOptions) {
+  try {
+    const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
+
+    // check if the .stacks folder has any updates
+    // https://carlosbecker.com/posts/git-changed/
+    await spawn(`git diff --quiet HEAD -- ${path}`, { stdio, cwd: projectPath() })
+  }
+  catch (error: any) {
+    if (error.status === 1) {
+      // even though the ./.stacks folder should not be edited, instead config values should be adjusted,
+      // there is a chance that users may apply local core edits, as it's totally acceptable, as long as
+      // the user knows what they are doing. There is also a change that simply the deps within .stacks
+      // folder have been updated and that could produce a diff.
+      if (!options?.force) {
+        const confirmed = await prompt('We detected there are uncommitted in the ./stacks folder. Do you want to overwrite those?', {
+          type: 'confirm',
+        })
+
+        if (!confirmed) {
+          log.info('Aborted. Stacks did not update itself.')
+          log.info('Note: if you commit your changes and replay the update, you can see what changed.')
+          process.exit(ExitCode.Success)
+        }
+      }
+    }
+  }
+}
+
+export async function downloadFrameworkUpdate(options: UpgradeOptions) {
+  const tempFolderName = 'updates'
+  const tempUpdatePath = projectPath(tempFolderName)
+
+  if (storage.doesFolderExist(tempUpdatePath))
+    await deleteFolder(tempUpdatePath)
+
+  log.info('Downloading framework updates...')
+  await runCommand(`giget stacks ${tempFolderName}`, options)
+  const version = (await storage.readJsonFile(projectPath(`${tempFolderName}/.stacks/version`))).data
+  log.success('Your framework updated correctly to version: ', version)
+}
+
+export async function updateDependencies(options: UpgradeOptions) {
+  const perf = await intro('buddy upgrade:dependencies')
+  const result = await runCommand(NpmScript.UpgradeDependencies, options)
+
+  if (result.isErr()) {
+    outro('While running the upgrade:dependencies command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
+    process.exit()
+  }
+
+  outro('Freshly updated your dependencies.', { startTime: perf, useSeconds: true })
+  process.exit()
+}
+
+export async function updatePackageManager(options: UpgradeOptions) {
+  const perf = await intro('buddy upgrade:package-manager')
+  const version = options?.version || 'latest'
+  const result = await runCommand(`corepack prepare pnpm@${version} --activate`, options)
+
+  if (result.isErr()) {
+    outro('While running the upgrade:package-manager command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
+    process.exit()
+  }
+
+  outro(`Updated to version: ${version}`, { startTime: perf, useSeconds: true })
+  process.exit()
+}

package/core/ai/README.md

@@ -41,7 +41,7 @@ pnpm test
 
 Please see our [releases](https://github.com/stacksjs/stacks/releases) page for more information on what has changed recently.
 
-## 💪🏼 Contributing
+## 🚜 Contributing
 
 Please review the [Contributing Guide](https://github.com/stacksjs/contributing) for details.
 

package/core/ai/build.config.ts

@@ -0,0 +1,15 @@
+import { defineBuildConfig } from '@stacksjs/development'
+
+export default defineBuildConfig({
+  entries: [
+    {
+      builder: 'mkdist',
+      input: './src/',
+      outDir: './dist/',
+      format: 'esm',
+    },
+  ],
+
+  clean: true,
+  declaration: true,
+})

package/core/ai/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/ai",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
+  "version": "0.52.1",
+  "packageManager": "pnpm@8.5.1",
   "description": "Stacks Artificial Intelligence.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -23,7 +23,16 @@
     "api",
     "stacks"
   ],
-  "main": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    },
+    "./openai": {
+      "types": "./dist/drivers/openai.d.ts",
+      "import": "./dist/drivers/openai.mjs"
+    }
+  },
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "contributors": [
@@ -33,13 +42,9 @@
     "dist",
     "README.md"
   ],
-  "engines": {
-    "node": ">=v18.14.0",
-    "pnpm": ">=7.26.3"
-  },
   "scripts": {
-    "build": "mkdist -d",
-    "dev": "mkdist -d",
+    "build": "unbuild .",
+    "dev": "unbuild --stub",
     "prepublishOnly": "pnpm run build",
     "typecheck": "tsc --noEmit"
   },
@@ -48,8 +53,6 @@
     "@stacksjs/config": "workspace:*"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5"
+    "@stacksjs/development": "workspace:*"
   }
 }

package/core/alias/README.md

@@ -41,7 +41,7 @@ pnpm test
 
 Please see our [releases](https://github.com/stacksjs/stacks/releases) page for more information on what has changed recently.
 
-## 💪🏼 Contributing
+## 🚜 Contributing
 
 Please review the [Contributing Guide](https://github.com/stacksjs/contributing) for details.
 

package/core/alias/build.config.ts

@@ -0,0 +1,15 @@
+import { defineBuildConfig } from 'unbuild'
+
+export default defineBuildConfig({
+  entries: [
+    {
+      builder: 'mkdist',
+      input: './src/',
+      outDir: './dist/',
+      format: 'esm',
+    },
+  ],
+
+  clean: true,
+  declaration: true,
+})

package/core/alias/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/alias",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
+  "version": "0.52.1",
+  "packageManager": "pnpm@8.5.1",
   "description": "The Stacks aliases.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -20,7 +20,12 @@
     "alias",
     "stacks"
   ],
-  "main": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    }
+  },
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "contributors": [
@@ -30,13 +35,9 @@
     "dist",
     "README.md"
   ],
-  "engines": {
-    "node": ">=v18.14.0",
-    "pnpm": ">=7.26.3"
-  },
   "scripts": {
-    "build": "mkdist -d",
-    "dev": "mkdist -d",
+    "build": "unbuild",
+    "dev": "unbuild --stub",
     "prepublishOnly": "pnpm run build",
     "typecheck": "tsc --noEmit"
   },
@@ -44,8 +45,6 @@
     "@stacksjs/path": "workspace:*"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5"
+    "@stacksjs/development": "workspace:*"
   }
 }