stacks 0.51.0 → 0.52.0

package/core/cli/src/actions/install.ts

@@ -1,5 +1,5 @@
 import { installPackage as installPkg } from '@antfu/install-pkg'
-import type { CommandResult } from '@stacksjs/types'
+import type { CommandReturnValue } from '@stacksjs/types'
 
 /**
  * Install an npm package.
@@ -7,7 +7,7 @@ import type { CommandResult } from '@stacksjs/types'
  * @param pkg - The package name to install.
  * @returns The result of the install.
  */
-export async function installPackage(pkg: string): Promise<CommandResult<string>> {
+export async function installPackage(pkg: string): Promise<CommandReturnValue> {
   return await installPkg(pkg, { silent: true })
 }
 
@@ -17,6 +17,6 @@ export async function installPackage(pkg: string): Promise<CommandResult<string>
  * @param pkg - The Stack name to install.
  * @returns The result of the install.
  */
-export async function installStack(name: string): Promise<CommandResult<string>> {
+export async function installStack(name: string): Promise<CommandReturnValue> {
   return await installPkg(`@stacksjs/${name}`, { silent: true })
 }

package/core/cli/src/command.ts

@@ -1,7 +1,2 @@
-import cac from 'cac'
-import { execaCommand } from 'execa'
-
-const spawn = execaCommand
-const command = cac
-
-export { spawn, command }
+export { cac as command } from 'cac'
+export { execaCommand as spawn } from 'execa'

package/core/cli/src/console.ts

@@ -1,6 +1,5 @@
 import { log } from '@stacksjs/logging'
-import Prompts from 'prompts'
 
-const { prompts } = Prompts
+const prompt = log.prompt
 
-export { log, prompts }
+export { log, prompt }

package/core/cli/src/index.ts

@@ -2,6 +2,7 @@ export * from './actions'
 export * from './command'
 export * from './console'
 export * from './helpers'
+export * from './parse'
 export * from './run'
 export * from './spinner'
 export * from './utilities'

package/core/cli/src/parse.ts

@@ -0,0 +1,99 @@
+interface ParsedArgv {
+  args: ReadonlyArray<string>
+  options: {
+    [k: string]: string | boolean | number
+  }
+}
+
+function isLongOption(arg: string): boolean {
+  return arg.startsWith('--')
+}
+
+function isShortOption(arg: string): boolean {
+  return arg.startsWith('-') && !isLongOption(arg)
+}
+
+function parseValue(value: string): string | boolean | number {
+  if (value === 'true')
+    return true
+
+  if (value === 'false')
+    return false
+
+  const numberValue = parseFloat(value)
+  if (!isNaN(numberValue))
+    return numberValue
+
+  return value.replace(/"/g, '')
+}
+
+function parseLongOption(arg: string, argv: ReadonlyArray<string>, index: number, options: { [k: string]: string | boolean | number }): number {
+  const [key, value] = arg.slice(2).split('=')
+  if (value !== undefined) {
+    options[key] = parseValue(value)
+  }
+  else if (index + 1 < argv.length && !argv[index + 1].startsWith('-')) {
+    options[key] = argv[index + 1]
+    index++
+  }
+  else {
+    options[key] = true
+  }
+  return index
+}
+
+function parseShortOption(arg: string, argv: ReadonlyArray<string>, index: number, options: { [k: string]: string | boolean | number }): number {
+  const [key, value] = arg.slice(1).split('=')
+
+  if (value !== undefined) {
+    for (let j = 0; j < key.length; j++)
+      options[key[j]] = parseValue(value)
+  }
+  else {
+    for (let j = 0; j < key.length; j++) {
+      if (index + 1 < argv.length && j === key.length - 1 && !argv[index + 1].startsWith('-')) {
+        options[key[j]] = parseValue(argv[index + 1])
+        index++
+      }
+      else {
+        options[key[j]] = true
+      }
+    }
+  }
+
+  return index
+}
+
+export function parseArgv(argv?: ReadonlyArray<string>): ParsedArgv {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  const args: string[] = []
+  const options: { [k: string]: string | boolean | number } = {}
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i]
+    if (isLongOption(arg))
+      i = parseLongOption(arg, argv, i, options)
+    else if (isShortOption(arg))
+      i = parseShortOption(arg, argv, i, options)
+    else
+      args.push(arg)
+  }
+
+  return { args, options }
+}
+
+export function parseOptions(argv?: ReadonlyArray<string>): { [k: string]: string | boolean | number } {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  return parseArgv(argv).options
+}
+
+export function parseArgs(argv?: ReadonlyArray<string>): ReadonlyArray<string> {
+  if (argv === undefined)
+    argv = process.argv.slice(2)
+
+  return parseArgv(argv).args
+}

package/core/cli/src/run.ts

@@ -1,8 +1,10 @@
-import type { CliOptions, CommandResult, Result, SpinnerOptions as Spinner } from '@stacksjs/types'
-import { determineDebugMode } from '@stacksjs/config'
-import type { Err } from '@stacksjs/error-handling'
-import { ResultAsync, err } from '@stacksjs/error-handling'
+import { execSync as childExec } from 'node:child_process'
+import type { CliOptions, CommandResult, CommandReturnValue, ResultAsync, SpinnerOptions as Spinner } from '@stacksjs/types'
+import { ExitCode } from '@stacksjs/types'
 import { projectPath } from '@stacksjs/path'
+import { ResultAsync as AsyncResult, err } from '@stacksjs/error-handling'
+import { determineDebugLevel } from '@stacksjs/utils'
+import { log } from './console'
 import { spawn } from './command'
 import { startSpinner } from './helpers'
 import { italic } from '.'
@@ -15,17 +17,27 @@ import { italic } from '.'
  * @param errorMsg The name of the error to throw if the command fails.
  * @returns The result of the command.
  */
-export function exec(command: string, options?: CliOptions) {
+export function exec(command: string, options?: CliOptions): ResultAsync<CommandReturnValue, Error> {
   const cwd = options?.cwd || projectPath()
-  const stdio = determineDebugMode(options) ? 'inherit' : 'ignore'
+  const stdio = determineDebugLevel(options) ? 'inherit' : 'ignore'
   const shell = options?.shell || false
 
-  return ResultAsync.fromPromise(
+  return AsyncResult.fromPromise(
     spawn(command, { stdio, cwd, shell }),
     () => new Error(`Failed to run command: ${italic(command)}`),
   )
 }
 
+/**
+ * Execute a command and return result.
+ *
+ * @param command The command to execute.
+ * @returns The result of the command.
+ */
+export function execSync(command: string) {
+  return childExec(command, { encoding: 'utf-8' })
+}
+
 /**
  * Run a command the Stacks way.
  *
@@ -33,7 +45,8 @@ export function exec(command: string, options?: CliOptions) {
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runCommand(command: string, options?: CliOptions) {
+export async function runCommand(command: string, options?: CliOptions): Promise<ResultAsync<CommandReturnValue, Error>> {
+  console.log('runCommand', command, options)
   return await exec(command, options)
 }
 
@@ -44,26 +57,30 @@ export async function runCommand(command: string, options?: CliOptions) {
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runCommands(commands: string[], options?: CliOptions): Promise<Result<CommandResult<string>, Error>[] | Result<CommandResult<string>, Error> | Err<CommandResult<string>, string>> {
-  const results: Result<CommandResult<string>, Error>[] = []
+export async function runCommands(commands: string[], options?: CliOptions): Promise<CommandResult | CommandResult[]> {
+  console.log('runCommands', commands, options)
+  const results: CommandResult[] = []
   const numberOfCommands = commands.length
 
-  if (!numberOfCommands)
-    return err('No commands were specified')
+  if (!numberOfCommands) {
+    log.error(new Error('No commands were specified'))
+    process.exit()
+  }
 
   const spinner = determineSpinner(options)
 
+  console.log('spinner', spinner)
+
   for (const command of commands) {
     const result = await runCommand(command, options)
 
-    if (result?.isOk())
-      results.push(result)
+    if (result.isOk()) { results.push(result) }
 
-    if (result?.isErr()) {
+    else if (result.isErr()) {
       if (spinner) {
-        spinner.fail('Failed to run command.')
+        // spinner.fail('Failed to run command.')
         err(result.error)
-        process.exit()
+        process.exit(ExitCode.FatalError)
       }
 
       results.push(result)
@@ -81,7 +98,7 @@ export async function runCommands(commands: string[], options?: CliOptions): Pro
 }
 
 function determineSpinner(options?: CliOptions): Spinner | undefined {
-  if (!determineDebugMode(options))
+  if (!determineDebugLevel(options))
     return startSpinner(options?.spinnerText)
 
   return undefined

package/core/cloud/README.md

@@ -38,7 +38,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/cloud/build.config.ts

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

package/core/cloud/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
+  "version": "0.52.0",
+  "packageManager": "pnpm@8.5.1",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -25,7 +25,12 @@
     "google cloud",
     "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": [
@@ -35,19 +40,13 @@
     "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"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5"
+    "@stacksjs/development": "workspace:*"
   }
 }

package/core/collections/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/collections/build.config.ts

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

package/core/collections/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/collections",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
+  "version": "0.52.0",
+  "packageManager": "pnpm@8.5.1",
   "description": "The Stacks collections.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -25,7 +25,12 @@
     "stacks"
   ],
   "sideEffects": false,
-  "main": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    }
+  },
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "contributors": [
@@ -35,22 +40,16 @@
     "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"
   },
   "peerDependencies": {
-    "collect.js": "^4.34.3"
+    "collect.js": "^4.36.1"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5"
+    "@stacksjs/development": "workspace:*"
   }
 }

package/core/config/README.md

@@ -1,26 +1,35 @@
-# Stacks Config
+# Stacks Objects
 
-This package simplifies accessing your Stacks configuration.
+Easily work with objects.
 
 ## ☘️ Features
 
-- ⚡️ API to access your Stacks config
+- Access to Laravel-like Collections API
+- Other object helpers
 
 ## 🤖 Usage
 
 ```bash
-pnpm i -D @stacksjs/config
+pnpm i -D @stacksjs/objects
 ```
 
-Now, you can use it in your project:
+Now, you can easily access it in your project:
 
-```ts
-import { app, deploy, docs, git, hashing, library, services, ui } from '@stacksjs/config'
+```js
+import { collect } from '@stacksjs/objects'
 
-console.log(app) // { name: 'Your App Name', env: 'local', url: 'https://localhost', ... }
+const collection = collect([{
+  name: 'My story',
+  pages: 176,
+}, {
+  name: 'Fantastic Beasts and Where to Find Them',
+  pages: 1096,
+}])
+
+console.log(collection.avg('pages')) // 636
 ```
 
-Learn more in the docs.
+To view the full documentation, please visit [https://stacksjs.dev/objects](https://stacksjs.dev/objects).
 
 ## 🧪 Testing
 
@@ -32,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.
 
@@ -46,6 +55,15 @@ For casual chit-chat with others using this package:
 
 [Join the Stacks Discord Server](https://discord.ow3.org)
 
+## 🙏🏼 Credits
+
+Many thanks to the following core technologies & people who have contributed to this package:
+
+- [Collect.js](https://github.com/ecrmnn/collect.js)
+- [Laravel](https://laravel.com/)
+- [Chris Breuer](https://github.com/chrisbbreuer)
+- [All Contributors](../../contributors)
+
 ## 📄 License
 
 The MIT License (MIT). Please see [LICENSE](https://github.com/stacksjs/stacks/tree/main/LICENSE.md) for more information.

package/core/config/build.config.ts

@@ -1,13 +1,49 @@
 import { defineBuildConfig } from 'unbuild'
+import { alias } from '@stacksjs/alias'
 
 export default defineBuildConfig({
-  entries: [
-    './src/index',
-  ],
+  alias,
+  entries: ['src/index'],
   declaration: true,
   clean: true,
-  externals: ['@stacksjs/utils', '@stacksjs/path', '@stacksjs/types'],
+  externals: [
+    'fast-glob',
+    'fsevents',
+    'sass',
+    'unbuild',
+    'unplugin-auto-import',
+    'unplugin-vue-components',
+    'vite-ssg',
+    'vite',
+    'execa',
+    'ora',
+    'neverthrow',
+    '@mdit-vue/plugin-component',
+    'cac',
+    'vite-plugin-vue-layouts',
+    'vite-plugin-inspect',
+    'vitepress',
+    'zod',
+    '@rollup/pluginutils',
+    '@types/markdown-it-link-attributes',
+    'vue',
+    'markdown-it',
+    'markdown-it-shiki',
+    '@mdit-vue/types',
+    '@mdit-vue/plugin-frontmatter',
+    'meilisearch',
+    'unocss',
+    'vite-plugin-pwa',
+    '@novu/stateless',
+    'semver',
+    'node-ray',
+    'yaml',
+    'consola',
+    'pathe',
+    'kolorist',
+  ],
   rollup: {
+    // emitCJS: true,
     inlineDependencies: true,
   },
 })

package/core/config/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@stacksjs/config",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
-  "description": "The Stacks configuration.",
+  "version": "0.52.0",
+  "private": true,
+  "packageManager": "pnpm@8.5.1",
+  "description": "The Stacks config helper methods.",
   "author": "Chris Breuer",
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
@@ -17,37 +18,37 @@
     "url": "https://github.com/stacksjs/stacks/issues"
   },
   "keywords": [
-    "configuration",
+    "config",
+    "utilities",
+    "functions",
     "stacks"
   ],
-  "main": "dist/index.mjs",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "contributors": [
     "Chris Breuer <chris@ow3.org>"
   ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    }
+  },
   "files": [
-    "dist",
+    "src",
     "README.md"
   ],
-  "engines": {
-    "node": ">=v18.14.0",
-    "pnpm": ">=7.26.3"
-  },
   "scripts": {
     "build": "unbuild",
     "dev": "unbuild --stub",
-    "prepublishOnly": "pnpm run build",
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@stacksjs/path": "workspace:*",
-    "@stacksjs/utils": "workspace:*"
+    "c12": "^1.4.1"
+  },
+  "dependencies": {
+    "c12": "^1.4.1"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5",
-    "unbuild": "^1.1.1"
+    "@stacksjs/development": "workspace:*",
+    "@stacksjs/types": "workspace:*"
   }
 }

package/core/config/src/defaults.ts

@@ -0,0 +1,22 @@
+export { default as app } from '../../../../config/app'
+export { default as cache } from '../../../../config/cache'
+export { default as cdn } from '../../../../config/cdn'
+export { default as cronJobs } from '../../../../app/jobs'
+export { default as cli } from '../../../../config/cli'
+export { default as database } from '../../../../config/database'
+export { default as debug } from '../../../../config/debug'
+export { default as dns } from '../../../../config/dns'
+export { default as docs } from '../../../../config/docs'
+export { default as email } from '../../../../config/email'
+export { default as events } from '../../../../config/events'
+export { default as git } from '../../../../config/git'
+export { default as hashing } from '../../../../config/hashing'
+export { default as library } from '../../../../config/library'
+export { default as payment } from '../../../../config/payment'
+export { default as notification } from '../../../../config/notification'
+export { default as searchEngine } from '../../../../config/search-engine'
+export { default as services } from '../../../../config/services'
+export { default as storage } from '../../../../config/storage'
+export { default as ui } from '../../../../config/ui'
+
+// export { default as cloud } from '../../../../config/cloud'

package/core/config/src/index.ts

@@ -1,20 +1,4 @@
-export * from './helpers'
+export { loadConfig, watchConfig } from 'c12'
 
-export { config as app } from '../../../../config/app'
-export { config as cache } from '../../../../config/cache'
-export { config as database } from '../../../../config/database'
-export { config as debug } from '../../../../config/debug'
-export { config as deploy } from '../../../../config/deploy'
-export { config as events } from '../../../../config/events'
-export { config as git } from '../../../../config/git'
-export { config as hashing } from '../../../../config/hashing'
-export { config as library } from '../../../../config/library'
-export { config as page } from '../../../../config/page'
-export { config as notification } from '../../../../config/notification'
-export { config as searchEngine } from '../../../../config/search-engine'
-export { config as services } from '../../../../config/services'
-export { config as storage } from '../../../../config/storage'
-export { config as ui } from '../../../../config/ui'
-
-// because of Vitepress we keep this syntax
-export * as docs from '../../../../config/docs'
+export * from './defaults'
+export * from './stacks'