stacks 0.51.0 → 0.52.0

package/core/actions/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/actions",
   "type": "module",
-  "version": "0.51.0",
-  "packageManager": "pnpm@7.26.3",
+  "version": "0.52.0",
+  "packageManager": "pnpm@8.5.1",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -28,6 +28,208 @@
     "components",
     "library"
   ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    },
+    "./build/component-libs": {
+      "types": "./dist/build/component-libs.d.ts",
+      "import": "./dist/build/component-libs.mjs"
+    },
+    "./build/core": {
+      "types": "./dist/build/core.d.ts",
+      "import": "./dist/build/core.mjs"
+    },
+    "./build/stacks": {
+      "types": "./dist/build/stacks.d.ts",
+      "import": "./dist/build/stacks.mjs"
+    },
+    "./deploy/domains": {
+      "types": "./dist/deploy/domains.d.ts",
+      "import": "./dist/deploy/domains.mjs"
+    },
+    "./dev": {
+      "types": "./dist/dev/index.d.ts",
+      "import": "./dist/dev/index.mjs"
+    },
+    "./dev/components": {
+      "types": "./dist/dev/components.d.ts",
+      "import": "./dist/dev/components.mjs"
+    },
+    "./dev/docs": {
+      "types": "./dist/dev/docs.d.ts",
+      "import": "./dist/dev/docs.mjs"
+    },
+    "./generate": {
+      "types": "./dist/generate/index.d.ts",
+      "import": "./dist/generate/index.mjs"
+    },
+    "./generate/component-meta": {
+      "types": "./dist/generate/component-meta.d.ts",
+      "import": "./dist/generate/component-meta.mjs"
+    },
+    "./generate/ide-helpers": {
+      "types": "./dist/generate/ide-helpers.d.ts",
+      "import": "./dist/generate/ide-helpers.mjs"
+    },
+    "./generate/lib-entries": {
+      "types": "./dist/generate/lib-entries.d.ts",
+      "import": "./dist/generate/lib-entries.mjs"
+    },
+    "./generate/package-jsons": {
+      "types": "./dist/generate/package-jsons.d.ts",
+      "import": "./dist/generate/package-jsons.mjs"
+    },
+    "./generate/settings": {
+      "types": "./dist/generate/settings.d.ts",
+      "import": "./dist/generate/settings.mjs"
+    },
+    "./generate/vscode-custom-data": {
+      "types": "./dist/generate/vscode-custom-data.d.ts",
+      "import": "./dist/generate/vscode-custom-data.mjs"
+    },
+    "./generate/vue-compat": {
+      "types": "./dist/generate/vue-compat.d.ts",
+      "import": "./dist/generate/vue-compat.mjs"
+    },
+    "./helpers": {
+      "types": "./dist/helpers/index.d.ts",
+      "import": "./dist/helpers/index.mjs"
+    },
+    "./lint": {
+      "types": "./dist/lint/index.d.ts",
+      "import": "./dist/lint/index.mjs"
+    },
+    "./lint/fix": {
+      "types": "./dist/lint/fix.d.ts",
+      "import": "./dist/lint/fix.mjs"
+    },
+    "./test/coverage": {
+      "types": "./dist/test/coverage.d.ts",
+      "import": "./dist/test/coverage.mjs"
+    },
+    "./test/feature": {
+      "types": "./dist/test/feature.d.ts",
+      "import": "./dist/test/feature.mjs"
+    },
+    "./test/ui": {
+      "types": "./dist/test/ui.d.ts",
+      "import": "./dist/test/ui.mjs"
+    },
+    "./test/unit": {
+      "types": "./dist/test/unit.d.ts",
+      "import": "./dist/test/unit.mjs"
+    },
+    "./upgrade": {
+      "types": "./dist/upgrade/index.d.ts",
+      "import": "./dist/upgrade/index.mjs"
+    },
+    "./upgrade/dependencies": {
+      "types": "./dist/upgrade/dependencies.d.ts",
+      "import": "./dist/upgrade/dependencies.mjs"
+    },
+    "./upgrade/framework": {
+      "types": "./dist/upgrade/framework.d.ts",
+      "import": "./dist/upgrade/framework.mjs"
+    },
+    "./upgrade/node": {
+      "types": "./dist/upgrade/node.d.ts",
+      "import": "./dist/upgrade/node.mjs"
+    },
+    "./upgrade/package-manager": {
+      "types": "./dist/upgrade/package-manager.d.ts",
+      "import": "./dist/upgrade/package-manager.mjs"
+    },
+    "./add": {
+      "types": "./dist/add.d.ts",
+      "import": "./dist/add.mjs"
+    },
+    "./build": {
+      "types": "./dist/build.d.ts",
+      "import": "./dist/build.mjs"
+    },
+    "./bump": {
+      "types": "./dist/bump.d.ts",
+      "import": "./dist/bump.mjs"
+    },
+    "./changelog": {
+      "types": "./dist/changelog.d.ts",
+      "import": "./dist/changelog.mjs"
+    },
+    "./clean": {
+      "types": "./dist/clean.d.ts",
+      "import": "./dist/clean.mjs"
+    },
+    "./commit": {
+      "types": "./dist/commit.d.ts",
+      "import": "./dist/commit.mjs"
+    },
+    "./copy-types": {
+      "types": "./dist/copy-types.d.ts",
+      "import": "./dist/copy-types.mjs"
+    },
+    "./deploy": {
+      "types": "./dist/deploy.d.ts",
+      "import": "./dist/deploy.mjs"
+    },
+    "./examples": {
+      "types": "./dist/examples.d.ts",
+      "import": "./dist/examples.mjs"
+    },
+    "./fresh": {
+      "types": "./dist/fresh.d.ts",
+      "import": "./dist/fresh.mjs"
+    },
+    "./key-generate": {
+      "types": "./dist/key-generate.d.ts",
+      "import": "./dist/key-generate.mjs"
+    },
+    "./make": {
+      "types": "./dist/make.d.ts",
+      "import": "./dist/make.mjs"
+    },
+    "./migrate": {
+      "types": "./dist/migrate.d.ts",
+      "import": "./dist/migrate.mjs"
+    },
+    "./preinstall": {
+      "types": "./dist/preinstall.d.ts",
+      "import": "./dist/preinstall.mjs"
+    },
+    "./prepublish": {
+      "types": "./dist/prepublish.d.ts",
+      "import": "./dist/prepublish.mjs"
+    },
+    "./release": {
+      "types": "./dist/release.d.ts",
+      "import": "./dist/release.mjs"
+    },
+    "./seed": {
+      "types": "./dist/seed.d.ts",
+      "import": "./dist/seed.mjs"
+    },
+    "./test": {
+      "types": "./dist/test.d.ts",
+      "import": "./dist/test.mjs"
+    },
+    "./tinker": {
+      "types": "./dist/tinker.d.ts",
+      "import": "./dist/tinker.mjs"
+    },
+    "./typecheck": {
+      "types": "./dist/typecheck.d.ts",
+      "import": "./dist/typecheck.mjs"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.mjs"
+    },
+    "./*": "./*"
+  },
+  "main": "dist/index.mjs",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "contributors": [
     "Chris Breuer <chris@ow3.org>"
   ],
