@apso/cli 0.37.1 → 0.38.4

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

@@ -51,6 +51,24 @@ type ParsedApsorc = {
     coAuthor?: boolean;
 };
 export declare const parseApsorcV1: (apsorc: ApsorcType) => ParsedApsorcData;
+/**
+ * A name in .apsorc that would generate code that does not compile. `code`
+ * matches the apso-client-v2 schema validator (src/lib/ai/validation.ts).
+ */
+export declare class ApsorcNamingError extends Error {
+    code: string;
+    entity: string;
+    field?: string | undefined;
+    constructor(message: string, code: string, entity: string, field?: string | undefined);
+}
+/**
+ * Throws an ApsorcNamingError when .apsorc names would generate code that does
+ * not compile, e.g. a text field `notes` on Contact plus Note ManyToOne
+ * Contact, whose inverse side is `notes: Note[]` on Contact (TS2300 Duplicate
+ * identifier). The client schema validator enforces the same rules; both repos
+ * run test/fixtures/codegen-naming-cases.json, so change them together.
+ */
+export declare const assertCodegenSafeNames: (entities: Entity[], relationshipMap: RelationshipMap) => void;
 export declare const parseApsorcV2: (apsorc: ApsorcType) => ParsedApsorcData;
 export declare const parseApsorc: () => ParsedApsorc;
 /**

package/dist/lib/apsorc-parser.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfigPath = exports.parseApsorc = exports.parseApsorcV2 = exports.parseApsorcV1 = exports.ApiType = void 0;
+exports.findConfigPath = exports.parseApsorc = exports.parseApsorcV2 = exports.assertCodegenSafeNames = exports.ApsorcNamingError = exports.parseApsorcV1 = exports.ApiType = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
 const rc_1 = tslib_1.__importDefault(require("rc"));
 const relationships_1 = require("./utils/relationships");
 const perf_hooks_1 = require("perf_hooks");
+const pluralize_1 = tslib_1.__importDefault(require("pluralize"));
+const casing_1 = require("./utils/casing");
 var ApiType;
 (function (ApiType) {
     ApiType["Graphql"] = "graphql";
@@ -21,9 +23,74 @@ const parseApsorcV1 = (apsorc) => {
     return { entities, relationshipMap };
 };
 exports.parseApsorcV1 = parseApsorcV1;
+/** Valid in TypeScript, Python and Go, so every target language compiles it. */
+const IDENTIFIER = /^[A-Z_a-z]\w*$/;
+/**
+ * A name in .apsorc that would generate code that does not compile. `code`
+ * matches the apso-client-v2 schema validator (src/lib/ai/validation.ts).
+ */
+class ApsorcNamingError extends Error {
+    constructor(message, code, entity, field) {
+        super(message);
+        this.code = code;
+        this.entity = entity;
+        this.field = field;
+        this.name = "ApsorcNamingError";
+    }
+}
+exports.ApsorcNamingError = ApsorcNamingError;
+/**
+ * Throws an ApsorcNamingError when .apsorc names would generate code that does
+ * not compile, e.g. a text field `notes` on Contact plus Note ManyToOne
+ * Contact, whose inverse side is `notes: Note[]` on Contact (TS2300 Duplicate
+ * identifier). The client schema validator enforces the same rules; both repos
+ * run test/fixtures/codegen-naming-cases.json, so change them together.
+ */
+const assertCodegenSafeNames = (entities, relationshipMap) => {
+    const seenEntities = new Set();
+    for (const entity of entities) {
+        if (seenEntities.has(entity.name)) {
+            throw new ApsorcNamingError(`Entity "${entity.name}" is defined more than once. Merge or rename one of them in .apsorc.`, "DUPLICATE_ENTITY_NAME", entity.name);
+        }
+        seenEntities.add(entity.name);
+        if (!IDENTIFIER.test(entity.name)) {
+            throw new ApsorcNamingError(`Entity "${entity.name}" is not a valid name. Use letters, digits and underscores, starting with a letter.`, "INVALID_ENTITY_NAME", entity.name);
+        }
+        const fieldNames = new Set();
+        for (const { name } of entity.fields || []) {
+            if (!IDENTIFIER.test(name)) {
+                throw new ApsorcNamingError(`Field "${name}" on entity "${entity.name}" is not a valid name. Use letters, digits and underscores.`, "INVALID_FIELD_NAME", entity.name, name);
+            }
+            if (fieldNames.has(name)) {
+                throw new ApsorcNamingError(`Entity "${entity.name}" has more than one field named "${name}". Remove or rename one in .apsorc.`, "DUPLICATE_FIELD_NAME", entity.name, name);
+            }
+            fieldNames.add(name);
+        }
+        // Same property names and dedupe key as getRelationshipForTemplate + entity.eta.
+        const generated = new Map();
+        for (const rel of relationshipMap[entity.name] || []) {
+            const base = rel.referenceName || rel.name;
+            const property = (0, casing_1.camelCase)(rel.type === "OneToMany" || rel.type === "ManyToMany"
+                ? (0, pluralize_1.default)(base)
+                : base);
+            const key = `${rel.name}:${rel.referenceName || "default"}`;
+            const desc = `${rel.type} relationship to "${rel.name}"`;
+            if (fieldNames.has(property)) {
+                throw new ApsorcNamingError(`Entity "${entity.name}" has a field "${property}" with the same name as the property generated by its ${desc}. Rename the field in .apsorc.`, "FIELD_RELATIONSHIP_COLLISION", entity.name, property);
+            }
+            const existing = generated.get(property);
+            if (existing && existing.key !== key) {
+                throw new ApsorcNamingError(`Entity "${entity.name}" gets the property "${property}" from both its ${existing.rel} and its ${desc}. Give one of them a different "to_name" in .apsorc.`, "RELATIONSHIP_PROPERTY_CLASH", entity.name, property);
+            }
+            generated.set(property, { key, rel: desc });
+        }
+    }
+};
+exports.assertCodegenSafeNames = assertCodegenSafeNames;
 const parseApsorcV2 = (apsorc) => {
     const { entities, relationships: apsoRelationships } = apsorc;
     const relationshipMap = (0, relationships_1.parseRelationships)(apsoRelationships);
+    (0, exports.assertCodegenSafeNames)(entities, relationshipMap);
     return { entities, relationshipMap };
 };
 exports.parseApsorcV2 = parseApsorcV2;

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

