@arkstack/console 0.11.1 → 0.11.2

package/dist/BuildInterfaces-BJcYrFZP.js

@@ -0,0 +1,138 @@
+import path from "node:path";
+import { Arkstack } from "@arkstack/contract";
+import { readdirSync, writeFileSync } from "node:fs";
+import { Project } from "ts-morph";
+
+//#region src/prepare/TSConfig.ts
+const TSConfig = {
+	compilerOptions: {
+		module: "es2022",
+		target: "es2022",
+		lib: ["es2022", "DOM"],
+		moduleResolution: "bundler",
+		esModuleInterop: true,
+		forceConsistentCasingInFileNames: true,
+		strict: true,
+		skipLibCheck: true,
+		skipDefaultLibCheck: true,
+		strictFunctionTypes: true,
+		strictPropertyInitialization: true,
+		strictBindCallApply: true,
+		noImplicitAny: true,
+		removeComments: true,
+		experimentalDecorators: true,
+		emitDecoratorMetadata: true,
+		paths: {
+			"@": ["../src"],
+			"src/*": ["../src/*"],
+			"@app/*": ["../src/app/*"],
+			"@core/*": ["../src/core/*"],
+			"@controllers/*": ["../src/app/http/controllers/*"],
+			"@models/*": ["../src/app/models/*"]
+		}
+	},
+	include: [
+		"./*.d.ts",
+		"../src",
+		"../tests"
+	]
+};
+const BaseTCConfig = { extends: "./.arkstack/tsconfig.json" };
+
+//#endregion
+//#region src/prepare/BuildInterfaces.ts
+var BuildInterfaces = class BuildInterfaces {
+	static project;
+	static checker;
+	/**
+	* Generate configuration interfaces
+	* 
+	* @param configDir 
+	*/
+	static configs(configDir) {
+		configDir ??= path.join(Arkstack.rootDir(), "src/config");
+		const declaration = this.generateConfig(configDir);
+		writeFileSync(path.join(Arkstack.rootDir(), ".arkstack/ark.d.ts"), declaration, "utf8");
+	}
+	static tsconfig() {
+		const configs = {
+			".arkstack/tsconfig.json": JSON.stringify(TSConfig, void 0, 2),
+			"tsconfig.json": JSON.stringify(BaseTCConfig, void 0, 2)
+		};
+		for (const [file, config] of Object.entries(configs)) writeFileSync(path.join(Arkstack.rootDir(), file), config, "utf8");
+	}
+	static generateConfig(configDir = path.join(process.cwd(), "src/config")) {
+		BuildInterfaces.project = new Project({
+			tsConfigFilePath: path.join(process.cwd(), "tsconfig.json"),
+			skipAddingFilesFromTsConfig: true
+		});
+		BuildInterfaces.checker = BuildInterfaces.project.getTypeChecker();
+		const files = readdirSync(configDir).filter((f) => f.endsWith(".ts") && !f.includes("middleware"));
+		const properties = [];
+		for (const file of files) {
+			const configName = path.basename(file, ".ts");
+			const exportAssignment = BuildInterfaces.project.addSourceFileAtPath(path.join(configDir, file)).getExportAssignment((e) => !e.isExportEquals());
+			if (!exportAssignment) continue;
+			const expr = exportAssignment.getExpression();
+			const type = BuildInterfaces.checker.getTypeAtLocation(expr);
+			const callSignatures = type.getCallSignatures();
+			const resolvedType = callSignatures.length ? callSignatures[0].getReturnType() : type;
+			const typeStr = BuildInterfaces.resolveType(resolvedType, 2);
+			properties.push(`        ${configName}: ${typeStr}`);
+		}
+		return [
+			"declare module '@arkstack/common' {",
+			"    interface ConfigRegistry {",
+			...properties,
+			"    }",
+			"}",
+			"",
+			"export {}"
+		].join("\n");
+	}
+	/**
+	* ts-morph resolves computed keys like path.join(...) as { [x: number]: any }
+	* detect these by checking the type text for an index signature pattern
+	* 
+	* @param type 
+	* @returns 
+	*/
+	static isDynamicMap(type) {
+		return /^\{ \[x: (string|number)\]:/.test(type.getText());
+	}
+	static resolveType(type, indent) {
+		const pad = "    ".repeat(indent);
+		const innerPad = "    ".repeat(indent + 1);
+		if (type.isString()) return "string";
+		if (type.isNumber()) return "number";
+		if (type.isBoolean()) return "boolean";
+		if (type.isNull()) return "null";
+		if (type.isUndefined()) return "undefined";
+		if (type.isAny() || type.isUnknown()) return "any";
+		if (type.isStringLiteral()) return `'${type.getLiteralValue()}'`;
+		if (type.isNumberLiteral()) return String(type.getLiteralValue());
+		if (type.isBooleanLiteral()) return String(type.getLiteralValue());
+		if (type.isUnion()) return type.getUnionTypes().map((t) => BuildInterfaces.resolveType(t, indent)).join(" | ");
+		if (type.isArray()) {
+			const elementType = type.getArrayElementTypeOrThrow();
+			return `${BuildInterfaces.resolveType(elementType, indent)}[]`;
+		}
+		if (type.getCallSignatures().length) return "Function";
+		if (type.isObject()) {
+			if (BuildInterfaces.isDynamicMap(type)) return "Record<string, string>";
+			const props = type.getProperties();
+			if (!props.length) return "Record<string, any>";
+			return `{\n${props.map((prop) => {
+				const decl = prop.getDeclarations()[0];
+				if (!decl) return `${innerPad}${prop.getName()}: any`;
+				const propType = BuildInterfaces.checker.getTypeOfSymbolAtLocation(prop, decl);
+				const optional = prop.isOptional() ? "?" : "";
+				return `${innerPad}${prop.getName()}${optional}: ${BuildInterfaces.resolveType(propType, indent + 1)}`;
+			}).join("\n")}\n${pad}}`;
+		}
+		return type.getText();
+	}
+};
+
+//#endregion
+export { BaseTCConfig as n, TSConfig as r, BuildInterfaces as t };

package/dist/index.d.ts

@@ -1,10 +1,12 @@
 //#region src/prepare/BuildInterfaces.d.ts
 declare class BuildInterfaces {
-  static configs(): void;
+  private static project;
+  private static checker;
+  static configs(configDir?: string): void;
   static tsconfig(): void;
+  private static generateConfig;
   private static isDynamicMap;
-  private static inferType;
-  private static buildInterface;
+  private static resolveType;
 }
 //#endregion
 //#region src/prepare/TSConfig.d.ts

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { t as ArkstackConsoleApp } from "./app-DGy8It6S.js";
-import { n as BaseTCConfig, r as TSConfig, t as BuildInterfaces } from "./BuildInterfaces-DQGcpPu2.js";
+import { n as BaseTCConfig, r as TSConfig, t as BuildInterfaces } from "./BuildInterfaces-BJcYrFZP.js";
 import { config, env, importFile, initializeGlobalContext, loadPrototypes, outputDir } from "@arkstack/common";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path, { join } from "node:path";

package/dist/prepare.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as BuildInterfaces } from "./BuildInterfaces-DQGcpPu2.js";
+import { t as BuildInterfaces } from "./BuildInterfaces-BJcYrFZP.js";
 import path from "node:path";
 import { Arkstack } from "@arkstack/contract";
 import { existsSync, mkdirSync } from "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/console",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "type": "module",
   "description": "Console module for Arkstack, providing the command-line runtime and console integration layer.",
   "homepage": "https://arkstack.toneflix.net/guide/cli",
