@factorialco/fcode-cli 2.4.0 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@factorialco/fcode-cli",
-  "version": "2.4.0",
+  "version": "3.1.0",
   "packageManager": "pnpm@11.7.0",
   "description": "Factorial Code Command Line Interface",
   "homepage": "https://code.factorialhr.com/docs/cli/",
@@ -33,6 +33,7 @@
     "@oclif/core": "^4.0.37",
     "@oclif/plugin-help": "^6.2.36",
     "chalk": "^4.1.2",
+    "diff": "^5.2.0",
     "dotenv": "^16.4.7",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
@@ -53,6 +54,7 @@
     "@oclif/test": "^4.1.15",
     "@types/chai": "^4.3.20",
     "@types/cli-table": "^0.3.4",
+    "@types/diff": "^5.2.3",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.21",
     "@types/mocha": "^10.0.10",
@@ -103,8 +105,8 @@
       "variables": {
         "description": "Manage variables resources"
       },
-      "settings": {
-        "description": "Manage CLI settings"
+      "config": {
+        "description": "Manage CLI configuration"
       },
       "dependencies": {
         "description": "Manage dependencies resources"
@@ -112,16 +114,19 @@
       "remote": {
         "description": "Manage remote team workspaces"
       },
-      "team": {
-        "description": "Manage team settings (timezone, error handler, inheritance) and team versions",
+      "settings": {
+        "description": "Manage workspace settings (timezone, error handler, inheritance) and workspace versions",
         "subtopics": {
           "versions": {
-            "description": "Manage team versions across every owned process and module"
+            "description": "Manage workspace versions across every owned process and module"
           },
           "aliases": {
-            "description": "Manage team version aliases (e.g. production)"
+            "description": "Manage workspace version aliases (e.g. production)"
           }
         }
+      },
+      "team": {
+        "description": "Work with every App your development team owns, in one folder"
       }
     }
   },

package/dist/repositories/team.d.ts

@@ -1,41 +0,0 @@
-import { RawTeamSettings, Team, TeamVersion, TeamVersionAlias } from '../core/types';
-import WorkspaceConfig from '../config/workspace';
-/**
- * Reads/writes the singleton team.json (timezone, error handler, inheritance, webhook auth) at the
- * workspace root. Unlike collection resources this is not a ResourceRepositoryBase:
- * there is exactly one team, so there is no slug-keyed collection to manage.
- *
- * team.json references the error-handler process by slug for portability; the cloud
- * references it by id, so this repository resolves slug<->id against the tracked
- * process metadata in .fcode/.
- */
-export default class TeamRepository {
-    protected workspaceConfig: WorkspaceConfig;
-    exists(): boolean;
-    find(): Promise<Team>;
-    save(team: Team): void;
-    /** Builds a Team from the cloud's raw settings, resolving the error-handler id to a slug. */
-    fromRaw(raw: RawTeamSettings): Promise<Team>;
-    /**
-     * Writes the cloud's team versions and aliases into the Team as the team.json versioning
-     * fields (sorted for stable git diffs). Cloud entries always carry a createdAt; only
-     * hand-added local entries lack one, and those never pass through here.
-     */
-    applyCloudVersioning(team: Team, versions: TeamVersion[], aliases: TeamVersionAlias[]): void;
-    resolveSlugToId(processSlug: string): Promise<string>;
-    resolveIdToSlug(processId: string): Promise<string>;
-    private parseErrorHandler;
-    /**
-     * team.json is hand-edited to declare versions, so entries without a tag are dropped and a
-     * duplicated tag keeps its first entry (a tag names one immutable snapshot).
-     */
-    private parseVersions;
-    /**
-     * An alias is a name->tag pointer; entries missing either half are dropped and a duplicated
-     * name keeps its first entry.
-     */
-    private parseAliases;
-    /** A configuration without a variable key is meaningless, so it is read as absent. */
-    private parseWebhookAuth;
-    private toFile;
-}

package/dist/repositories/team.js

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs-extra");
-const types_1 = require("../core/types");
-const workspace_1 = require("../config/workspace");
-const file_utils_1 = require("../utils/file-utils");
-const TEAM_FILENAME = 'team.json';
-/**
- * Reads/writes the singleton team.json (timezone, error handler, inheritance, webhook auth) at the
- * workspace root. Unlike collection resources this is not a ResourceRepositoryBase:
- * there is exactly one team, so there is no slug-keyed collection to manage.
- *
- * team.json references the error-handler process by slug for portability; the cloud
- * references it by id, so this repository resolves slug<->id against the tracked
- * process metadata in .fcode/.
- */
-class TeamRepository {
-    constructor() {
-        this.workspaceConfig = new workspace_1.default();
-    }
-    exists() {
-        return fs.pathExistsSync(TEAM_FILENAME);
-    }
-    async find() {
-        const slug = await this.workspaceConfig.getActiveTeamSlug();
-        let raw = {};
-        try {
-            raw = fs.readJsonSync(TEAM_FILENAME) || {};
-        }
-        catch { }
-        const parentTeamSlugs = Array.isArray(raw.parentTeamSlugs) ? raw.parentTeamSlugs : [];
-        const team = new types_1.Team(slug, parentTeamSlugs, raw.zoneId, this.parseErrorHandler(raw.errorHandlerConfig), this.parseWebhookAuth(raw.webhookAuth), typeof raw.primaryLocale === 'string' && raw.primaryLocale.length > 0 ? raw.primaryLocale : undefined);
-        if (Array.isArray(raw.versions)) {
-            team.versions = this.parseVersions(raw.versions);
-        }
-        if (Array.isArray(raw.aliases)) {
-            team.aliases = this.parseAliases(raw.aliases);
-        }
-        return team;
-    }
-    save(team) {
-        (0, file_utils_1.outputFileSyncIfChanged)(TEAM_FILENAME, JSON.stringify(this.toFile(team), null, 2));
-    }
-    /** Builds a Team from the cloud's raw settings, resolving the error-handler id to a slug. */
-    async fromRaw(raw) {
-        let errorHandlerConfig;
-        if (raw.errorHandlerConfig?.processId) {
-            errorHandlerConfig = {
-                processSlug: await this.resolveIdToSlug(raw.errorHandlerConfig.processId),
-                tag: raw.errorHandlerConfig.tag ?? null,
-            };
-        }
-        return new types_1.Team(raw.slug, raw.parentTeamSlugs ?? [], raw.zoneId, errorHandlerConfig, this.parseWebhookAuth(raw.webhookAuth), raw.primaryLocale ?? undefined);
-    }
-    /**
-     * Writes the cloud's team versions and aliases into the Team as the team.json versioning
-     * fields (sorted for stable git diffs). Cloud entries always carry a createdAt; only
-     * hand-added local entries lack one, and those never pass through here.
-     */
-    applyCloudVersioning(team, versions, aliases) {
-        team.versions = versions
-            .map((version) => {
-            const entry = { tag: version.tag, createdAt: version.createdAt };
-            if (version.comment) {
-                entry.comment = version.comment;
-            }
-            return entry;
-        })
-            .sort((a, b) => (a.createdAt ?? '').localeCompare(b.createdAt ?? ''));
-        team.aliases = aliases
-            .map((alias) => ({ name: alias.name, tag: alias.tag }))
-            .sort((a, b) => a.name.localeCompare(b.name));
-    }
-    async resolveSlugToId(processSlug) {
-        const { processes } = await this.workspaceConfig.getActiveTeam();
-        return processes[processSlug]?.id ?? processSlug;
-    }
-    async resolveIdToSlug(processId) {
-        const { processes } = await this.workspaceConfig.getActiveTeam();
-        const match = Object.values(processes).find((process) => process.id === processId);
-        return match?.slug ?? processId;
-    }
-    parseErrorHandler(raw) {
-        if (!raw || !raw.processSlug) {
-            return undefined;
-        }
-        return { processSlug: raw.processSlug, tag: raw.tag ?? null };
-    }
-    /**
-     * team.json is hand-edited to declare versions, so entries without a tag are dropped and a
-     * duplicated tag keeps its first entry (a tag names one immutable snapshot).
-     */
-    parseVersions(raw) {
-        const versions = [];
-        for (const candidate of raw) {
-            if (!candidate || typeof candidate.tag !== 'string' || candidate.tag.length === 0) {
-                continue;
-            }
-            if (versions.some(({ tag }) => tag === candidate.tag)) {
-                continue;
-            }
-            const entry = { tag: candidate.tag };
-            if (typeof candidate.comment === 'string' && candidate.comment.length > 0) {
-                entry.comment = candidate.comment;
-            }
-            if (typeof candidate.createdAt === 'string' && candidate.createdAt.length > 0) {
-                entry.createdAt = candidate.createdAt;
-            }
-            versions.push(entry);
-        }
-        return versions;
-    }
-    /**
-     * An alias is a name->tag pointer; entries missing either half are dropped and a duplicated
-     * name keeps its first entry.
-     */
-    parseAliases(raw) {
-        const aliases = [];
-        for (const candidate of raw) {
-            if (!candidate || typeof candidate.name !== 'string' || candidate.name.length === 0) {
-                continue;
-            }
-            if (typeof candidate.tag !== 'string' || candidate.tag.length === 0) {
-                continue;
-            }
-            if (aliases.some(({ name }) => name === candidate.name)) {
-                continue;
-            }
-            aliases.push({ name: candidate.name, tag: candidate.tag });
-        }
-        return aliases;
-    }
-    /** A configuration without a variable key is meaningless, so it is read as absent. */
-    parseWebhookAuth(raw) {
-        if (!raw || typeof raw.variableKey !== 'string' || raw.variableKey.length === 0) {
-            return undefined;
-        }
-        const webhookAuth = { variableKey: raw.variableKey };
-        // The default header is left out so a pull writes the minimal form.
-        if (typeof raw.headerName === 'string' && raw.headerName.length > 0 && raw.headerName !== types_1.DEFAULT_WEBHOOK_AUTH_HEADER) {
-            webhookAuth.headerName = raw.headerName;
-        }
-        return webhookAuth;
-    }
-    toFile(team) {
-        const file = { parentTeamSlugs: team.parentTeamSlugs ?? [] };
-        if (team.zoneId !== undefined) {
-            file.zoneId = team.zoneId;
-        }
-        if (team.errorHandlerConfig !== undefined) {
-            file.errorHandlerConfig = team.errorHandlerConfig;
-        }
-        // Last, so adding webhook auth to an existing team.json is a purely additive diff.
-        if (team.webhookAuth !== undefined) {
-            file.webhookAuth = team.webhookAuth;
-        }
-        if (team.primaryLocale !== undefined) {
-            file.primaryLocale = team.primaryLocale;
-        }
-        // Global versioning fields, appended after the scalar settings.
-        if (team.versions !== undefined) {
-            file.versions = team.versions;
-        }
-        if (team.aliases !== undefined) {
-            file.aliases = team.aliases;
-        }
-        return file;
-    }
-}
-exports.default = TeamRepository;