@apso/cli 0.15.3 → 0.16.1

package/dist/commands/generate.js

@@ -52,6 +52,10 @@ class Generate extends base_command_1.default {
         const autogenPath = path.join(rootPath, "autogen");
         const lowerCaseApiType = apiType.toLowerCase();
         console.log(`[apso] Generating ${language} code for ${entities.length} entities...`);
+        if (entities.length === 0) {
+            console.log("[apso] No entities found in .apsorc — nothing to generate. Check that the file exists and defines an `entities` array.");
+        }
+        let generatedFileCount = 0;
         const generatorConfig = {
             language,
             rootFolder,
@@ -75,6 +79,7 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             await (0, file_system_1.createFile)(fullPath, file.content);
         }
+        generatedFileCount += enumFiles.length;
         // Generate shared query utilities
         const queryUtilFiles = await generator.generateQueryUtils(entities, lowerCaseApiType);
         for (const file of queryUtilFiles) {
@@ -82,6 +87,7 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             await (0, file_system_1.createFile)(fullPath, file.content);
         }
+        generatedFileCount += queryUtilFiles.length;
         // Generate per-entity files
         for (const entity of entities) {
             console.log(`[apso] Building... ${entity.name}`);
@@ -128,6 +134,7 @@ class Generate extends base_command_1.default {
                     const fullPath = path.join(autogenPath, file.path);
                     // eslint-disable-next-line no-await-in-loop
                     await (0, file_system_1.createFile)(fullPath, file.content);
+                    generatedFileCount += 1;
                 }
             }
             const entityBuildTime = perf_hooks_1.performance.now() - entityBuildStart;
@@ -140,6 +147,7 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             await (0, file_system_1.createFile)(fullPath, file.content);
         }
+        generatedFileCount += guardFiles.length;
         // Generate index module
         const indexFiles = await generator.generateIndexModule(entities, lowerCaseApiType);
         for (const file of indexFiles) {
@@ -147,17 +155,25 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             await (0, file_system_1.createFile)(fullPath, file.content);
         }
-        // Format generated files (TypeScript only)
-        if (language === "typescript" && !skipFormat) {
+        generatedFileCount += indexFiles.length;
+        // Format generated files (TypeScript only).
+        // Run prettier directly against the generated output directory so we never
+        // reformat hand-written code elsewhere in the project tree (the project's
+        // `npm run format` script targets a broad glob like `{src,test}/**/*.ts`).
+        if (language === "typescript" && !skipFormat && generatedFileCount > 0) {
             const formatStart = perf_hooks_1.performance.now();
-            console.log("[apso] Formatting files...");
-            await this.runNpmCommand(["run", "format", "src/autogen/**/*.ts", "src/guards/**/*.ts"], true);
+            console.log("[apso] Formatting generated files...");
+            const formatGlob = path.join(autogenPath, "**", "*.ts");
+            await this.runCommand("npx", ["prettier", "--write", formatGlob], true);
             const formatTime = perf_hooks_1.performance.now() - formatStart;
             console.log(`[apso] Finished formatting in ${formatTime.toFixed(2)} ms`);
         }
         else if (skipFormat) {
             console.log("[apso] Skipping formatting (--skip-format flag set)");
         }
+        else if (generatedFileCount === 0) {
+            console.log("[apso] Skipping formatting (no files were generated)");
+        }
         const totalBuildTime = perf_hooks_1.performance.now() - totalBuildStart;
         console.log(`[apso] Finished building all entities in ${totalBuildTime.toFixed(2)} ms`);
     }

package/dist/commands/mcp/serve.js

@@ -851,8 +851,8 @@ function validateSchemaObject(schema) {
     }
     const validFieldTypes = [
         "text", "string", "varchar", "integer", "float", "decimal", "numeric",
-        "boolean", "date", "timestamp", "datetime", "uuid", "enum", "json",
-        "json-plain", "array",
+        "boolean", "date", "timestamptz", "timestamp", "datetime", "uuid", "enum",
+        "json", "json-plain", "array",
     ];
     const validRelTypes = ["OneToMany", "ManyToOne", "ManyToMany", "OneToOne"];
     const entityNames = new Set();

