@apso/cli 0.8.6 → 0.10.2

package/dist/commands/server/scaffold.js

@@ -1,321 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const path = tslib_1.__importStar(require("path"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
-const lib_1 = require("../../lib");
 const base_command_1 = tslib_1.__importDefault(require("../../lib/base-command"));
-const apsorc_parser_1 = require("../../lib/apsorc-parser");
-const perf_hooks_1 = require("perf_hooks");
-const Eta = tslib_1.__importStar(require("eta"));
-const file_system_1 = require("../../lib/utils/file-system");
-Eta.configure({
-    views: path.join(__dirname, "../../lib/templates"),
-    cache: false,
-});
 class Scaffold extends base_command_1.default {
-    async scaffoldServer(options) {
-        const { dir, entity, relationshipMap, apiType, allEntities } = options;
-        const entityBuildStart = perf_hooks_1.performance.now();
-        this.log(`Building... ${entity.name}`);
-        const entityName = entity.name;
-        const filePath = path.join(dir, entityName);
-        const entityRelationships = relationshipMap[entity.name] || [];
-        await (0, lib_1.createEntity)({
-            apiBaseDir: filePath,
-            entity,
-            relationships: entityRelationships,
-            apiType,
-            allEntities,
-        });
-        switch (apiType) {
-            case apsorc_parser_1.ApiType.Graphql:
-                await this.setupGraphqlFiles(dir, entity, relationshipMap);
-                break;
-            case apsorc_parser_1.ApiType.Rest:
-                await this.setupRestFiles(dir, entity, relationshipMap, apiType, allEntities);
-                break;
-            default:
-                break;
-        }
-        await (0, lib_1.createModule)(filePath, entity, { apiType });
-        const entityBuildTime = perf_hooks_1.performance.now() - entityBuildStart;
-        console.log(`[apso] Finished building entity '${entity.name}' in ${entityBuildTime.toFixed(2)} ms`);
-    }
-    async setupRestFiles(dir, entity, relationshipMap, apiType, allEntities) {
-        const filePath = path.join(dir, entity.name);
-        const entityRelationships = relationshipMap[entity.name] || [];
-        const tDto = perf_hooks_1.performance.now();
-        await (0, lib_1.createDto)(filePath, entity, entityRelationships, {
-            apiType,
-            allEntities,
-        });
-        if (process.env.DEBUG) {
-            console.log(`[timing] createDto for ${entity.name}: ${(perf_hooks_1.performance.now() - tDto).toFixed(2)}ms`);
-            const used = process.memoryUsage();
-            console.log(`[mem] heapUsed after createDto for ${entity.name}: ${(used.heapUsed /
-                1024 /
-                1024).toFixed(2)} MB`);
-        }
-        const tService = perf_hooks_1.performance.now();
-        await (0, lib_1.createService)(filePath, entity, relationshipMap);
-        if (process.env.DEBUG) {
-            console.log(`[timing] createService for ${entity.name}: ${(perf_hooks_1.performance.now() - tService).toFixed(2)}ms`);
-            const used = process.memoryUsage();
-            console.log(`[mem] heapUsed after createService for ${entity.name}: ${(used.heapUsed /
-                1024 /
-                1024).toFixed(2)} MB`);
-        }
-        const tController = perf_hooks_1.performance.now();
-        await (0, lib_1.createController)(filePath, entity, relationshipMap);
-        if (process.env.DEBUG) {
-            console.log(`[timing] createController for ${entity.name}: ${(perf_hooks_1.performance.now() - tController).toFixed(2)}ms`);
-        }
-    }
-    async setupGraphqlFiles(dir, entity, relationshipMap) {
-        const filePath = path.join(dir, entity.name);
-        const entityRelationships = relationshipMap[entity.name] || [];
-        await (0, lib_1.createGqlDTO)(filePath, entity, entityRelationships);
-    }
     async run() {
-        const { flags } = await this.parse(Scaffold);
-        const skipFormat = flags["skip-format"];
-        const totalBuildStart = perf_hooks_1.performance.now();
-        const { rootFolder, entities, relationshipMap, apiType, auth, language: configLanguage } = (0, lib_1.parseApsorc)();
-        // Resolve language: flag > .apsorc > prompt
-        let language;
-        if (flags.language) {
-            language = flags.language;
-        }
-        else if (configLanguage && (0, lib_1.isLanguageSupported)(configLanguage)) {
-            language = configLanguage;
-            console.log(`[apso] Using language from .apsorc: ${language}`);
-        }
-        else {
-            // Prompt the user
-            const implementedLanguages = (0, lib_1.getImplementedLanguages)();
-            const { selectedLanguage } = await inquirer_1.default.prompt([
-                {
-                    type: "list",
-                    name: "selectedLanguage",
-                    message: "Select target language for code generation:",
-                    choices: implementedLanguages.map((lang) => ({
-                        name: lang === "typescript" ? "TypeScript (NestJS + TypeORM)" :
-                            lang === "python" ? "Python (FastAPI + SQLAlchemy)" :
-                                "Go (Gin + GORM)",
-                        value: lang,
-                    })),
-                    default: "typescript",
-                },
-            ]);
-            language = selectedLanguage;
-        }
-        // Validate language support
-        if (!(0, lib_1.isLanguageSupported)(language)) {
-            this.error(`Unsupported language: ${language}. Supported: typescript, python, go`);
-        }
-        const implementedLanguages = (0, lib_1.getImplementedLanguages)();
-        if (!implementedLanguages.includes(language)) {
-            this.error(`Language '${language}' is not yet implemented. Currently available: ${implementedLanguages.join(", ")}`);
-        }
-        const rootPath = path.join(process.cwd(), rootFolder);
-        const autogenPath = path.join(rootPath, "autogen");
-        const lowerCaseApiType = apiType.toLowerCase();
-        console.log(`[apso] Generating ${language} code for ${entities.length} entities...`);
-        // For TypeScript, use the existing code path (for backward compatibility)
-        // For other languages, use the new generator system
-        await (language === "typescript" ? this.scaffoldTypeScript({
-            autogenPath,
-            rootPath,
-            entities,
-            relationshipMap,
-            apiType: lowerCaseApiType,
-            auth,
-            skipFormat,
-        }) : this.scaffoldWithGenerator({
-            language,
-            rootFolder,
-            autogenPath,
-            entities,
-            relationshipMap,
-            apiType: lowerCaseApiType,
-            auth,
-            skipFormat,
-        }));
-        const totalBuildTime = perf_hooks_1.performance.now() - totalBuildStart;
-        console.log(`[apso] Finished building all entities in ${totalBuildTime.toFixed(2)} ms`);
-    }
-    /**
-     * Scaffolds TypeScript code using the existing code path (for backward compatibility)
-     */
-    async scaffoldTypeScript(options) {
-        const { autogenPath, rootPath, entities, relationshipMap, apiType, auth, skipFormat } = options;
-        await (0, lib_1.createEnums)(autogenPath, entities, apiType);
-        await Promise.all(entities.map(async (entity) => {
-            const scaffoldModel = this.scaffoldServer.bind(this);
-            await scaffoldModel({
-                dir: autogenPath,
-                entity,
-                relationshipMap,
-                apiType,
-                allEntities: entities,
-            });
-            if (process.env.DEBUG) {
-                const used = process.memoryUsage();
-                console.log(`[mem] heapUsed after ${entity.name}: ${(used.heapUsed /
-                    1024 /
-                    1024).toFixed(2)} MB`);
-            }
-        }));
-        // Generate guards (auth and/or scope) based on .apsorc configuration
-        await (0, lib_1.createGuards)(rootPath, entities, auth);
-        await (0, lib_1.createIndexAppModule)(autogenPath, entities, apiType);
-        if (skipFormat) {
-            console.log("[apso] Skipping formatting (--skip-format flag set)");
-        }
-        else {
-            const formatStart = perf_hooks_1.performance.now();
-            console.log("[apso] Formatting files...");
-            await this.runNpmCommand(["run", "format", "src/autogen/**/*.ts", "src/guards/**/*.ts"], true);
-            const formatTime = perf_hooks_1.performance.now() - formatStart;
-            console.log(`[apso] Finished formatting in ${formatTime.toFixed(2)} ms`);
-        }
-    }
-    /**
-     * Scaffolds code using the new generator system (for Python, Go, and future languages)
-     * Note: Sequential file operations are intentional to provide progress feedback
-     */
-    /* eslint-disable no-await-in-loop */
-    async scaffoldWithGenerator(options) {
-        const { language, rootFolder, autogenPath, entities, relationshipMap, apiType, auth } = options;
-        // Create generator configuration
-        const generatorConfig = {
-            language,
-            rootFolder,
-            apiType,
-            entities,
-            relationshipMap,
-            auth,
-        };
-        // Create the appropriate generator
-        const generator = (0, lib_1.createGenerator)(generatorConfig);
-        // Validate configuration
-        const validationResult = generator.validateConfig(generatorConfig);
-        if (!validationResult.valid) {
-            this.error(`Configuration validation failed:\n${validationResult.errors.join("\n")}`);
-        }
-        if (validationResult.warnings.length > 0) {
-            console.log(`[apso] Warnings:\n${validationResult.warnings.join("\n")}`);
-        }
-        // Generate enums
-        const enumFiles = await generator.generateEnums(entities, apiType);
-        for (const file of enumFiles) {
-            const fullPath = path.join(autogenPath, file.path);
-            await (0, file_system_1.createFile)(fullPath, file.content);
-            console.log(`[apso] Generated ${fullPath}`);
-        }
-        // Generate files for each entity
-        for (const entity of entities) {
-            console.log(`[apso] Building... ${entity.name}`);
-            const entityBuildStart = perf_hooks_1.performance.now();
-            const entityRelationships = relationshipMap[entity.name] || [];
-            // Generate entity files
-            const entityFiles = await generator.generateEntity({
-                entity,
-                relationships: entityRelationships,
-                allEntities: entities,
-                apiType,
-            });
-            for (const file of entityFiles) {
-                const fullPath = path.join(autogenPath, file.path);
-                await (0, file_system_1.createFile)(fullPath, file.content);
-            }
-            // Generate DTO files
-            const dtoFiles = await generator.generateDto({
-                entity,
-                relationships: entityRelationships,
-                allEntities: entities,
-                apiType,
-            });
-            for (const file of dtoFiles) {
-                const fullPath = path.join(autogenPath, file.path);
-                await (0, file_system_1.createFile)(fullPath, file.content);
-            }
-            // Generate service files
-            const serviceFiles = await generator.generateService({
-                entity,
-                relationships: entityRelationships,
-                allEntities: entities,
-                apiType,
-                relationshipMap,
-            });
-            for (const file of serviceFiles) {
-                const fullPath = path.join(autogenPath, file.path);
-                await (0, file_system_1.createFile)(fullPath, file.content);
-            }
-            // Generate controller files
-            const controllerFiles = await generator.generateController({
-                entity,
-                relationships: entityRelationships,
-                allEntities: entities,
-                apiType,
-                relationshipMap,
-            });
-            for (const file of controllerFiles) {
-                const fullPath = path.join(autogenPath, file.path);
-                await (0, file_system_1.createFile)(fullPath, file.content);
-            }
-            // Generate module files
-            const moduleFiles = await generator.generateModule({
-                entity,
-                relationships: entityRelationships,
-                allEntities: entities,
-                apiType,
-            });
-            for (const file of moduleFiles) {
-                const fullPath = path.join(autogenPath, file.path);
-                await (0, file_system_1.createFile)(fullPath, file.content);
-            }
-            const entityBuildTime = perf_hooks_1.performance.now() - entityBuildStart;
-            console.log(`[apso] Finished building entity '${entity.name}' in ${entityBuildTime.toFixed(2)} ms`);
-        }
-        // Generate guards
-        const guardFiles = await generator.generateGuards(entities, auth);
-        const rootPath = path.dirname(autogenPath);
-        for (const file of guardFiles) {
-            const fullPath = path.join(rootPath, "autogen", file.path);
-            await (0, file_system_1.createFile)(fullPath, file.content);
-            console.log(`[apso] Generated ${fullPath}`);
-        }
-        // Generate index module
-        const indexFiles = await generator.generateIndexModule(entities, apiType);
-        for (const file of indexFiles) {
-            const fullPath = path.join(autogenPath, file.path);
-            await (0, file_system_1.createFile)(fullPath, file.content);
-            console.log(`[apso] Generated ${fullPath}`);
-        }
+        this.warn('"apso server scaffold" is deprecated. Use "apso generate" instead.');
+        await this.config.runCommand("generate", this.argv);
     }
 }
-Scaffold.description = "Setup new entities and interfaces for an Apso Server";
-Scaffold.examples = [
-    `$ apso server scaffold`,
-    `$ apso server scaffold --skip-format`,
-    `$ apso server scaffold --language typescript`,
-    `$ apso server scaffold --language python`,
-    `$ apso server scaffold --language go`,
-];
-Scaffold.flags = {
-    help: core_1.Flags.help({ char: "h" }),
-    "skip-format": core_1.Flags.boolean({
-        description: "Skip the formatting step (useful when prettier is not available)",
-        default: false,
-    }),
-    language: core_1.Flags.string({
-        char: "l",
-        description: "Target language for code generation (typescript, python, go). If not specified, uses .apsorc config or prompts.",
-        options: ["typescript", "python", "go"],
-    }),
-};
-Scaffold.args = {};
+Scaffold.hidden = true;
+Scaffold.description = "[Deprecated] Use 'apso generate' instead";
+Scaffold.examples = [`$ apso generate`];
+Scaffold.strict = false;
 exports.default = Scaffold;

package/dist/commands/status.d.ts

@@ -0,0 +1,7 @@
+import BaseCommand from "../lib/base-command";
+export default class Status extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {};
+    run(): Promise<void>;
+}

package/dist/commands/status.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
+const config_1 = require("../lib/config");
+const services_1 = require("../lib/api/services");
+class Status extends base_command_1.default {
+    async run() {
+        // Auth guard
+        if (!config_1.credentials.isValid()) {
+            this.error("Not logged in. Run 'apso login' first.");
+        }
+        // Link guard
+        const link = config_1.projectLink.read();
+        if (!link) {
+            this.error("Project not linked. Run 'apso link' first.");
+        }
+        // Fetch service
+        const service = await services_1.servicesApi.get(link.workspaceSlug, link.serviceSlug);
+        this.log(`Service: ${service.name} (${service.slug})`);
+        this.log(`Workspace: ${link.workspaceSlug}`);
+        this.log(`Status: ${service.status}`);
+        this.log(`GitHub: ${service.githubRepo || "not connected"}`);
+        if (service.endpoint) {
+            this.log(`Endpoint: ${service.endpoint}`);
+        }
+        if (service.lastDeployedAt) {
+            this.log(`Last deployed: ${new Date(service.lastDeployedAt).toLocaleString()}`);
+        }
+        // Fetch latest build
+        const latestBuild = await services_1.buildApi.getLatest(link.workspaceSlug, link.serviceSlug);
+        if (latestBuild) {
+            this.log("");
+            this.log("Latest build:");
+            this.log(`  ID: ${latestBuild.id}`);
+            this.log(`  Status: ${latestBuild.status}`);
+            this.log(`  Started: ${new Date(latestBuild.startedAt).toLocaleString()}`);
+            if (latestBuild.completedAt) {
+                this.log(`  Completed: ${new Date(latestBuild.completedAt).toLocaleString()}`);
+            }
+            if (latestBuild.error) {
+                this.log(`  Error: ${latestBuild.error}`);
+            }
+        }
+        else {
+            this.log("\nNo builds found. Run 'apso deploy' to trigger one.");
+        }
+    }
+}
+Status.description = "Show the current service and latest build status";
+Status.examples = [`$ apso status`];
+Status.flags = {};
+exports.default = Status;

package/dist/commands/unlink.d.ts

@@ -0,0 +1,9 @@
+import BaseCommand from "../lib/base-command";
+export default class Unlink extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        yes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/unlink.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
+const config_1 = require("../lib/config");
+class Unlink extends base_command_1.default {
+    async run() {
+        const { flags } = await this.parse(Unlink);
+        const link = config_1.projectLink.read();
+        if (!link) {
+            this.log("Project is not linked. Nothing to do.");
+            return;
+        }
+        this.log(`Currently linked to: ${link.workspaceSlug}/${link.serviceSlug}`);
+        if (!flags.yes) {
+            const { confirm } = await inquirer_1.default.prompt([
+                {
+                    type: "confirm",
+                    name: "confirm",
+                    message: "Remove project link?",
+                    default: false,
+                },
+            ]);
+            if (!confirm) {
+                this.log("Unlink cancelled.");
+                return;
+            }
+        }
+        config_1.projectLink.remove();
+        this.log("Project unlinked.");
+    }
+}
+Unlink.description = "Remove the link between this project and the platform";
+Unlink.examples = [
+    `$ apso unlink`,
+    `$ apso unlink --yes`,
+];
+Unlink.flags = {
+    yes: core_1.Flags.boolean({
+        char: "y",
+        description: "Skip confirmation prompt",
+        default: false,
+    }),
+};
+exports.default = Unlink;

package/dist/commands/whoami.d.ts

@@ -0,0 +1,10 @@
+import BaseCommand from "../lib/base-command";
+export default class Whoami extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/whoami.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
+const config_1 = require("../lib/config");
+class Whoami extends base_command_1.default {
+    async run() {
+        const { flags } = await this.parse(Whoami);
+        const creds = config_1.credentials.read();
+        if (!creds) {
+            if (flags.json) {
+                this.log(JSON.stringify({ authenticated: false }, null, 2));
+            }
+            else {
+                this.log("Not logged in. Run 'apso login' to authenticate.");
+            }
+            return;
+        }
+        const config = config_1.globalConfig.read();
+        const link = config_1.projectLink.read();
+        // Check if session is valid
+        const isValid = config_1.credentials.isValid();
+        const needsRefresh = config_1.credentials.needsRefresh();
+        const info = {
+            authenticated: true,
+            user: {
+                id: creds.user.id,
+                email: creds.user.email,
+                name: creds.user.name || undefined,
+            },
+            session: {
+                valid: isValid,
+                needsRefresh,
+                expiresAt: creds.tokens.expiresAt,
+            },
+            context: {
+                workspace: (link === null || link === void 0 ? void 0 : link.workspaceSlug) || config.defaultWorkspace || undefined,
+                service: (link === null || link === void 0 ? void 0 : link.serviceSlug) || undefined,
+            },
+            config: {
+                apiUrl: config.apiUrl,
+                webUrl: config.webUrl,
+            },
+        };
+        if (flags.json) {
+            this.log(JSON.stringify(info, null, 2));
+            return;
+        }
+        // Pretty print
+        this.log("");
+        this.log(`  Email:     ${creds.user.email}`);
+        if (creds.user.name) {
+            this.log(`  Name:      ${creds.user.name}`);
+        }
+        this.log(`  User ID:   ${creds.user.id}`);
+        this.log("");
+        // Session status
+        if (!isValid) {
+            this.log("  Session:   Expired (run 'apso login' to refresh)");
+        }
+        else if (needsRefresh) {
+            this.log("  Session:   Valid (will refresh soon)");
+        }
+        else {
+            this.log("  Session:   Valid");
+        }
+        this.log("");
+        // Context
+        if (link) {
+            this.log(`  Workspace: ${link.workspaceSlug}`);
+            this.log(`  Service:   ${link.serviceSlug}`);
+        }
+        else if (config.defaultWorkspace) {
+            this.log(`  Workspace: ${config.defaultWorkspace} (default)`);
+            this.log("  Service:   None (run 'apso use <service>' to set)");
+        }
+        else {
+            this.log("  Workspace: None (run 'apso use <service>' to set)");
+            this.log("  Service:   None");
+        }
+        this.log("");
+    }
+}
+Whoami.description = "Display information about the current user and context";
+Whoami.examples = [
+    "$ apso whoami",
+    "$ apso whoami --json",
+];
+Whoami.flags = {
+    help: core_1.Flags.help({ char: "h" }),
+    json: core_1.Flags.boolean({
+        description: "Output as JSON",
+        default: false,
+    }),
+};
+exports.default = Whoami;

package/dist/lib/api/client.js

@@ -114,7 +114,7 @@ async function refreshAccessToken() {
     }
     try {
         const config = config_1.globalConfig.read();
-        const response = await fetch(`${config.apiUrl}/auth/cli/refresh`, {
+        const response = await fetch(`${config.apiUrl}/api/auth/cli/refresh`, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",

package/dist/lib/api/services.js

@@ -15,19 +15,19 @@ exports.authApi = {
      * Exchange OAuth authorization code for tokens
      */
     exchangeCode(code) {
-        return client_1.api.post("/auth/cli/exchange", { code }, { skipAuth: true });
+        return client_1.api.post("/api/auth/cli/exchange", { code }, { skipAuth: true });
     },
     /**
      * Get current user profile
      */
     getProfile() {
-        return client_1.api.get("/auth/me");
+        return client_1.api.get("/api/auth/me");
     },
     /**
      * Revoke current session
      */
     logout() {
-        return client_1.api.post("/auth/cli/logout");
+        return client_1.api.post("/api/auth/cli/logout");
     },
 };
 /**

package/dist/lib/api/types.d.ts

@@ -164,8 +164,15 @@ export interface UserProfile {
 export interface TokenExchangeResponse {
     accessToken: string;
     refreshToken: string;
-    expiresIn: number;
-    tokenType: string;
+    /**
+     * Token expiration as ISO timestamp string
+     */
+    expiresAt: string;
+    /**
+     * Optional: Token expiration in seconds (for compatibility)
+     */
+    expiresIn?: number;
+    tokenType?: string;
     user: {
         id: string;
         email: string;

package/dist/lib/apsorc-parser.d.ts

@@ -30,29 +30,10 @@ type ParsedApsorc = {
 export declare const parseApsorcV1: (apsorc: ApsorcType) => ParsedApsorcData;
 export declare const parseApsorcV2: (apsorc: ApsorcType) => ParsedApsorcData;
 export declare const parseApsorc: () => ParsedApsorc;
-/**
- * Represents the unified configuration structure after parsing and potential migration.
- */
-interface UnifiedConfig {
-    entities: Entity[];
-    relationships: ApsorcRelationship[];
-    rootFolder: string;
-}
 /**
  * Finds the .apsorc configuration file path.
  * Searches upwards from the current working directory.
  * @returns The absolute path to the .apsorc file, or null if not found.
  */
 export declare const findConfigPath: () => string | null;
-/**
- * Loads, validates, and potentially migrates the .apsorc configuration.
- * Uses the `rc` library to find and load the .apsorc file.
- * Detects config version (V1 or V2) and migrates V1 to V2 if necessary.
- * Performs basic validation on the final V2 structure.
- * @param appName The name of the application (used by `rc`). Defaults to 'apso'.
- * @param defaults Default configuration values (used by `rc`).
- * @returns The unified configuration (entities, relationships, rootFolder).
- * @throws Error if the config file cannot be found, is invalid, or migration fails.
- */
-export declare const loadConfig: (appName?: string, defaults?: {}) => UnifiedConfig;
 export {};