@apso/cli 0.8.6 → 0.10.1

package/dist/commands/schema/validate.js

@@ -0,0 +1,90 @@
+"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");
+const services_1 = require("../../lib/api/services");
+const apsorc_parser_1 = require("../../lib/apsorc-parser");
+const schema_convert_1 = require("../../lib/utils/schema-convert");
+class SchemaValidate extends base_command_1.default {
+    async run() {
+        var _a;
+        const { flags } = await this.parse(SchemaValidate);
+        // Parse .apsorc
+        let parsed;
+        try {
+            parsed = (0, apsorc_parser_1.parseApsorc)();
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            this.error(`Failed to parse .apsorc: ${msg}`);
+        }
+        // Convert to platform schema format
+        const schema = (0, schema_convert_1.apsorcToServiceSchema)(parsed);
+        // Count stats
+        const entityCount = schema.entities.length;
+        let fieldCount = 0;
+        let relationshipCount = 0;
+        for (const entity of schema.entities) {
+            fieldCount += entity.fields.length;
+            relationshipCount += ((_a = entity.relationships) === null || _a === void 0 ? void 0 : _a.length) || 0;
+        }
+        // Local validation
+        const errors = [];
+        for (const entity of schema.entities) {
+            if (!entity.name || entity.name.trim() === "") {
+                errors.push("Entity found with empty name");
+            }
+            if (entity.relationships) {
+                for (const rel of entity.relationships) {
+                    const targetExists = schema.entities.some((e) => e.name === rel.target);
+                    if (!targetExists) {
+                        errors.push(`Entity "${entity.name}": relationship target "${rel.target}" does not reference an existing entity`);
+                    }
+                }
+            }
+        }
+        // Server validation if linked and not --local
+        const isLinked = config_1.projectLink.exists();
+        const isAuthenticated = config_1.credentials.isValid();
+        if (!flags.local && isLinked && isAuthenticated) {
+            const link = config_1.projectLink.read();
+            try {
+                const result = await services_1.schemaApi.validate(link.workspaceSlug, link.serviceSlug, schema);
+                if (!result.valid) {
+                    errors.push(...result.errors);
+                }
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                this.warn(`Server validation failed: ${msg}`);
+            }
+        }
+        // Print results
+        this.log(`Schema: ${entityCount} entities, ${fieldCount} fields, ${relationshipCount} relationships`);
+        if (errors.length > 0) {
+            this.log("");
+            this.log("Errors:");
+            for (const err of errors) {
+                this.log(`  - ${err}`);
+            }
+            this.error(`Validation failed with ${errors.length} error(s).`);
+        }
+        else {
+            this.log("Validation passed.");
+        }
+    }
+}
+SchemaValidate.description = "Validate the local .apsorc schema";
+SchemaValidate.examples = [
+    `$ apso schema validate`,
+    `$ apso schema validate --local`,
+];
+SchemaValidate.flags = {
+    local: core_1.Flags.boolean({
+        description: "Skip server validation even if linked",
+        default: false,
+    }),
+};
+exports.default = SchemaValidate;

package/dist/commands/server/new.d.ts

@@ -1,25 +1,8 @@
 import BaseCommand from "../../lib/base-command";
