@arkstack/console 0.1.29 → 0.1.30

package/dist/{app-CQsshUJ7.js → app-DtecNuLP.js}

@@ -3,17 +3,19 @@ import { CliApp } from "resora";
 import { existsSync } from "node:fs";
 
 //#region dist/config.js
-const defaultConfig = {
-	resourcesDir: "dist/app/http/resources",
-	localStubsDir: "node_modules/@arkstack/driver-h3/stubs",
-	stubs: {
-		resource: "resource.stub",
-		collection: "resource.collection.stub",
-		controller: "controller.stub",
-		api: "controller.api.stub",
-		model: "controller.model.stub",
-		apiResource: "controller.api.resource.stub"
-	}
+const defaultConfig = (app) => {
+	return {
+		resourcesDir: "dist/app/http/resources",
+		localStubsDir: `node_modules/@arkstack/driver-${app.getDriver().name ?? "h3"}/stubs`,
+		stubs: {
+			resource: "resource.stub",
+			collection: "resource.collection.stub",
+			controller: "controller.stub",
+			api: "controller.api.stub",
+			model: "controller.model.stub",
+			apiResource: "controller.api.resource.stub"
+		}
+	};
 };
 
 //#endregion
@@ -36,16 +38,10 @@ var ArkstackConsoleApp = class extends CliApp {
 		super();
 		this.core = core;
 		this.options = options;
-		this.config = {
-			...defaultConfig,
-			...this.config,
-			stubs: {
-				...defaultConfig.stubs,
-				...this.config?.stubs
-			}
-		};
+		this.mergeConfig();
 	}
 	makeController = (name, opts) => {
+		this.mergeConfig();
 		const normalized = name.endsWith("Controller") ? name.replace(/controller/i, "") : name;
 		let controllerName = normalized.endsWith("Controller") ? normalized : `${normalized}Controller`;
 		const outputPath = join(path.resolve(process.cwd(), "src", "app/http/controllers"), `${controllerName}.${opts?.ext ?? "ts"}`);
@@ -68,9 +64,29 @@ var ArkstackConsoleApp = class extends CliApp {
 		}, opts);
 		return outputPath;
 	};
+	/**
+	* Normalize a file path by removing the current working directory from it. 
+	* 
+	* @param p 
+	* @returns 
+	*/
 	normalizePath = (p) => {
 		return p.replace(process.cwd(), "");
 	};
+	/**
+	* Recursively merge defaultConfig with config from resora.config.js, giving 
+	* precedence to resora.
+	*/
+	mergeConfig = () => {
+		this.config = {
+			...defaultConfig(this.core),
+			...this.config,
+			stubs: {
+				...defaultConfig(this.core).stubs,
+				...this.config?.stubs
+			}
+		};
+	};
 };
 
 //#endregion

package/dist/app.d.ts

@@ -1,6 +1,6 @@
 import { CliApp } from "resora";
 
-//#region src/app.d.ts
+//#region src/types.d.ts
 interface Core {
   [k: string]: any;
   getDriver: () => {
@@ -11,6 +11,8 @@ interface Core {
 interface ConsoleAppOptions {
   stubsDir?: string;
 }
+//#endregion
+//#region src/app.d.ts
 declare const resolveStubsDir: (config: {
   localStubsDir?: string;
 } | undefined, options?: ConsoleAppOptions, core?: Core) => string;
@@ -19,7 +21,18 @@ declare class ArkstackConsoleApp<TCore extends Core> extends CliApp {
   private readonly options;
   constructor(core: TCore, options: ConsoleAppOptions);
   makeController: (name: string, opts: any) => string;
+  /**
+   * Normalize a file path by removing the current working directory from it.
+   *
+   * @param p
+   * @returns
+   */
   normalizePath: (p: string) => string;
+  /**
+   * Recursively merge defaultConfig with config from resora.config.js, giving
+   * precedence to resora.
+   */
+  mergeConfig: () => void;
 }
 //#endregion
-export { ArkstackConsoleApp, ConsoleAppOptions, resolveStubsDir };
+export { ArkstackConsoleApp, resolveStubsDir };

package/dist/app.js

@@ -1,3 +1,3 @@
-import { n as resolveStubsDir, t as ArkstackConsoleApp } from "./app-CQsshUJ7.js";
+import { n as resolveStubsDir, t as ArkstackConsoleApp } from "./app-DtecNuLP.js";
 
 export { ArkstackConsoleApp, resolveStubsDir };

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as ArkstackConsoleApp } from "./app-CQsshUJ7.js";
+import { t as ArkstackConsoleApp } from "./app-DtecNuLP.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { join } from "node:path";
 import { MakeResource } from "resora";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/console",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "description": "Console package for Arkstack providing console-specific implementations of core Arkstack features such as routing, middleware, and database integration.",
   "homepage": "https://arkstack.toneflix.net",
@@ -49,8 +49,8 @@
     "@h3ravel/musket": "^0.10.1",
     "chalk": "^5.6.2",
     "resora": "^0.2.14",
-    "@arkstack/common": "^0.1.29",
-    "@arkstack/contract": "^0.1.29"
+    "@arkstack/common": "^0.1.30",
+    "@arkstack/contract": "^0.1.30"
   },
   "scripts": {
     "build": "tsdown",