stacks 0.58.64 → 0.58.66

package/core/actions/dist/src/index.js

@@ -515,20 +515,19 @@ export default <Model> {
 }
 
 // src/action.ts
-import {log as log7} from "@stacksjs/logging";
-
 class Action3 {
   name;
   description;
+  fields;
   rate;
   tries;
   backoff;
   enabled;
   handle;
-  constructor({ name, description, handle, rate, tries, backoff, enabled }) {
-    log7.info(`Action ${name} created`);
+  constructor({ name, description, fields, handle, rate, tries, backoff, enabled }) {
     this.name = name;
     this.description = description;
+    this.fields = fields;
     this.rate = rate;
     this.tries = tries;
     this.backoff = backoff;

package/core/actions/dist/src/release.js

@@ -517,20 +517,19 @@ export default <Model> {
 }
 
 // src/action.ts
-import {log as log7} from "@stacksjs/logging";
-
 class Action3 {
   name;
   description;
+  fields;
   rate;
   tries;
   backoff;
   enabled;
   handle;
-  constructor({ name, description, handle, rate, tries, backoff, enabled }) {
-    log7.info(`Action ${name} created`);
+  constructor({ name, description, fields, handle, rate, tries, backoff, enabled }) {
     this.name = name;
     this.description = description;
+    this.fields = fields;
     this.rate = rate;
     this.tries = tries;
     this.backoff = backoff;
@@ -541,7 +540,7 @@ class Action3 {
 // src/release.ts
 import {projectPath as projectPath4} from "@stacksjs/path";
 import {Action as Action4} from "@stacksjs/enums";
-import {log as log8} from "@stacksjs/logging";
+import {log as log7} from "@stacksjs/logging";
 import {app} from "@stacksjs/config";
 await runActions([
   Action4.GenerateLibraryEntries,
@@ -551,4 +550,4 @@ await runActions([
   cwd: projectPath4(),
   stdin: "inherit"
 });
-log8.success(`Successfully released ${app.name}`);
+log7.success(`Successfully released ${app.name}`);

package/core/actions/dist/src/upgrade/index.js

@@ -43,13 +43,12 @@ function hasAction(action) {
 }
 // src/upgrade/index.ts
 import process from "process";
-import {ExitCode, parseArgs} from "@stacksjs/cli";
+import {parseArgs} from "@stacksjs/cli";
 import {Action} from "@stacksjs/enums";
+import {ExitCode} from "@stacksjs/types";
 var options = parseArgs();
-if (options?.framework || options?.all)
-  await updateFramework(options);
 if (options?.dependencies || options?.all)
-  await updateDependencies(options);
+  await runAction(Action.UpgradeDeps, options);
 if (options?.bun || options?.all)
   await runAction(Action.UpgradeBun, options);
 process.exit(ExitCode.InvalidArgument);

package/core/actions/dist/src/upgrade.js

@@ -7,7 +7,7 @@ import {projectPath} from "@stacksjs/path";
 import * as storage from "@stacksjs/storage";
 import {NpmScript} from "@stacksjs/enums";
 // package.json
-var version = "0.58.64";
+var version = "0.58.66";
 
 // src/upgrade.ts
 function checkForUncommittedChanges(options) {

package/core/actions/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/actions",
   "type": "module",
-  "version": "0.58.64",
+  "version": "0.58.66",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -64,6 +64,7 @@
     "@stacksjs/storage": "workspace:*",
     "@stacksjs/types": "workspace:*",
     "@stacksjs/utils": "workspace:*",
+    "@stacksjs/validation": "workspace:*",
     "markdown-it": "^14.0.0",
     "vue-component-meta": "^1.8.27"
   },
@@ -81,6 +82,7 @@
     "@stacksjs/storage": "workspace:*",
     "@stacksjs/strings": "workspace:*",
     "@stacksjs/utils": "workspace:*",
+    "@stacksjs/validation": "workspace:*",
     "markdown-it": "^14.0.0",
     "vue-component-meta": "^1.8.27"
   },

package/core/actions/src/action.ts

@@ -1,30 +1,48 @@
-import type { JobOptions } from '@stacksjs/types'
-import { log } from '@stacksjs/logging'
+import type { JobOptions, Nullable } from '@stacksjs/types'
+import type { ValidationBoolean, ValidationNumber, ValidationString } from '@stacksjs/validation'
+
+type FieldKey = string
+interface FieldValue {
+  rule: ValidationString | ValidationNumber | ValidationBoolean | Date | Nullable<any>
+  message: string
+  factory?: any
+  unique?: boolean
+}
+
+// TODO: this is temporary and will get auto generated based on ./app/Actions/*
+interface Request {
+  message: string
+  level: 'info' | 'warn' | 'error'
+}
 
 interface ActionOptions {
   name?: string
   description?: string
-  handle: () => Promise<any> | any
+  fields?: Record<FieldKey, FieldValue>
+  path?: string
   rate?: JobOptions['rate']
   tries?: JobOptions['tries']
   backoff?: JobOptions['backoff']
   enabled?: JobOptions['enabled']
+  handle: (request?: Request) => Promise<any> | object | string
 }
 
 export class Action {
   name?: string
   description?: string
+  fields?: Record<FieldKey, FieldValue>
   rate?: JobOptions['rate']
   tries?: JobOptions['tries']
   backoff?: JobOptions['backoff']
   enabled?: boolean
-  handle: () => Promise<any>
+  handle: (request?: Request) => Promise<any> | object | string
 
-  constructor({ name, description, handle, rate, tries, backoff, enabled }: ActionOptions) {
-    log.info(`Action ${name} created`)
+  constructor({ name, description, fields, handle, rate, tries, backoff, enabled }: ActionOptions) {
+    // log.debug(`Action ${name} created`) // TODO: this does not yet work because the cloud does not yet have proper file system (efs) access
 
     this.name = name
     this.description = description
+    this.fields = fields
     this.rate = rate
     this.tries = tries
     this.backoff = backoff

package/core/actions/src/generate/action-types.ts

@@ -0,0 +1,89 @@
+import { path as p } from '@stacksjs/path'
+import { storage } from '@stacksjs/storage'
+import { env as e, enums } from '@stacksjs/env'
+import { logger } from '@stacksjs/logging'
+import { envKeys } from '../../../../env'
+
+log.debug('Generating type Action types...')
+
+// generate ./storage/framework/types/env.d.ts file from .env
+const envTypes = `
+// This file is auto-generated by Stacks. Do not edit this file manually.
+// If you want to edit Action types, please edit the app/Actions/* validations
+//
+// For more information, please visit: https://stacksjs.org/docs
+
+declare module 'bun' {
+  namespace env {
+    ${envKeys.map((key) => {
+      let type: string | undefined = typeof e[key]
+      let value: string | boolean | number | undefined = e[key]
+
+      if (!value) {
+        if (enums[key]) {
+          type = enums[key]?.map(item => `'${item}'`).join(' | ')
+          value = enums[key]?.[0] // default to the first enum value
+        }
+ else {
+          switch (type) {
+            case 'number':
+              value = '0'
+              break
+            case 'boolean':
+              value = false
+              break
+            default:
+              value = ''
+          }
+        }
+      }
+
+      type = 'string'
+      if (typeof value === 'string') {
+        if (value.toLowerCase() === 'true' || value.toLowerCase() === 'false') {
+          type = 'boolean'
+        }
+        else if (!Number.isNaN(Number.parseFloat(value)) && Number.isFinite(Number(value))) {
+          type = 'number'
+        }
+        else if (enums[key]) {
+          // @ts-expect-error enums[key] is defined
+          type = enums[key].map(item => `'${item}'`).join(' | ')
+        }
+      }
+
+      else if (typeof value === 'number') {
+        type = 'number'
+      }
+
+      else if (typeof value === 'boolean') {
+        type = 'boolean'
+      }
+
+      return `const ${key}: ${type}`
+    }).join('\n    ')}
+  }
+}
+`
+
+await storage.writeFile(p.frameworkPath('types/env.d.ts'), envTypes)
+
+logger.log('  - ./storage/framework/env.ts')
+
+// generate ./storage/framework/env.ts file based on Bun.env
+const env = `
+// This file is auto-generated by Stacks. Do not edit this file manually.
+// If you want to change the environment variables, please edit the .env file.
+//
+// For more information, please visit: https://stacksjs.org/docs
+
+export const envKeys = [
+  ${envKeys.map(key => `'${key}'`).join(',\n  ')}
+] as const
+
+export type EnvKey = typeof envKeys[number]
+`
+
+await storage.writeFile(p.frameworkPath('env.ts'), env)
+
+logger.log('  - ./storage/framework/env.d.ts')

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

@@ -1,16 +1,17 @@
 import process from 'node:process'
-import { ExitCode, parseArgs } from '@stacksjs/cli'
+import { parseArgs } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
+import { ExitCode } from '@stacksjs/types'
 import { runAction } from '../helpers'
 
-const options = parseArgs()
+const options: any = parseArgs()
 
 // run all the upgrade actions
-if (options?.framework || options?.all)
-  await updateFramework(options)
+// if (options?.framework || options?.all)
+//   await updateFramework(options)
 
 if (options?.dependencies || options?.all)
-  await updateDependencies(options)
+  await runAction(Action.UpgradeDeps, options)
 
 if (options?.bun || options?.all)
   await runAction(Action.UpgradeBun, options)