package/dist/lib/base-command.d.ts

@@ -1,4 +1,5 @@
 import { Command } from "@oclif/core";
 export default abstract class BaseCommand extends Command {
+    runCommand(command: string, args: string[], silent?: boolean): Promise<void>;
     runNpmCommand(args: string[], silent?: boolean): Promise<void>;
 }

package/dist/lib/base-command.js

@@ -5,14 +5,14 @@ const core_1 = require("@oclif/core");
 const child_process_1 = require("child_process");
 const os_1 = tslib_1.__importDefault(require("os"));
 class BaseCommand extends core_1.Command {
-    async runNpmCommand(args, silent = false) {
+    async runCommand(command, args, silent = false) {
         return new Promise((resolve, reject) => {
             const isWindows = os_1.default.platform() === "win32";
-            const command = isWindows ? "npm.cmd" : "npm";
+            const resolvedCommand = isWindows ? `${command}.cmd` : command;
             const stdio = silent ? "ignore" : "inherit";
-            const cmdStr = `${command} ${args.join(" ")}`;
+            const cmdStr = `${resolvedCommand} ${args.join(" ")}`;
             this.log(`Running: ${cmdStr}`);
-            const child = (0, child_process_1.spawn)(command, args, {
+            const child = (0, child_process_1.spawn)(resolvedCommand, args, {
                 stdio,
                 shell: isWindows,
             });
@@ -28,5 +28,8 @@ class BaseCommand extends core_1.Command {
             });
         });
     }
+    async runNpmCommand(args, silent = false) {
+        return this.runCommand("npm", args, silent);
+    }
 }
 exports.default = BaseCommand;

package/dist/lib/doctor/checks.js

@@ -133,7 +133,7 @@ function checkFieldTypeMismatch(ctx) {
                     severity: "error",
                     message: `Entity "${entity.name}", field "${field.name}": type "${field.type}" is not recognized by the generator`,
                     entity: entity.name,
-                    suggestion: `Valid types: text, integer, float, decimal, numeric, boolean, date, enum, json, json-plain, array, uuid`,
+                    suggestion: `Valid types: text, integer, float, decimal, numeric, boolean, date, timestamptz, timestamp, datetime, enum, json, json-plain, array, uuid`,
                 });
             }
             // Enum fields must have values

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

@@ -1,4 +1,4 @@
-export type FieldType = "text" | "boolean" | "array" | "enum" | "integer" | "float" | "decimal" | "numeric" | "date" | "json" | "json-plain";
+export type FieldType = "text" | "boolean" | "array" | "enum" | "integer" | "float" | "decimal" | "numeric" | "date" | "timestamptz" | "timestamp" | "datetime" | "json" | "json-plain";
 export interface Field {
     name: string;
     type: FieldType;

package/dist/lib/utils/field.js

@@ -28,6 +28,7 @@ exports.fieldTypeToColumnType = {
     date: "date",
     timestamp: "timestamp",
     timestamptz: "timestamptz",
+    datetime: "timestamp",
     time: "time",
     timetz: "timetz",
     json: "json",
@@ -66,6 +67,8 @@ const fieldTypeNormalizationMap = {
     "time with time zone": "timetz",
     "timestamp without time zone": "timestamp",
     "timestamp with time zone": "timestamptz",
+    // `datetime` is a user-facing alias for a naive timestamp (instant-in-time).
+    datetime: "timestamp",
 };
 /**
  * Normalize a field type to its template-compatible name.
@@ -102,6 +105,7 @@ const typeToJsType = {
     date: "string",
     timestamp: "string",
     timestamptz: "string",
+    datetime: "string",
     timetz: "string",
     tsvector: "string",
     string: "string",

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.15.3",
+  "version": "0.16.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.15.3",
+      "version": "0.16.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@electric-sql/pglite": "^0.2.17",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.15.3",
+  "version": "0.16.1",
   "commands": {
     "config": {
       "id": "config",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.15.3",
+  "version": "0.16.1",
   "mcpName": "io.github.apsoai/apso",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",