@@ -35,19 +237,17 @@
     "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": {
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/config": "workspace:*",
+    "@stacksjs/database": "workspace:*",
+    "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/logging": "workspace:*",
     "@stacksjs/pages": "workspace:*",
     "@stacksjs/path": "workspace:*",
@@ -56,15 +256,16 @@
     "@stacksjs/types": "workspace:*",
     "@stacksjs/utils": "workspace:*",
     "markdown-it": "^13.0.1",
-    "vue-component-meta": "^1.0.24"
+    "vue-component-meta": "^1.6.5"
   },
   "dependencies": {
     "@stacksjs/strings": "workspace:*",
-    "esno": "^0.16.3"
+    "fast-glob": "^3.2.12",
+    "fs-extra": "^11.1.1"
   },
   "devDependencies": {
-    "@stacksjs/testing": "workspace:*",
-    "mkdist": "^1.1.0",
-    "typescript": "^4.9.5"
+    "@stacksjs/development": "workspace:*",
+    "@stacksjs/types": "workspace:*",
+    "unbuild": "^1.2.1"
   }
 }

package/core/actions/src/build/core.ts

@@ -0,0 +1,6 @@
+import { frameworkPath } from '@stacksjs/path'
+import { runCommands } from '@stacksjs/cli'
+
+await runCommands([
+  'pnpm -r --filter "./core/*" --filter "!./core/x-ray" build', // build all packages except x-ray (which is a dev tool/app)
+], { verbose: true, cwd: frameworkPath(), shell: true })

package/core/actions/src/clean.ts

@@ -1,25 +1,15 @@
 import { log, runCommand } from '@stacksjs/cli'
-import { type CleanOptions, ExitCode, NpmScript } from '@stacksjs/types'
+import { projectPath } from '@stacksjs/path'
+import { ExitCode, NpmScript } from '@stacksjs/types'
 
