chore: wip

Author: chrisbbreuer

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

@@ -67,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
@@ -84,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
@@ -108,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]})`)

.stacks/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'
   }
 

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

@@ -2,7 +2,7 @@ import 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'
-import { err, errAsync } from '@stacksjs/error-handling'
+import { err } from '@stacksjs/error-handling'
 
 function parseOptions(options?: ActionOptions) {
   if (!options)
@@ -30,9 +30,9 @@ export type ActionResult = CommandResult
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runAction(action: string, options?: ActionOptions): Promise<CommandResult | CommandResult[]> {
+export async function runAction(action: string, options?: ActionOptions): Promise<CommandResult> {
   if (!hasAction(action))
-    return errAsync(`The specified action "${action}" does not exist.`)
+    return err(`The specified action "${action}" does not exist`)
 
   // we need to parse options here because they need to bw passed to the action
   const opts = parseOptions(options)
@@ -42,7 +42,7 @@ export async function runAction(action: string, options?: ActionOptions): Promis
     log.debug('running command:', italic(cmd))
 
   return options?.showSpinner
-    ? await runCommands([cmd], options)
+    ? await runCommands([cmd], options) as CommandResult
     : await runCommand(cmd, options)
 }
 
@@ -53,9 +53,9 @@ export async function runAction(action: string, options?: ActionOptions): Promis
  * @param options The options to pass to the command.
  * @returns The result of the command.
  */
-export async function runActions(actions: string[], options?: ActionOptions): Promise<CommandResult> | Promise<CommandResult>[] {
+export async function runActions(actions: string[], options?: ActionOptions): Promise<CommandResult | CommandResult[]> {
   if (!actions.length)
-    return err('No actions were specified')
+    return err(`No actions were specified`)
 
   for (const action of actions) {
     if (!hasAction(action))

.stacks/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,

.stacks/core/alias/src/index.ts

@@ -62,6 +62,8 @@ const alias: Record<string, string> = {
   '@stacksjs/notifications/*': p.notificationsPath('src/*'),
   '@stacksjs/objects': p.objectsPath('src/index.ts'),
   '@stacksjs/objects/*': p.objectsPath('src/*'),
+  '@stacksjs/orm': p.ormPath('src/index.ts'),
+  '@stacksjs/orm/*': p.ormPath('src/*'),
   '@stacksjs/path': p.pathPath('src/index.ts'), // 🤦🏼‍♂️
   '@stacksjs/path/*': p.pathPath('src/*'),
   '@stacksjs/push': p.pushPath('src/index.ts'),

.stacks/core/buddy/bin/stacks.mjs

@@ -4,11 +4,11 @@ import { alias } from '@stacksjs/alias'
 export default defineBuildConfig({
   alias,
   entries: [
+    './src/index',
     './src/cli',
   ],
-  declaration: false,
-  clean: false,
-  externals: ['chokidar', '@intlify/shared', '@intlify/message-compiler', 'vite', 'gray-matter'],
+  declaration: true,
+  clean: true,
   rollup: {
     emitCJS: false,
     inlineDependencies: true,

.stacks/core/buddy/build.config.ts

@@ -42,10 +42,10 @@
     "Chris Breuer <chris@ow3.org>"
   ],
   "bin": {
-    "stacks": "bin/stacks.mjs",
-    "stx": "bin/stacks.mjs",
-    "buddy": "bin/stacks.mjs",
-    "bud": "bin/stacks.mjs"
+    "stacks": "dist/cli.mjs",
+    "stx": "dist/cli.mjs",
+    "buddy": "dist/cli.mjs",
+    "bud": "dist/cli.mjs"
   },
   "files": [
     "dist",
@@ -87,6 +87,7 @@
     "@stacksjs/modules": "workspace:*",
     "@stacksjs/notifications": "workspace:*",
     "@stacksjs/objects": "workspace:*",
+    "@stacksjs/orm": "workspace:*",
     "@stacksjs/pages": "workspace:*",
     "@stacksjs/path": "workspace:*",
     "@stacksjs/payments": "workspace:*",

.stacks/core/buddy/package.json

@@ -92,5 +92,5 @@ async function installIfVersionMismatch() {
 
 function errorHandler(error: Error): void {
   log.error(error)
-  process.exit()
+  process.exit(1)
 }

.stacks/core/buddy/src/cli.ts

@@ -77,7 +77,7 @@ async function dev(buddy: CLI) {
 
       // check if result is an error
       else if (result.isErr()) {
-        outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
+        outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error ?? undefined)
         process.exit()
       }
 
@@ -103,7 +103,7 @@ async function dev(buddy: CLI) {
 
       // check if result is an error
       else if (result.isErr()) {
-        outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error)
+        outro('While running the dev:components command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error ?? undefined)
         process.exit()
       }