@arkstack/console 0.12.0 → 0.12.1

package/dist/{BuildInterfaces-CjAQV0tH.js → BuildInterfaces-BoL-g5kU.js}

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { Arkstack } from "@arkstack/contract";
 import { readdirSync, writeFileSync } from "node:fs";
-import { Project } from "ts-morph";
+import { Node, Project } from "ts-morph";
 
 //#region src/prepare/TSConfig.ts
 const TSConfig = {
@@ -68,12 +68,19 @@ var BuildInterfaces = class BuildInterfaces {
 		});
 		BuildInterfaces.checker = BuildInterfaces.project.getTypeChecker();
 		const files = readdirSync(configDir).filter((f) => f.endsWith(".ts"));
+		const imports = /* @__PURE__ */ new Map();
 		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());
+			const sourceFile = BuildInterfaces.project.addSourceFileAtPath(path.join(configDir, file));
+			const exportAssignment = sourceFile.getExportAssignment((e) => !e.isExportEquals());
 			if (!exportAssignment) continue;
 			const expr = exportAssignment.getExpression();
+			const annotatedType = BuildInterfaces.resolveReturnTypeAnnotation(sourceFile, expr, imports);
+			if (annotatedType) {
+				properties.push(`        ${configName}: ${annotatedType}`);
+				continue;
+			}
 			const type = BuildInterfaces.checker.getTypeAtLocation(expr);
 			const callSignatures = type.getCallSignatures();
 			const resolvedType = callSignatures.length ? callSignatures[0].getReturnType() : type;
@@ -81,6 +88,7 @@ var BuildInterfaces = class BuildInterfaces {
 			properties.push(`        ${configName}: ${typeStr}`);
 		}
 		return [
+			...BuildInterfaces.renderImports(imports),
 			"declare module '@arkstack/common' {",
 			"    interface ConfigRegistry {",
 			...properties,
@@ -90,6 +98,41 @@ var BuildInterfaces = class BuildInterfaces {
 			"export {}"
 		].join("\n");
 	}
+	static resolveReturnTypeAnnotation(sourceFile, expr, imports) {
+		if (!Node.isArrowFunction(expr) && !Node.isFunctionExpression(expr)) return;
+		const returnType = expr.getReturnTypeNode();
+		if (!returnType) return;
+		const referencedNames = /* @__PURE__ */ new Set();
+		if (Node.isTypeReference(returnType)) referencedNames.add(returnType.getTypeName().getText());
+		returnType.forEachDescendant((node) => {
+			if (Node.isTypeReference(node)) referencedNames.add(node.getTypeName().getText());
+		});
+		for (const name of referencedNames) {
+			const imported = BuildInterfaces.findNamedTypeImport(sourceFile, name);
+			if (imported) {
+				const specifiers = imports.get(imported.moduleSpecifier) ?? /* @__PURE__ */ new Set();
+				specifiers.add(imported.specifier);
+				imports.set(imported.moduleSpecifier, specifiers);
+			}
+		}
+		return returnType.getText(!!sourceFile);
+	}
+	static findNamedTypeImport(sourceFile, name) {
+		for (const declaration of sourceFile.getImportDeclarations()) for (const namedImport of declaration.getNamedImports()) {
+			const alias = namedImport.getAliasNode()?.getText();
+			const importedName = namedImport.getName();
+			if ((alias ?? importedName) !== name) continue;
+			return {
+				moduleSpecifier: declaration.getModuleSpecifierValue(),
+				specifier: alias ? `${importedName} as ${alias}` : importedName
+			};
+		}
+	}
+	static renderImports(imports) {
+		return [...imports.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([moduleSpecifier, specifiers]) => {
+			return `import type { ${[...specifiers].sort().join(", ")} } from '${moduleSpecifier}'`;
+		});
+	}
 	/**
 	* ts-morph resolves computed keys like path.join(...) as { [x: number]: any }
 	* detect these by checking the type text for an index signature pattern

package/dist/index.d.ts

@@ -5,6 +5,9 @@ declare class BuildInterfaces {
   static configs(configDir?: string): void;
   static tsconfig(): void;
   private static generateConfig;
+  private static resolveReturnTypeAnnotation;
+  private static findNamedTypeImport;
+  private static renderImports;
   private static isDynamicMap;
   private static resolveType;
 }

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-CjAQV0tH.js";
+import { n as BaseTCConfig, r as TSConfig, t as BuildInterfaces } from "./BuildInterfaces-BoL-g5kU.js";
 import { abort, abortIf, assertFound, 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-CjAQV0tH.js";
+import { t as BuildInterfaces } from "./BuildInterfaces-BoL-g5kU.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.12.0",
+  "version": "0.12.1",
   "type": "module",
   "description": "Console module for Arkstack, providing the command-line runtime and console integration layer.",
   "homepage": "https://arkstack.toneflix.net/guide/cli",
@@ -51,8 +51,8 @@
     "chalk": "^5.6.2",
     "resora": "^1.3.6",
     "ts-morph": "^28.0.0",
-    "@arkstack/contract": "^0.12.0",
-    "@arkstack/common": "^0.12.0"
+    "@arkstack/common": "^0.12.1",
+    "@arkstack/contract": "^0.12.1"
   },
   "scripts": {
     "build": "tsdown",