stacks 0.52.10 → 0.56.3

package/components.d.ts

@@ -3,19 +3,17 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
-    Counter: typeof import('./../components/Buttons/Counter.vue')['default']
-    Demo: typeof import('./../components/Demo.vue')['default']
-    HelloWorld: typeof import('./../components/HelloWorld.vue')['default']
-    Logo: typeof import('./../components/Logo.vue')['default']
-    README: typeof import('./../components/README.md')['default']
+    Counter: typeof import('./../resources/components/Buttons/Counter.vue')['default']
+    Demo: typeof import('./../resources/components/Demo.vue')['default']
+    HelloWorld: typeof import('./../resources/components/HelloWorld.vue')['default']
+    Logo: typeof import('./../resources/components/Logo.vue')['default']
+    README: typeof import('./../resources/components/README.md')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    ToggleDark: typeof import('./../components/Buttons/ToggleDark.vue')['default']
+    ToggleDark: typeof import('./../resources/components/Buttons/ToggleDark.vue')['default']
   }
 }

package/core/actions/build.config.ts

@@ -1,14 +1,186 @@
-import { defineBuildConfig } from 'unbuild'
+import type { BuildConfig } from '@stacksjs/development'
+import { alias, defineBuildConfig } from '@stacksjs/development'
 
-export default defineBuildConfig({
-  entries: [
-    {
+const entries: BuildConfig['entries'] = process.env.npm_lifecycle_script?.includes('--stub')
+  ? [
+      {
+        input: './src/build/component-libs',
+        name: 'build/component-libs',
+        outDir: './dist/build/',
+      }, {
+        input: './src/build/core',
+        name: 'build/core',
+        outDir: './dist/build/',
+      }, {
+        input: './src/build/stacks',
+        name: 'build/stacks',
+        outDir: './dist/build/',
+      }, {
+        input: './src/deploy/domains',
+        name: 'deploy/domains',
+        outDir: './dist/deploy/',
+      }, {
+        input: './src/dev/index',
+        name: 'dev/index',
+        outDir: './dist/dev/',
+      }, {
+        input: './src/dev/components',
+        name: 'dev/components',
+        outDir: './dist/dev/',
+      }, {
+        input: './src/dev/docs',
+        name: 'dev/docs',
+        outDir: './dist/dev/',
+      }, {
+        input: './src/generate/index',
+        name: 'generate/index',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/component-meta',
+        name: 'generate/component-meta',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/ide-helpers',
+        name: 'generate/ide-helpers',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/lib-entries',
+        name: 'generate/lib-entries',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/settings',
+        name: 'generate/settings',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/vscode-custom-data',
+        name: 'generate/vscode-custom-data',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/generate/vue-compat',
+        name: 'generate/vue-compat',
+        outDir: './dist/generate/',
+      }, {
+        input: './src/helpers/index',
+        name: 'helpers/index',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/index',
+        name: 'helpers/index',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/component-meta',
+        name: 'helpers/component-meta',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/lib-entries',
+        name: 'helpers/lib-entries',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/package-json',
+        name: 'helpers/package-json',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/utils',
+        name: 'helpers/utils',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/vscode-custom-data',
+        name: 'helpers/vscode-custom-data',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/helpers/vue-compat',
+        name: 'helpers/vue-compat',
+        outDir: './dist/helpers/',
+      }, {
+        input: './src/lint/index',
+        name: 'lint/index',
+        outDir: './dist/lint/',
+      }, {
+        input: './src/lint/fix',
+        name: 'lint/fix',
+        outDir: './dist/lint/',
+      }, {
+        input: './src/test/coverage',
+        name: 'test/coverage',
+        outDir: './dist/test/',
+      }, {
+        input: './src/test/feature',
+        name: 'test/feature',
+        outDir: './dist/test/',
+      }, {
+        input: './src/test/ui',
+        name: 'test/ui',
+        outDir: './dist/test/',
+      }, {
+        input: './src/test/unit',
+        name: 'test/unit',
+        outDir: './dist/test/',
+      },
+      {
+        input: './src/upgrade/dependencies',
+        name: 'upgrade/dependencies',
+        outDir: './dist/upgrade/',
+      },
+      {
+        input: './src/upgrade/framework',
+        name: 'upgrade/framework',
+        outDir: './dist/upgrade/',
+      },
+      {
+        input: './src/upgrade/index',
+        name: 'upgrade/index',
+        outDir: './dist/upgrade/',
+      },
+      './src/index',
+      './src/add',
+      './src/build.ts', // we need to be specific here because we have a build folder
+      './src/bump',
+      './src/changelog',
+      './src/clean',
+      './src/commit',
+      './src/copy-types',
+      './src/deploy.ts',
+      './src/examples',
+      './src/fresh',
+      './src/key-generate',
+      './src/make',
+      './src/migrate',
+      './src/preinstall',
+      './src/prepublish',
+      './src/release',
+      './src/seed',
+      './src/test.ts', // we need to be specific here because we have a build folder
+      './src/tinker',
+      './src/typecheck',
+      './src/types',
+      './src/upgrade.ts', // we need to be specific here because we have a build folder
+    ]
+  : [{
       builder: 'mkdist',
-      input: './src/',
-      outDir: './dist/',
-      format: 'esm',
-    },
-  ],
+      input: './src',
+      outDir: './dist',
+    }]
+
+export default defineBuildConfig({
+  alias,
+
+  entries,
+
+  // externals: [
+  //   '@stacksjs/cli',
+  //   '@stacksjs/database',
+  //   '@stacksjs/logging',
+  //   '@stacksjs/path',
+  //   '@stacksjs/utils',
+  //   '@stacksjs/storage',
+  //   '@stacksjs/types',
+  // ],
+
+  // rollup: {
+  //   esbuild: {
+  //     target: 'esnext',
+  //   },
+  // },
 
   clean: true,
   declaration: true,

package/core/actions/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/actions",
   "type": "module",
-  "version": "0.52.10",
-  "packageManager": "pnpm@8.5.1",
+  "version": "0.56.3",
+  "packageManager": "pnpm@8.6.5",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -77,10 +77,6 @@
       "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"
@@ -240,7 +236,7 @@
   "scripts": {
     "build": "unbuild",
     "dev": "unbuild --stub",
-    "prepublishOnly": "pnpm run build",
+    "prepublishOnly": "unbuild",
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
@@ -256,7 +252,7 @@
     "@stacksjs/types": "workspace:*",
     "@stacksjs/utils": "workspace:*",
     "markdown-it": "^13.0.1",
-    "vue-component-meta": "^1.6.5"
+    "vue-component-meta": "^1.8.2"
   },
   "dependencies": {
     "@stacksjs/cli": "workspace:*",
@@ -273,11 +269,9 @@
     "fast-glob": "^3.2.12",
     "fs-extra": "^11.1.1",
     "markdown-it": "^13.0.1",
-    "vue-component-meta": "^1.6.5"
+    "vue-component-meta": "^1.8.2"
   },
   "devDependencies": {
-    "@stacksjs/development": "workspace:*",
-    "@stacksjs/types": "workspace:*",
-    "unbuild": "^1.2.1"
+    "@stacksjs/development": "workspace:*"
   }
 }

package/core/actions/src/build/component-libs.ts

@@ -1,15 +1,5 @@
-import { log } from '@stacksjs/logging'
 import { frameworkPath } from '@stacksjs/path'
 import { runCommand } from '@stacksjs/cli'
+import { NpmScript } from '@stacksjs/types'
 
-log.info('Building Component Libraries...')
-
-// run the `npx mkdist -d` command to build the dist folder
-const result = await runCommand('npx mkdist -d', { verbose: true, cwd: frameworkPath() })
-
-if (result.isErr()) {
-  log.error('There was an error running `npx mkdist -d`.', result.error)
-  process.exit()
-}
-
-log.success('Building Stacks was successful.')
+await runCommand(NpmScript.BuildComponents, { cwd: frameworkPath(), verbose: true })

package/core/actions/src/clean.ts

@@ -2,7 +2,7 @@ import { log } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 import { del } from '@stacksjs/utils'
 
-log.info('Running clean command...', projectPath())
+log.info('Running clean command...')
 
 await del([
   projectPath('pnpm-lock.yaml'),

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

@@ -1,33 +1,25 @@
 import { log } from '@stacksjs/logging'
-import { runNpmScript } from '@stacksjs/utils'
+import { frameworkPath } from '@stacksjs/path'
+import { runCommand } from '@stacksjs/cli'
 import type { DevOptions } from '@stacksjs/types'
 import { NpmScript } from '@stacksjs/types'
 
-/**
- * An alias of the invoke method.
- * @param options
- * @returns
- */
-export async function dev(options: DevOptions) {
-  return invoke(options)
-}
-
 export async function components(options: DevOptions) {
   log.info('Starting your components dev server...')
-  await runNpmScript(NpmScript.DevComponents, options)
+  await runCommand(NpmScript.DevComponents, { ...options, cwd: frameworkPath() })
 }
 
 export async function desktop(options: DevOptions) {
   log.info('Starting your Desktop engine...')
-  await runNpmScript(NpmScript.DevDesktop, options)
+  await runCommand(NpmScript.DevDesktop, options)
 }
 
 export async function pages(options: DevOptions) {
   log.info('Starting your page engine...')
-  await runNpmScript(NpmScript.DevPages, options)
+  await runCommand(NpmScript.DevPages, options)
 }
 
 export async function functions(options: DevOptions) {
   log.info('Starting your function\'s dev server...')
-  await runNpmScript(NpmScript.DevFunctions, options)
+  await runCommand(NpmScript.DevFunctions, options)
 }

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

@@ -40,10 +40,10 @@ export async function generate(options: GeneratorOptions) {
 }
 
 export async function libEntries(options: GeneratorOptions) {
-  const result = await runAction(Action.GeneratePackageJsons, { ...options, verbose: true, cwd: projectPath() })
+  const result = await runAction(Action.GenerateLibraryEntries, { ...options, verbose: true, cwd: projectPath() })
 
   if (result.isErr()) {
-    log.error('There was an error generating your library entry points.', result.error)
+    log.error('There was an error generating your library entry points', result.error)
     process.exit()
   }
 

package/core/actions/src/generate/settings.ts

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { generateSettings } from '@stacksjs/pages'
-
-await generateSettings()
+// import { generateSettings } from '@stacksjs/views'
+//
+// await generateSettings()

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

@@ -1,82 +1,89 @@
 import { log } from '@stacksjs/logging'
-
-// import { kebabCase } from '@stacksjs/strings'
-import { libraryEntryPath } from '@stacksjs/path'
+import { kebabCase } from '@stacksjs/strings'
+import type { LibraryType } from '@stacksjs/path'
+import { componentsPath, functionsPath, libraryEntryPath } from '@stacksjs/path'
 import { writeTextFile } from '@stacksjs/storage'
 import { determineResetPreset } from '@stacksjs/utils'
-import type { LibEntryType } from '@stacksjs/types'
 import { library } from '@stacksjs/config'
+import { ExitCode } from '@stacksjs/types'
 
 /**
  * Based on the config values, this method
  * will generate the library entry points.
  *
- * @param type string
+ * @param type LibraryType
  */
-export async function generateLibEntry(type: LibEntryType) {
-  try {
-    if (type === 'vue-components')
-      await createVueLibraryEntryPoint()
+export async function generateLibEntry(type: LibraryType) {
+  await createLibraryEntryPoint(type)
+}
 
-    if (type === 'web-components')
-      await createWebComponentLibraryEntryPoint()
+export async function createLibraryEntryPoint(type: LibraryType) {
+  if (type === 'vue-components')
+    await createVueLibraryEntryPoint()
 
-    if (type === 'functions')
-      await createFunctionLibraryEntryPoint()
-  }
-  catch (err) {
-    log.error('There was an error generating the library entry point.', err)
-    process.exit()
-  }
+  if (type === 'web-components')
+    await createWebComponentLibraryEntryPoint()
+
+  if (type === 'functions')
+    await createFunctionLibraryEntryPoint()
 }
 
-export async function createVueLibraryEntryPoint() {
+export async function createVueLibraryEntryPoint(type: LibraryType = 'vue-components') {
   log.info('Creating the Vue component library entry point...')
 
   await writeTextFile({
-    path: libraryEntryPath('vue-components'),
-    data: generateEntryPointData('vue-components'),
+    path: libraryEntryPath(type),
+    data: generateEntryPointData(type),
+  }).catch((err) => {
+    log.error(new Error('There was an error generating the Vue component library entry point.', err))
+    process.exit(ExitCode.FatalError)
   })
 
-  log.success('Created the Vue component library entry point.')
+  log.success('Created the Vue component library entry point')
 }
 
-export async function createWebComponentLibraryEntryPoint() {
+export async function createWebComponentLibraryEntryPoint(type: LibraryType = 'web-components') {
   log.info('Creating the Web Component library entry point...')
 
   await writeTextFile({
-    path: libraryEntryPath('web-components'),
-    data: generateEntryPointData('web-components'),
+    path: libraryEntryPath(type),
+    data: generateEntryPointData(type),
+  }).catch((err) => {
+    log.error(new Error('There was an error generating the Web Component library entry point', err))
+    process.exit(ExitCode.FatalError)
   })
 
-  log.success('Created Web Component library entry point.')
+  log.success('Created Web Component library entry point')
 }
 
-export async function createFunctionLibraryEntryPoint() {
+export async function createFunctionLibraryEntryPoint(type: LibraryType = 'functions') {
   log.info('Creating the Function library entry point...')
 
   await writeTextFile({
-    path: libraryEntryPath('functions'),
-    data: generateEntryPointData('functions'),
+    path: libraryEntryPath(type),
+    data: generateEntryPointData(type),
+  }).catch((err) => {
+    log.error(new Error('There was an error generating Function library entry point', err))
+    process.exit(ExitCode.FatalError)
   })
 
-  log.success('Created Functions library entry point.')
+  log.success('Created Functions library entry point')
 }
 
-export function generateEntryPointData(type: 'vue-components' | 'web-components' | 'functions'): string {
+export function generateEntryPointData(type: LibraryType): string {
   let arr = []
 
   if (type === '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.')
+      log.error(new 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) {
       if (Array.isArray(fx))
-        arr.push(`export * as ${fx[1]} from '../../../functions/${fx[0]}'`)
+        arr.push(`export * as ${fx[1]} from '${functionsPath(fx[0])}'`)
       else
-        arr.push(`export * from '../../../functions/${fx}'`)
+        arr.push(`export * from '${functionsPath(fx)}'`)
     }
 
     // join the array into a string with each element being on a new line
@@ -85,7 +92,7 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
 
   if (type === 'vue-components') {
     if (!library.vueComponents?.tags) {
-      log.error('There are no components defined to be built. Please check your config/library.ts file for potential adjustments.')
+      log.error(new Error('There are no components defined to be built. Please check your config/library.ts file for potential adjustments'))
       process.exit()
     }
 
@@ -93,9 +100,9 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
 
     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'`)
+        arr.push(`export { default as ${component[1]} } from '${componentsPath(component[0])}.vue'`)
       else
-        arr.push(`export { default as ${component} } from '../../../components/${component}.vue'`)
+        arr.push(`export { default as ${component} } from '${componentsPath(component)}.vue'`)
     }
 
     // join the array into a string with each element being on a new line
@@ -109,18 +116,18 @@ export function generateEntryPointData(type: 'vue-components' | 'web-components'
   const definitions = []
 
   if (!library.webComponents?.tags) {
-    log.error('There are no components defined to be built. Please check your config/library.ts file for potential adjustments.')
+    log.error(new 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)) {
     if (Array.isArray(component)) {
-      imports.push(`import ${component[1]} from '../../../components/${component[0]}.vue'`)
+      imports.push(`import ${component[1]} from '${componentsPath(component[0])}.vue'`)
       declarations.push(`const ${component[1]}CustomElement = defineCustomElement(${component[1]})`)
       definitions.push(`customElements.define('${kebabCase(component[1])}', ${component[1]}CustomElement)`)
     }
     else {
-      imports.push(`import ${component} from '../../../components/${component}.vue'`)
+      imports.push(`import ${component} from '${componentsPath(component)}.vue'`)
       declarations.push(`const ${component}CustomElement = defineCustomElement(${component})`)
       definitions.push(`customElements.define('${kebabCase(component)}', ${component}CustomElement)`)
     }

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

@@ -1,4 +1,4 @@
-import storage from '@stacksjs/storage'
+import * as storage from '@stacksjs/storage'
 import { italic, log, runCommand, runCommands } from '@stacksjs/cli'
 import { actionsPath, functionsPath } from '@stacksjs/path'
 import type { ActionOptions, CommandResult } from '@stacksjs/types'
@@ -11,10 +11,11 @@ function parseOptions(options?: ActionOptions) {
   const parsedOptions = Object.entries(options).map(([key, value]) => {
     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}`
+
+    return `--${key}=${value}`
   })
 
   // filter out undefined values and join the array
@@ -26,7 +27,7 @@ export type ActionResult = CommandResult
 /**
  * Run an Action the Stacks way.
  *
- * @param command The action to invoke.
+ * @param action The action to invoke.
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
@@ -49,7 +50,7 @@ export async function runAction(action: string, options?: ActionOptions): Promis
 /**
  * Run Actions the Stacks way.
  *
- * @param command The action to invoke.
+ * @param actions The actions to invoke.
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
@@ -71,8 +72,5 @@ export function hasAction(action: string) {
   if (storage.isFile(functionsPath(`actions/${action}.ts`)))
     return true
 
-  if (storage.isFile(actionsPath(`${action}.ts`)))
-    return true
-
-  return false
+  return storage.isFile(actionsPath(`${action}.ts`))
 }

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

@@ -1,5 +1,17 @@
-import { runCommand } from '@stacksjs/cli'
+import { ExitCode, runCommands } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
 import { NpmScript } from '@stacksjs/types'
 
-await runCommand(NpmScript.Lint, { cwd: projectPath(), verbose: true })
+export default async function lintAction() {
+  const result = await runCommands([
+    NpmScript.Lint,
+    NpmScript.LintPackageJson,
+  ], { cwd: projectPath(), verbose: true })
+
+  if (Array.isArray(result)) {
+    if (result.map(r => r.isErr()).includes(true))
+      process.exit(ExitCode.FatalError)
+  }
+
+  process.exit(ExitCode.Success)
+}

package/core/actions/src/make.ts

@@ -295,23 +295,26 @@ export async function createModel(options: MakeOptions) {
   try {
     await writeTextFile({
       path: `${path}`,
-      data: `import { faker } from '../../.stacks/core/faker/src' // stacks/faker or
-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
+      data: `import { faker } from '@stacksjs/faker'
+import { validate } from '@stacksjs/validation'
+import type { Model } from '@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,
+      factory: () => faker.person,
     },
+
     // more fields here
   },
 }`,

package/core/actions/src/migrate.ts

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

package/core/actions/src/prepublish.ts

@@ -6,10 +6,10 @@ import { NpmScript } from '@stacksjs/types'
 log.info('Running prepublish command...')
 
 // right before we publish, we need to build Stacks
-const result = await runNpmScript(NpmScript.BuildStacks, { verbose: true, cwd: runtimePath() }) // TODO: add flag for debug mode
+const result = await runNpmScript(NpmScript.BuildStacks, { verbose: true, cwd: runtimePath() })
 
 if (result.isErr()) {
-  log.error('There was an error while prepublishing your stack, during the process of building Stacks.', result.error)
+  log.error(new Error('There was an error while prepublishing your stack'), result.error)
   process.exit()
 }