-export async function invoke(options?: CleanOptions) {
-  log.info('Running clean command...')
+log.info('Running clean command...')
 
-  const result = await runCommand(NpmScript.Clean, options)
+const result = await runCommand(NpmScript.Clean, { cwd: projectPath() })
 
-  if (result.isOk()) {
-    log.success('Cleaned up')
-    process.exit(ExitCode.Success)
-  }
-
-  log.error(result.error)
-  process.exit(ExitCode.FatalError)
+if (result.isOk()) {
+  log.success('Cleaned up')
+  process.exit(ExitCode.Success)
 }
 
-/**
- * An alias of the invoke method.
- * @param options
- * @returns
- */
-export async function clean(options: CleanOptions) {
-  return invoke(options)
-}
+log.error(result.error)
+process.exit(ExitCode.FatalError)

package/core/actions/src/deploy/domains.ts

@@ -0,0 +1,8 @@
+import { parseOptions } from '@stacksjs/cli'
+
+const options = parseOptions()
+
+// eslint-disable-next-line no-console')
+console.log('options', options)
+
+// ...

package/core/actions/src/deploy.ts

@@ -0,0 +1,8 @@
+import { runCommands } from '@stacksjs/cli'
+import { frameworkPath } from '@stacksjs/path'
+
+// TODO: create this action
+await runCommands([
+  'pnpm buddy clean',
+  'pnpm install',
+], { cwd: frameworkPath(), verbose: true })

package/core/actions/src/dev/docs.ts

@@ -0,0 +1,5 @@
+import { runCommand } from '@stacksjs/cli'
+import { frameworkPath } from '@stacksjs/path'
+import { NpmScript } from '@stacksjs/types'
+
+await runCommand(NpmScript.DevDocs, { cwd: frameworkPath(), verbose: true })

package/core/actions/src/{dev.ts → dev/index.ts}

@@ -3,26 +3,6 @@ import { runNpmScript } from '@stacksjs/utils'
 import type { DevOptions } from '@stacksjs/types'
 import { NpmScript } from '@stacksjs/types'
 
-export async function invoke(options: DevOptions) {
-  // eslint-disable-next-line no-console
-  console.log('options are: ', options)
-
-  if (options.components || options.all)
-    await components(options)
-
-  else if (options.docs || options.all)
-    await docs(options)
-
-  else if (options.pages || options.all)
-    await pages(options)
-
-  else if (options.functions || options.all)
-    await functions(options)
-
-  else if (options.desktop || options.all)
-    await desktop(options)
-}
-
 /**
  * An alias of the invoke method.
  * @param options
@@ -37,11 +17,6 @@ export async function components(options: DevOptions) {
   await runNpmScript(NpmScript.DevComponents, options)
 }
 
-export async function docs(options: DevOptions) {
-  log.info('Starting your docs dev server...')
-  await runNpmScript(NpmScript.DevDocs, options)
-}
-
 export async function desktop(options: DevOptions) {
   log.info('Starting your Desktop engine...')
   await runNpmScript(NpmScript.DevDesktop, options)

package/core/actions/src/fresh.ts

@@ -2,6 +2,6 @@ import { runCommands } from '@stacksjs/cli'
 import { frameworkPath } from '@stacksjs/path'
 
 await runCommands([
-  'pnpm run clean',
+  'buddy clean',
   'pnpm install',
 ], { cwd: frameworkPath(), verbose: true })

package/core/actions/src/{generate-component-meta.ts → generate/component-meta.ts}

@@ -6,7 +6,7 @@
 
 import { log } from '@stacksjs/logging'
 import { hasComponents } from '@stacksjs/storage'
-import { generateComponentMeta } from './helpers/component-meta'
+import { generateComponentMeta } from '../helpers/component-meta'
 
 if (hasComponents())
   await generateComponentMeta()

package/core/actions/src/{generate-ide-helpers.ts → generate/ide-helpers.ts}

@@ -7,7 +7,8 @@
 
 import { log } from '@stacksjs/logging'
 import { hasComponents } from '@stacksjs/storage'
-import { generateVsCodeCustomData } from './helpers/vscode-custom-data'
+import { generateVsCodeCustomData } from '../helpers/vscode-custom-data'
+
 // import { generateVsCodeCustomData, generateWebTypes } from './generate/vscode-custom-data'
 
 if (hasComponents()) {

package/core/actions/src/{generate.ts → generate/index.ts}

@@ -1,10 +1,11 @@
 import { log } from '@stacksjs/logging'
+import { seed } from '@stacksjs/database'
 import { Action, NpmScript } from '@stacksjs/types'
 import type { GeneratorOptions } from '@stacksjs/types'
 import { runNpmScript } from '@stacksjs/utils'
-import { projectPath } from '@stacksjs/path'
 import { runCommand } from '@stacksjs/cli'
-import { runAction } from './helpers'
+import { frameworkPath } from '@stacksjs/path'
+import { runAction } from '../helpers'
 
 export async function invoke(options?: GeneratorOptions) {
   if (options?.types)
@@ -39,7 +40,7 @@ export async function generate(options: GeneratorOptions) {
 }
 
 export async function libEntries(options: GeneratorOptions) {
-  const result = await runCommand('esno .stacks/core/actions/src/generate-package-json.ts', { ...options, verbose: true, cwd: projectPath() })
+  const result = await runCommand('tsx .stacks/core/actions/src/generate-package-json.ts', { ...options, verbose: true, cwd: projectPath() })
 
   if (result.isErr()) {
     log.error('There was an error generating your library entry points.', result.error)
@@ -117,3 +118,17 @@ export async function types(options?: GeneratorOptions) {
 
   log.success('Types were generated successfully')
 }
+
+export async function migrations() {
+  const path = frameworkPath('database/schema.prisma')
+
+  // await migrate(path, { database: database.driver })
+
+  await runCommand(`npx prisma migrate dev --schema=${path}`)
+
+  log.success('Successfully updated migrations')
+}
+
+export async function seeder() {
+  await seed()
+}

package/core/actions/src/{generate-lib-entries.ts → generate/lib-entries.ts}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { log } from '@stacksjs/logging'
 import { hasComponents, hasFunctions } from '@stacksjs/storage'
-import { generateLibEntry } from './helpers/lib-entries'
+import { generateLibEntry } from '../helpers/lib-entries'
 
 if (hasComponents()) {
   await generateLibEntry('vue-components')

package/core/actions/src/{generate-package-jsons.ts → generate/package-jsons.ts}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { hasComponents, hasFunctions } from '@stacksjs/storage'
-import { generatePackageJson } from './helpers/package-json'
+import { generatePackageJson } from '../helpers/package-json'
 
 if (hasComponents()) {
   await generatePackageJson('vue-components')

package/core/actions/src/{generate-vscode-custom-data.ts → generate/vscode-custom-data.ts}

@@ -7,7 +7,7 @@
 
 import { log } from '@stacksjs/logging'
 import { hasComponents } from '@stacksjs/storage'
-import { generateVsCodeCustomData } from './helpers/vscode-custom-data'
+import { generateVsCodeCustomData } from '../helpers/vscode-custom-data'
 
 if (hasComponents())
   await generateVsCodeCustomData()

package/core/actions/src/{generate-vue-compat.ts → generate/vue-compat.ts}

@@ -5,6 +5,6 @@
  * https://github.com/vueuse/vueuse/blob/main/scripts/fix-types.ts
  */
 
-import { generateVueCompat } from './helpers/vue-compat'
+import { generateVueCompat } from '../helpers/vue-compat'
 
 await generateVueCompat(['wip'])

package/core/actions/src/helpers/lib-entries.ts

@@ -1,4 +1,5 @@
 import { log } from '@stacksjs/logging'
+
 // import { kebabCase } from '@stacksjs/strings'
 import { libraryEntryPath } from '@stacksjs/path'
 import { writeTextFile } from '@stacksjs/storage'
@@ -66,12 +67,12 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
   let arr = []
 
   if (type === 'functions') {
-    if (!library.functions.functions) {
+    if (!library.functions?.functions) {
       log.error('There are no functions defined to be built. Please check your config/library.ts file for potential adjustments.')
       process.exit()
     }
 
-    for (const fx of library.functions.functions) {
+    for (const fx of library.functions?.functions) {
       if (Array.isArray(fx))
         arr.push(`export * as ${fx[1]} from '../../../functions/${fx[0]}'`)
       else
@@ -83,14 +84,14 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
   }
 
   if (type === 'vue-components') {
-    if (!library.vueComponents.tags) {
+    if (!library.vueComponents?.tags) {
       log.error('There are no components defined to be built. Please check your config/library.ts file for potential adjustments.')
       process.exit()
     }
 
     arr = determineResetPreset()
 
-    for (const component of library.vueComponents.tags.map(tag => tag.name)) {
+    for (const component of library.vueComponents?.tags.map(tag => tag.name)) {
       if (Array.isArray(component))
         arr.push(`export { default as ${component[1]} } from '../../../components/${component[0]}.vue'`)
       else
@@ -107,12 +108,12 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
   const declarations = []
   const definitions = []
 
-  if (!library.webComponents.tags) {
+  if (!library.webComponents?.tags) {
     log.error('There are no components defined to be built. Please check your config/library.ts file for potential adjustments.')
     process.exit()
   }
 
-  for (const component of library.webComponents.tags.map(tag => tag.name)) {
+  for (const component of library.webComponents?.tags.map(tag => tag.name)) {
     if (Array.isArray(component)) {
       imports.push(`import ${component[1]} from '../../../components/${component[0]}.vue'`)
       declarations.push(`const ${component[1]}CustomElement = defineCustomElement(${component[1]})`)

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

@@ -8,26 +8,26 @@ export async function generatePackageJson(type: 'vue-components' | 'web-componen
   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
+    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,22 @@ 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}`)}`
 
-  if (options?.debug)
-    log.info('Running command:', cmd, options)
+  // eslint-disable-next-line no-console
+  console.log('cmd', cmd)
+
+  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 +56,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 +65,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)
 }