@@ -1,4 +1,6 @@
 import { Command } from "@oclif/core";
+/** True for errors oclif raised deliberately (this.error, this.exit, parse errors). */
+export declare function isUserError(err: unknown): boolean;
 export default abstract class BaseCommand extends Command {
     /**
      * Report failures to Sentry + PostHog before oclif exits. The postrun hook
@@ -7,6 +9,9 @@ export default abstract class BaseCommand extends Command {
     catch(err: Error & {
         exitCode?: number;
         code?: string;
+        oclif?: {
+            exit?: number;
+        };
     }): Promise<any>;
     runCommand(command: string, args: string[], silent?: boolean): Promise<void>;
     runNpmCommand(args: string[], silent?: boolean): Promise<void>;

package/dist/lib/base-command.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUserError = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const child_process_1 = require("child_process");
 const os_1 = tslib_1.__importDefault(require("os"));
 const telemetry_1 = require("./telemetry/telemetry");
+/** True for errors oclif raised deliberately (this.error, this.exit, parse errors). */
+function isUserError(err) {
+    return Boolean(err && typeof err === "object" && "oclif" in err);
+}
+exports.isUserError = isUserError;
 class BaseCommand extends core_1.Command {
     /**
      * Report failures to Sentry + PostHog before oclif exits. The postrun hook
@@ -12,12 +18,20 @@ class BaseCommand extends core_1.Command {
      */
     async catch(err) {
         try {
-            (0, telemetry_1.captureException)(err, { command: this.id });
+            // oclif marks errors it raised on purpose (this.error, this.exit, flag
+            // and arg parse failures) with an `oclif` property. Those are messages
+            // we chose to show the user, e.g. "No entity named X", not crashes, so
+            // they go to PostHog only. Everything else is a real bug for Sentry.
+            const userError = isUserError(err);
+            if (!userError) {
+                (0, telemetry_1.captureException)(err, { command: this.id });
+            }
             (0, telemetry_1.track)("cli_command_failed", {
                 command: this.id,
                 duration_ms: (0, telemetry_1.elapsedMs)(),
                 error: err === null || err === void 0 ? void 0 : err.message,
                 error_code: err === null || err === void 0 ? void 0 : err.code,
+                user_error: userError,
             });
             await (0, telemetry_1.shutdownTelemetry)();
         }

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

@@ -133,6 +133,10 @@ export interface GlobalConfigFile {
      * Whether the first-run telemetry transparency notice has been shown.
      */
     telemetryNoticeShown: boolean;
+    /**
+     * User id this install's anonymous telemetry id was last aliased to.
+     */
+    telemetryAliasedUserId?: string;
 }
 /**
  * Project link stored in .apso/link.json

package/dist/lib/telemetry/telemetry.js

@@ -45,6 +45,9 @@ let enabled = false;
 let sentryOn = false;
 let authenticatedUser = false;
 let distinctId = "cli-anonymous";
+let workspaceId;
+let workspaceSlug;
+let serviceId;
 let environment = "production";
 let startedAt = Date.now();
 let noticePending = false;
@@ -85,7 +88,7 @@ function getOrCreateInstallId(currentInstallId) {
  * when disabled — it just no-ops everything downstream.
  */
 function initTelemetry() {
-    var _a, _b, _c, _d;
+    var _a, _b;
     try {
         startedAt = Date.now();
         const cfg = config_1.globalConfig.read();
@@ -101,14 +104,33 @@ function initTelemetry() {
         noticePending = !cfg.telemetryNoticeShown;
         const creds = config_1.credentials.read();
         authenticatedUser = Boolean((_a = creds === null || creds === void 0 ? void 0 : creds.user) === null || _a === void 0 ? void 0 : _a.id);
-        distinctId = ((_b = creds === null || creds === void 0 ? void 0 : creds.user) === null || _b === void 0 ? void 0 : _b.id) || getOrCreateInstallId(cfg.installId);
+        const installId = getOrCreateInstallId(cfg.installId);
+        // Logged in: the Apso user id (the same distinct id the web app uses), so
+        // CLI and app activity land on one person. No email or name is sent.
+        distinctId = ((_b = creds === null || creds === void 0 ? void 0 : creds.user) === null || _b === void 0 ? void 0 : _b.id) ? String(creds.user.id) : installId;
+        // Workspace context: the linked project (.apso/link.json) wins, else the
+        // workspace chosen with `apso use`.
+        let link = null;
+        try {
+            link = config_1.projectLink.read();
+        }
+        catch {
+            link = null;
+        }
+        workspaceId = (link === null || link === void 0 ? void 0 : link.workspaceId) || cfg.activeWorkspaceId || undefined;
+        workspaceSlug = (link === null || link === void 0 ? void 0 : link.workspaceSlug) || cfg.activeWorkspaceSlug || undefined;
+        serviceId = (link === null || link === void 0 ? void 0 : link.serviceId) || undefined;
         posthog = new posthog_node_1.PostHog(environment === "staging" ? POSTHOG_KEY_STAGING : POSTHOG_KEY_PROD, { host: POSTHOG_HOST, flushAt: 1, flushInterval: 0 });
-        if ((_c = creds === null || creds === void 0 ? void 0 : creds.user) === null || _c === void 0 ? void 0 : _c.email) {
-            // Attach identity so CLI events attribute to the same person as the app.
-            posthog.identify({
-                distinctId,
-                properties: { email: creds.user.email, name: creds.user.name },
-            });
+        // First run after login: merge this install's earlier anonymous events
+        // into the user, once per user.
+        if (authenticatedUser && installId !== distinctId && cfg.telemetryAliasedUserId !== distinctId) {
+            posthog.alias({ distinctId, alias: installId });
+            try {
+                config_1.globalConfig.write({ telemetryAliasedUserId: distinctId });
+            }
+            catch {
+                // ignore — worst case we alias again next run
+            }
         }
         const dsn = process.env.APSO_CLI_SENTRY_DSN || SENTRY_DSN_DEFAULT;
         if (dsn) {
@@ -118,8 +140,12 @@ function initTelemetry() {
                 release: `apso-cli@${cliVersion}`,
                 tracesSampleRate: 0,
             });
-            Sentry.setUser({ id: distinctId, email: (_d = creds === null || creds === void 0 ? void 0 : creds.user) === null || _d === void 0 ? void 0 : _d.email });
+            Sentry.setUser({ id: distinctId });
             Sentry.setTag("cli_version", cliVersion);
+            if (workspaceId)
+                Sentry.setTag("workspace_id", workspaceId);
+            if (serviceId)
+                Sentry.setTag("service_id", serviceId);
             sentryOn = true;
         }
     }
@@ -136,14 +162,18 @@ function commonProps() {
         arch: os_1.default.arch(),
         node_version: process.version,
         authenticated: authenticatedUser,
+        ...(workspaceId ? { workspace_id: workspaceId } : {}),
+        ...(workspaceSlug ? { workspace_slug: workspaceSlug } : {}),
+        ...(serviceId ? { service_id: serviceId } : {}),
     };
 }
 /**
  * The one-time transparency notice text (issue #96). Printed to stderr by the
  * init hook so it never pollutes stdout / piped output.
  */
-exports.FIRST_RUN_NOTICE = "Apso collects anonymous usage data (command name, CLI version, OS) to improve the tool.\n" +
-    "No code, schema, file contents, or personal data is collected.\n" +
+exports.FIRST_RUN_NOTICE = "Apso collects usage data (command name, CLI version, OS) to improve the tool. When you're\n" +
+    "logged in, it's tied to your Apso account id and workspace id. No email, code, schema, or\n" +
+    "file contents are collected.\n" +
     "Opt out any time: apso config set telemetry off  (or APSO_TELEMETRY=0, or DO_NOT_TRACK=1)";
 /**
  * True once per install: telemetry is enabled and the notice hasn't been shown
@@ -173,6 +203,8 @@ function track(event, properties = {}) {
             distinctId,
             event,
             properties: { ...commonProps(), ...properties },
+            // PostHog group analytics: roll activity up per workspace.
+            ...(workspaceId ? { groups: { workspace: workspaceId } } : {}),
         });
     }
     catch {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@apso/cli",
-  "version": "0.37.1",
+  "version": "0.38.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apso/cli",
-      "version": "0.37.1",
+      "version": "0.38.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@biomejs/biome": "^1.9.4",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.37.1",
+  "version": "0.38.4",
   "commands": {
     "config": {
       "id": "config",

package/package.json

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