stacks 0.58.62 → 0.58.64

package/core/faker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/faker",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "Faker functions.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/git/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/git",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks git utilities & conventions.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/health/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/health",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks Health services.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/http",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "Stacks HTTP methods.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/lint/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/lint",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks way to lint.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/logging/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/logging",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks logging system.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/notifications/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/notifications",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks notifications integration.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/objects/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/objects",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks objects.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/orm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/orm",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks ORM integration",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/path/dist/index.js

@@ -8,6 +8,27 @@ function actionsPath(path) {
 function relativeActionsPath(path) {
   return relative(projectPath(), actionsPath(path));
 }
+function userActionsPath(path) {
+  return appPath(`Actions/${path || ""}`);
+}
+function userJobsPath(path) {
+  return appPath(`Jobs/${path || ""}`);
+}
+function userListenersPath(path) {
+  return appPath(`Listeners/${path || ""}`);
+}
+function userMiddlewarePath(path) {
+  return appPath(`Middleware/${path || ""}`);
+}
+function userModelsPath(path) {
+  return appPath(`Models/${path || ""}`);
+}
+function userNotificationsPath(path) {
+  return appPath(`Notifications/${path || ""}`);
+}
+function userEventsPath() {
+  return appPath(`Events.ts`);
+}
 function aiPath(path) {
   return corePath(`ai/${path || ""}`);
 }
@@ -311,6 +332,7 @@ function xRayPath(path) {
 }
 var path = {
   actionsPath,
+  userActionsPath,
   aiPath,
   assetsPath,
   relativeActionsPath,
@@ -400,6 +422,12 @@ var path = {
   tinkerPath,
   typesPath,
   uiPath,
+  userEventsPath,
+  userJobsPath,
+  userListenersPath,
+  userMiddlewarePath,
+  userModelsPath,
+  userNotificationsPath,
   utilsPath,
   validationPath,
   vitePath,
@@ -425,6 +453,13 @@ export {
   viewsPath,
   validationPath,
   utilsPath,
+  userNotificationsPath,
+  userModelsPath,
+  userMiddlewarePath,
+  userListenersPath,
+  userJobsPath,
+  userEventsPath,
+  userActionsPath,
   uiPath,
   typesPath,
   toNamespacedPath,

package/core/path/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/path",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks path.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/path/src/index.ts

@@ -23,6 +23,34 @@ export function relativeActionsPath(path?: string) {
   return relative(projectPath(), actionsPath(path))
 }
 
+export function userActionsPath(path?: string) {
+  return appPath(`Actions/${path || ''}`)
+}
+
+export function userJobsPath(path?: string) {
+  return appPath(`Jobs/${path || ''}`)
+}
+
+export function userListenersPath(path?: string) {
+  return appPath(`Listeners/${path || ''}`)
+}
+
+export function userMiddlewarePath(path?: string) {
+  return appPath(`Middleware/${path || ''}`)
+}
+
+export function userModelsPath(path?: string) {
+  return appPath(`Models/${path || ''}`)
+}
+
+export function userNotificationsPath(path?: string) {
+  return appPath(`Notifications/${path || ''}`)
+}
+
+export function userEventsPath() {
+  return appPath(`Events.ts`)
+}
+
 /**
  * Returns the path to the `ai` directory. The AI directory
  * contains the core Stacks' AI logic which currently
@@ -460,6 +488,7 @@ export function xRayPath(path?: string) {
 
 export const path = {
   actionsPath,
+  userActionsPath,
   aiPath,
   assetsPath,
   relativeActionsPath,
@@ -549,6 +578,12 @@ export const path = {
   tinkerPath,
   typesPath,
   uiPath,
+  userEventsPath,
+  userJobsPath,
+  userListenersPath,
+  userMiddlewarePath,
+  userModelsPath,
+  userNotificationsPath,
   utilsPath,
   validationPath,
   vitePath,

package/core/payments/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/payments",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks payments package. Currently supporting Stripe.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/push/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/push",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks Push integration",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/query-builder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/query-builder",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks Query Builder integration",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/queue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/queue",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks Queue system.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/raycast/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stacks-raycast",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks Raycast plugin.",
   "scripts": {
     "build": "echo 'No build step required yet.'"

package/core/realtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/realtime",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks realtime integration.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/repl/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/repl",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "A Stacks optimized TS & Vue REPL.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/router/dist/index.js

@@ -210,6 +210,27 @@ function actionsPath(path2) {
 function relativeActionsPath(path2) {
   return relative(projectPath(), actionsPath(path2));
 }
+function userActionsPath(path2) {
+  return appPath(`Actions/${path2 || ""}`);
+}
+function userJobsPath(path2) {
+  return appPath(`Jobs/${path2 || ""}`);
+}
+function userListenersPath(path2) {
+  return appPath(`Listeners/${path2 || ""}`);
+}
+function userMiddlewarePath(path2) {
+  return appPath(`Middleware/${path2 || ""}`);
+}
+function userModelsPath(path2) {
+  return appPath(`Models/${path2 || ""}`);
+}
+function userNotificationsPath(path2) {
+  return appPath(`Notifications/${path2 || ""}`);
+}
+function userEventsPath() {
+  return appPath(`Events.ts`);
+}
 function aiPath(path2) {
   return corePath(`ai/${path2 || ""}`);
 }
@@ -504,6 +525,7 @@ function xRayPath(path2) {
 }
 var path2 = {
   actionsPath,
+  userActionsPath,
   aiPath,
   assetsPath,
   relativeActionsPath,
@@ -593,6 +615,12 @@ var path2 = {
   tinkerPath,
   typesPath,
   uiPath,
+  userEventsPath,
+  userJobsPath,
+  userListenersPath,
+  userMiddlewarePath,
+  userModelsPath,
+  userNotificationsPath,
   utilsPath,
   validationPath,
   vitePath,
@@ -669,7 +697,6 @@ async function serve(options = {}) {
     hostname,
     port,
     fetch(req) {
-      console.log(req);
       return serverResponse(req);
     }
   });
@@ -785,13 +812,28 @@ class Router {
     });
   }
   async get(path5, callback) {
-    if (typeof callback === "string") {
-      const actionModule = await import(path2.actionsPath(`${callback}.ts`));
+    if (callback instanceof Promise) {
+      const actionModule = await callback;
+      callback = actionModule.default;
+    } else if (typeof callback === "string") {
+      const actionModule = await import(path2.userActionsPath(`${callback}.ts`));
       callback = actionModule.default.handle;
     }
     this.addRoute("GET", path5, callback, 200);
     return this;
   }
+  async health() {
+    const healthModule = await import(path2.userActionsPath("HealthAction.ts"));
+    const callback = healthModule.default.handle;
+    this.addRoute("GET", "/api/healthy", callback, 200);
+    return this;
+  }
+  async job(path5) {
+    const jobModule = await import(path2.userJobsPath("ExampleJob.ts"));
+    const callback = jobModule.default.handle;
+    this.addRoute("GET", path5, callback, 200);
+    return this;
+  }
   post(path5, callback) {
     this.addRoute("POST", path5, callback, 201);
     return this;

package/core/router/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/router",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks framework router.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/router/src/router.ts

@@ -48,9 +48,13 @@ export class Router implements RouterInterface {
 
   public async get(path: Route['url'], callback: Route['callback']): Promise<this> {
     // check if callback is a string and if it is, then import that module path and use the default.handle function as the callback
-    if (typeof callback === 'string') {
+    if (callback instanceof Promise) {
+      const actionModule = await callback
+      callback = actionModule.default
+    }
+    else if (typeof callback === 'string') {
       // import the module and use the default.handle function as the callback
-      const actionModule = await import(p.actionsPath(`${callback}.ts`))
+      const actionModule = await import(p.userActionsPath(`${callback}.ts`))
       callback = actionModule.default.handle
     }
 
@@ -58,6 +62,22 @@ export class Router implements RouterInterface {
     return this
   }
 
+  public async health(): Promise<this> {
+    const healthModule = await import(p.userActionsPath('HealthAction.ts'))
+    const callback = healthModule.default.handle
+
+    this.addRoute('GET', '/api/healthy', callback, 200)
+    return this
+  }
+
+  public async job(path: Route['url']): Promise<this> {
+    const jobModule = await import(p.userJobsPath('ExampleJob.ts'))
+    const callback = jobModule.default.handle
+
+    this.addRoute('GET', path, callback, 200)
+    return this
+  }
+
   public post(path: Route['url'], callback: Route['callback']): this {
     this.addRoute('POST', path, callback, 201)
     return this

package/core/router/src/server.ts

@@ -21,8 +21,6 @@ export async function serve(options: ServeOptions = {}) {
     port,
 
     fetch(req: Request) {
-      // eslint-disable-next-line no-console
-      console.log(req)
       return serverResponse(req)
     },
   })

package/core/scheduler/dist/index.js

@@ -508,7 +508,6 @@ class Schedule {
   cronPattern = "";
   timezone = "America/Los_Angeles";
   task;
-  cmd;
   constructor(task) {
     this.task = task;
   }
@@ -739,5 +738,5 @@ export {
   src_default as default,
   Schedule,
   CronTime,
-  CronJob2 as CronJob
+  CronJob2 as BunCronJob
 };

package/core/scheduler/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/scheduler",
   "type": "module",
-  "version": "0.58.62",
+  "version": "0.58.64",
   "description": "The Stacks scheduler.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -56,6 +56,7 @@
   "devDependencies": {
     "@fast-check/jest": "^1.8.0",
     "@stacksjs/development": "workspace:*",
+    "@types/sinon": "^17.0.3",
     "sinon": "^17.0.1"
   }
 }

package/core/scheduler/src/index.ts

@@ -1,6 +1,6 @@
 import { Schedule } from './schedule'
 
-export { CronJob } from './job'
+export { CronJob as BunCronJob } from './job'
 export { CronTime } from './time'
 
 export type {

package/core/scheduler/src/job.ts

@@ -233,8 +233,8 @@ export class CronJob<OC extends CronOnCompleteCommand | null = null, C = null> {
       startTime = Date.now()
       // eslint-disable-next-line ts/no-use-before-define
       this._timeout = setTimeout(callbackWrapper, t)
-      if (this.unrefTimeout && typeof this._timeout.unref === 'function')
-        this._timeout.unref()
+      if (this.unrefTimeout && typeof this._timeout!.unref === 'function')
+        this._timeout!.unref()
     }
 
     // The callback wrapper checks if it needs to sleep another period or not

package/core/scheduler/src/schedule.ts

@@ -6,8 +6,8 @@ import { CronTime } from './time'
 export class Schedule {
   private cronPattern: string = ''
   private timezone: string = 'America/Los_Angeles'
-  private task: () => void
-  private cmd?: string
+  private readonly task: () => void
+  // private cmd?: string
 
   constructor(task: () => void) {
     this.task = task