@@ -42,16 +42,17 @@
     }
   },
   "peerDependencies": {
-    "clear-router": "^2.7.7",
-    "arkormx": "^ 2.4.1"
+    "arkormx": "^ 2.4.1",
+    "clear-router": "^2.7.7"
   },
   "dependencies": {
     "@h3ravel/musket": "^0.10.1",
     "@h3ravel/support": "^0.15.11",
     "chalk": "^5.6.2",
     "resora": "^1.3.6",
-    "@arkstack/common": "^0.11.1",
-    "@arkstack/contract": "^0.11.1"
+    "ts-morph": "^28.0.0",
+    "@arkstack/common": "^0.11.2",
+    "@arkstack/contract": "^0.11.2"
   },
   "scripts": {
     "build": "tsdown",

package/dist/BuildInterfaces-DQGcpPu2.js

@@ -1,98 +0,0 @@
-import { config } from "@arkstack/common";
-import path from "node:path";
-import { Arkstack } from "@arkstack/contract";
-import { writeFileSync } from "node:fs";
-
-//#region src/prepare/TSConfig.ts
-const TSConfig = {
-	compilerOptions: {
-		module: "es2022",
-		target: "es2022",
-		lib: ["es2022", "DOM"],
-		moduleResolution: "bundler",
-		esModuleInterop: true,
-		forceConsistentCasingInFileNames: true,
-		strict: true,
-		skipLibCheck: true,
-		skipDefaultLibCheck: true,
-		strictFunctionTypes: true,
-		strictPropertyInitialization: true,
-		strictBindCallApply: true,
-		noImplicitAny: true,
-		removeComments: true,
-		experimentalDecorators: true,
-		emitDecoratorMetadata: true,
-		paths: {
-			"@": ["../src"],
-			"src/*": ["../src/*"],
-			"@app/*": ["../src/app/*"],
-			"@core/*": ["../src/core/*"],
-			"@controllers/*": ["../src/app/http/controllers/*"],
-			"@models/*": ["../src/app/models/*"]
-		}
-	},
-	include: [
-		"./*.d.ts",
-		"../src",
-		"../tests"
-	]
-};
-const BaseTCConfig = { extends: "./.arkstack/tsconfig.json" };
-
-//#endregion
-//#region src/prepare/BuildInterfaces.ts
-var BuildInterfaces = class {
-	static configs() {
-		const items = config();
-		const declaration = [
-			"export {}",
-			"",
-			"declare module '@arkstack/common' {",
-			this.buildInterface("ConfigRegistry", items),
-			"}"
-		].join("\n");
-		writeFileSync(path.join(Arkstack.rootDir(), ".arkstack/ark.d.ts"), declaration, "utf8");
-	}
-	static tsconfig() {
-		const configs = {
-			".arkstack/tsconfig.json": JSON.stringify(TSConfig, void 0, 2),
-			"tsconfig.json": JSON.stringify(BaseTCConfig, void 0, 2)
-		};
-		for (const [file, config] of Object.entries(configs)) writeFileSync(path.join(Arkstack.rootDir(), file), config, "utf8");
-	}
-	static isDynamicMap(obj) {
-		const keys = Object.keys(obj);
-		if (keys.length === 0) return false;
-		return keys.every((key) => path.isAbsolute(key) || /[^a-zA-Z0-9_$]/.test(key) || /^\d/.test(key));
-	}
-	static inferType(value, indent) {
-		if (value === null) return "null";
-		if (typeof value === "undefined") return "any";
-		if (typeof value === "function") return "Function";
-		if (Array.isArray(value)) {
-			if (value.length === 0) return "unknown[]";
-			const itemTypes = [...new Set(value.map((v) => this.inferType(v, indent)))];
-			return itemTypes.length === 1 ? `${itemTypes[0]}[]` : `(${itemTypes.join(" | ")})[]`;
-		}
-		if (typeof value === "object") {
-			const obj = value;
-			if (this.isDynamicMap(obj)) {
-				const valueTypes = [...new Set(Object.values(obj).map((v) => this.inferType(v, indent)))];
-				return `Record<string, ${valueTypes.length === 1 ? valueTypes[0] : valueTypes.join(" | ")}>`;
-			}
-			return this.buildInterface(void 0, obj, indent);
-		}
-		return typeof value;
-	}
-	static buildInterface(name, obj, indent = 0) {
-		const pad = "    ".repeat(indent);
-		const innerPad = "    ".repeat(indent + 1);
-		const body = Object.entries(obj).map(([key, value]) => {
-			return `${innerPad}${key}: ${this.inferType(value, indent + 1)}`;
-		}).join("\n");
-		return name ? `${pad}interface ${name} {\n${body}\n${pad}}` : `{\n${body}\n${pad}}`;
-	}
-};
-
-//#endregion
-export { BaseTCConfig as n, TSConfig as r, BuildInterfaces as t };