-import { TargetLanguage } from "../../lib/types";
 export default class New extends BaseCommand {
+    static hidden: boolean;
     static description: string;
     static examples: string[];
-    private CURR_DIR;
-    static flags: {
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        type: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        language: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    static args: {
-        name: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
-    };
-    installModules(projectPath: string): Promise<void>;
-    formatApp(projectPath: string): Promise<void>;
-    startApp(projectPath: string): Promise<void>;
-    cloneTemplate(projectPath: string, language: TargetLanguage): Promise<void>;
-    validateFlags(): Promise<{
-        projectName: string;
-        apiType: string;
-        language: TargetLanguage;
-    }>;
+    static strict: boolean;
     run(): Promise<void>;
 }

package/dist/commands/server/new.js

@@ -1,201 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const child_process_1 = require("child_process");
-const fs = tslib_1.__importStar(require("fs"));
-const shelljs_1 = tslib_1.__importDefault(require("shelljs"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const base_command_1 = tslib_1.__importDefault(require("../../lib/base-command"));
-const path = tslib_1.__importStar(require("path"));
-const TEMPLATE_REPOS = {
-    typescript: "https://github.com/apsoai/service-template.git",
-    python: "https://github.com/apsoai/service-template-python.git",
-    go: "https://github.com/apsoai/service-template-go.git",
-};
-const PROJECT_NAME_PATTERN = /^[A-Za-z][\w-]*$/;
 class New extends base_command_1.default {
-    constructor() {
-        super(...arguments);
-        this.CURR_DIR = process.cwd();
-    }
-    async installModules(projectPath) {
-        this.log("Installing modules...");
-        await this.runNpmCommand(["install", "--force", "--prefix", projectPath]);
-    }
-    async formatApp(projectPath) {
-        this.log("Formatting code...");
-        shelljs_1.default.cd(projectPath);
-        await this.runNpmCommand(["run", "format", "--prefix", projectPath]);
-    }
-    async startApp(projectPath) {
-        return new Promise((resolve, reject) => {
-            const isWindows = process.platform === "win32";
-            const command = isWindows ? "npm.cmd" : "npm";
-            const args = ["start"];
-            const child = (0, child_process_1.spawn)(command, args, {
-                cwd: projectPath,
-                stdio: "inherit",
-                shell: isWindows,
-            });
-            child.on("close", (code) => {
-                if (code !== 0) {
-                    reject({
-                        command: `${command} ${args.join(" ")}`,
-                    });
-                    return;
-                }
-                resolve();
-            });
-            child.on("error", (err) => {
-                this.log(`Error starting app: ${err.message}`);
-                reject(err);
-            });
-        });
-    }
-    async cloneTemplate(projectPath, language) {
-        const repoUrl = TEMPLATE_REPOS[language];
-        this.log(`Cloning ${language} service template...`);
-        // Create directory if it doesn't exist
-        if (fs.existsSync(projectPath)) {
-            this.error(`Directory already exists: ${projectPath}`);
-        }
-        else {
-            try {
-                fs.mkdirSync(projectPath, { recursive: true });
-            }
-            catch (error) {
-                this.error(`Failed to create directory: ${error.message}`);
-            }
-        }
-        // Use quoted paths to prevent command injection
-        const cloneResult = shelljs_1.default.exec(`git clone --depth=1 --branch=main "${repoUrl}" "${projectPath}"`, { silent: true });
-        // Check if the command failed
-        if (cloneResult.code !== 0) {
-            // Clean up the failed directory
-            shelljs_1.default.rm("-rf", projectPath);
-            this.error(`Failed to clone the template repository from GitHub.\n` +
-                `Error Output:\n${cloneResult.stderr}\n\n` +
-                `Please check your network connection and ensure the repository exists at ${repoUrl}`);
-        }
-        // If clone was successful, proceed to remove the .git directory using safe shelljs method
-        shelljs_1.default.rm("-rf", path.join(projectPath, ".git"));
-    }
-    async validateFlags() {
-        var _a;
-        const { flags } = await this.parse(New);
-        let projectName = flags.name;
-        let apiType = (_a = flags.type) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-        let language = flags.language;
-        // Prompt for project name if not provided
-        if (!projectName) {
-            const response = await inquirer_1.default.prompt([
-                {
-                    type: "input",
-                    name: "projectName",
-                    message: "Enter your project name:",
-                    validate: (input) => {
-                        if (!input.trim()) {
-                            return "Project name is required";
-                        }
-                        if (!PROJECT_NAME_PATTERN.test(input)) {
-                            return "Project name must start with a letter and contain only letters, numbers, hyphens, and underscores";
-                        }
-                        return true;
-                    },
-                },
-            ]);
-            projectName = response.projectName;
-        }
-        // Validate project name format (security: prevent command injection and path traversal)
-        if (!projectName || !PROJECT_NAME_PATTERN.test(projectName)) {
-            this.error("Project name must start with a letter and contain only letters, numbers, hyphens, and underscores");
-        }
-        if (!apiType) {
-            apiType = "rest";
-        }
-        if (!["rest", "graphql"].includes(apiType)) {
-            this.error("`apiType` must be 'rest' or 'graphql'");
-        }
-        // Prompt for language if not provided
-        if (!language) {
-            const response = await inquirer_1.default.prompt([
-                {
-                    type: "list",
-                    name: "language",
-                    message: "Select your target language:",
-                    choices: [
-                        { name: "TypeScript", value: "typescript" },
-                        { name: "Python", value: "python" },
-                        { name: "Go", value: "go" },
-                    ],
-                    default: "typescript",
-                },
-            ]);
-            language = response.language;
-        }
-        return { projectName: projectName, apiType, language };
-    }
     async run() {
-        // Check for required dependencies
-        if (!shelljs_1.default.which("git")) {
-            this.error("git is required but not found. Please install git and try again.");
-        }
-        this.log("Initializing New Apso Server...");
-        const { projectName, language } = await this.validateFlags();
-        const projectPath = path.join(this.CURR_DIR, projectName);
-        // Validate the resolved path is within current directory (prevent path traversal)
-        const resolvedPath = path.resolve(projectPath);
-        if (!resolvedPath.startsWith(path.resolve(this.CURR_DIR))) {
-            this.error("Invalid project name: path traversal detected");
-        }
-        await this.cloneTemplate(projectPath, language);
-        // Language-specific setup
-        switch (language) {
-            case "typescript": {
-                if (shelljs_1.default.which("npm")) {
-                    await this.installModules(projectPath);
-                    await this.formatApp(projectPath);
-                }
-                else {
-                    this.log("Warning: npm not found. Skipping module installation.");
-                }
-                break;
-            }
-            case "python": {
-                this.log("Python project created. Run 'pip install -e .[dev]' to install dependencies.");
-                break;
-            }
-            case "go": {
-                this.log("Go project created. Run 'go mod tidy' to install dependencies.");
-                break;
-            }
-            // No default
-        }
-        this.log(`\nProject created at ${projectPath}`);
-        this.log(`Language: ${language}`);
+        this.warn('"apso server new" is deprecated. Use "apso init" instead.');
+        await this.config.runCommand("init", this.argv);
     }
 }
-New.description = "Initialize your server project";
-New.examples = [
-    `$ apso server new --name TestProject`,
-    `$ apso server new --name TestProject --language python`,
-    `$ apso server new --name TestProject --language go`,
-];
-New.flags = {
-    name: core_1.Flags.string({
-        char: "n",
-        description: "name of application",
-    }),
-    type: core_1.Flags.string({
-        char: "t",
-        description: "api type (rest or graphql)",
-    }),
-    language: core_1.Flags.string({
-        char: "l",
-        description: "target language (typescript, python, go)",
-        options: ["typescript", "python", "go"],
-    }),
-};
-New.args = { name: core_1.Args.string() };
+New.hidden = true;
+New.description = "[Deprecated] Use 'apso init' instead";
+New.examples = [`$ apso init`];
+New.strict = false;
 exports.default = New;

package/dist/commands/server/scaffold.d.ts

@@ -1,31 +1,8 @@
-import { Entity, RelationshipMap } from "../../lib";
 import BaseCommand from "../../lib/base-command";
 export default class Scaffold extends BaseCommand {
+    static hidden: boolean;
     static description: string;
     static examples: string[];
-    static flags: {
-        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        "skip-format": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        language: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    static args: {};
-    scaffoldServer(options: {
-        dir: string;
-        entity: Entity;
-        relationshipMap: RelationshipMap;
-        apiType: string;
-        allEntities: Entity[];
-    }): Promise<void>;
-    setupRestFiles(dir: string, entity: Entity, relationshipMap: RelationshipMap, apiType: string, allEntities: Entity[]): Promise<void>;
-    setupGraphqlFiles(dir: string, entity: Entity, relationshipMap: RelationshipMap): Promise<void>;
+    static strict: boolean;
     run(): Promise<void>;
-    /**
-     * Scaffolds TypeScript code using the existing code path (for backward compatibility)
-     */
-    private scaffoldTypeScript;
-    /**
-     * Scaffolds code using the new generator system (for Python, Go, and future languages)
-     * Note: Sequential file operations are intentional to provide progress feedback
-     */
-    private scaffoldWithGenerator;
 }