@jumentix/cli-init 0.0.0

package/dist/sources/resolve.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printPlanSummary = exports.resolveSources = void 0;
+const types_1 = require("./types");
+const messages_1 = require("./messages");
+const validate_1 = require("./validate");
+const planBuilder_1 = require("./planBuilder");
+const catalog_1 = require("./catalog");
+const designerExport_1 = require("./designerExport");
+const oas_1 = require("./oas");
+const preset_1 = require("./preset");
+function buildDefaults(options) {
+    return {
+        http: (0, planBuilder_1.parseHttp)(options.http),
+        realtime: (0, planBuilder_1.parseRealtime)(options.realtime),
+        db: (0, planBuilder_1.parseDb)(options.db),
+        mode: options.mode,
+        frontend: options.frontend,
+        offline: options.offline
+    };
+}
+/**
+ * Resolve `--from` / `--preset` into a validated GenerationPlan.
+ * When `--from` is omitted, defaults to `--preset users`.
+ */
+async function resolveSources(options = {}) {
+    const defaults = buildDefaults(options);
+    const from = String(options.from || '').trim();
+    let plan;
+    if (from) {
+        if ((0, oas_1.isHttpUrl)(from)) {
+            plan = await (0, catalog_1.loadCatalogSource)(from, defaults, options.fetchImpl);
+        }
+        else {
+            const doc = (0, oas_1.readLocalDocument)(from);
+            if ((0, oas_1.isDesignerExport)(doc)) {
+                plan = await (0, designerExport_1.loadDesignerExportSource)(from, defaults);
+            }
+            else if ((0, oas_1.isOpenApiDocument)(doc)) {
+                plan = await (0, oas_1.loadOasSource)(from, defaults);
+            }
+            else {
+                throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.INVALID_FROM(from));
+            }
+        }
+    }
+    else {
+        const preset = String(options.preset || 'users').trim() || 'users';
+        plan = await (0, preset_1.loadPresetSource)(preset, defaults, options.presetPath);
+    }
+    (0, validate_1.validateGenerationPlan)(plan);
+    return plan;
+}
+exports.resolveSources = resolveSources;
+function printPlanSummary(plan, log) {
+    log('GenerationPlan resolved:');
+    log(`  mode: ${plan.mode}`);
+    log(`  services: ${plan.services.map((s) => `${s.id}(${s.kind})`).join(', ')}`);
+    log(`  domains: ${plan.domains.map((d) => `${d.name || d.id}[${d.entities.map((e) => e.name).join('|')}]`).join(', ')}`);
+    log(`  contracts.oasPerService: ${Object.keys(plan.contracts.oasPerService).join(', ') || '(none)'}`);
+    if (plan.frontend) {
+        log(`  frontend.modules: ${plan.frontend.modules.join(', ')} offline=${plan.frontend.offline}`);
+    }
+}
+exports.printPlanSummary = printPlanSummary;
+//# sourceMappingURL=resolve.js.map

package/dist/sources/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/sources/resolve.ts"],"names":[],"mappings":"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"}

package/dist/sources/types.d.ts

@@ -0,0 +1,82 @@
+/**
+ * Normalized generation input produced by every source loader (JUM-846).
+ * Persisted into `.jumentix/project.json` by workspace assembly (JUM-849).
+ */
+export type GenerationMode = 'monolith' | 'services' | 'hybrid' | 'frontend';
+export type ServiceKind = 'core' | 'domain';
+export type HttpInterface = 'express' | 'fastify' | 'restify';
+export type RealtimeInterface = 'none' | 'websocket' | 'grpc';
+export type DbChoice = 'sqlite' | 'postgres' | 'mysql' | 'mongo' | 'inmemory';
+export type EntityRelation = {
+    name: string;
+    entity: string;
+    match?: string;
+    display?: string;
+    kind?: string;
+    /** Owning property name when the relation is declared on a field. */
+    field?: string;
+};
+export type EntityOperation = {
+    operationId: string;
+    method: string;
+    path: string;
+    summary?: string;
+};
+export type PlanEntity = {
+    name: string;
+    schema: Record<string, unknown>;
+    primaryKey: string;
+    relations: EntityRelation[];
+    operations: EntityOperation[];
+};
+export type PlanDomain = {
+    id: string;
+    name?: string;
+    entities: PlanEntity[];
+};
+export type PlanService = {
+    id: string;
+    kind: ServiceKind;
+    url?: string;
+    domains: string[];
+    interfaces: {
+        http: HttpInterface;
+        realtime: RealtimeInterface;
+    };
+    db: DbChoice;
+};
+export type GenerationPlan = {
+    mode: GenerationMode;
+    services: PlanService[];
+    domains: PlanDomain[];
+    frontend?: {
+        modules: string[];
+        offline: boolean;
+    };
+    contracts: {
+        oasPerService: Record<string, Record<string, unknown>>;
+        asyncapi?: Record<string, unknown>;
+    };
+};
+export type SourceResolveOptions = {
+    from?: string;
+    preset?: string;
+    mode?: string;
+    http?: string;
+    realtime?: string;
+    db?: string;
+    frontend?: boolean;
+    offline?: boolean;
+    /** Override fetch for catalog URLs (tests). */
+    fetchImpl?: typeof fetch;
+    /** Override Users preset OAS path (tests). */
+    presetPath?: string;
+};
+export declare const ALLOWED_HTTP: readonly HttpInterface[];
+export declare const ALLOWED_REALTIME: readonly RealtimeInterface[];
+export declare const ALLOWED_DB: readonly DbChoice[];
+export declare const ALLOWED_MODES: readonly GenerationMode[];
+export declare class SourceResolutionError extends Error {
+    readonly exitCode = 1;
+    constructor(message: string);
+}

package/dist/sources/types.js

@@ -0,0 +1,20 @@
+"use strict";
+/**
+ * Normalized generation input produced by every source loader (JUM-846).
+ * Persisted into `.jumentix/project.json` by workspace assembly (JUM-849).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SourceResolutionError = exports.ALLOWED_MODES = exports.ALLOWED_DB = exports.ALLOWED_REALTIME = exports.ALLOWED_HTTP = void 0;
+exports.ALLOWED_HTTP = ['express', 'fastify', 'restify'];
+exports.ALLOWED_REALTIME = ['none', 'websocket', 'grpc'];
+exports.ALLOWED_DB = ['sqlite', 'postgres', 'mysql', 'mongo', 'inmemory'];
+exports.ALLOWED_MODES = ['monolith', 'services', 'hybrid', 'frontend'];
+class SourceResolutionError extends Error {
+    exitCode = 1;
+    constructor(message) {
+        super(message);
+        this.name = 'SourceResolutionError';
+    }
+}
+exports.SourceResolutionError = SourceResolutionError;
+//# sourceMappingURL=types.js.map

package/dist/sources/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/sources/types.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAoFU,QAAA,YAAY,GAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAC3E,QAAA,gBAAgB,GAAiC,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;AAC/E,QAAA,UAAU,GAAwB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACvF,QAAA,aAAa,GAA8B,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAEvG,MAAa,qBAAsB,SAAQ,KAAK;IACrC,QAAQ,GAAG,CAAC,CAAC;IAEtB,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AAPD,sDAOC"}

package/dist/sources/validate.d.ts

@@ -0,0 +1,5 @@
+import { type GenerationPlan } from './types';
+/**
+ * Fail closed with named messages (exit code 1 via SourceResolutionError).
+ */
+export declare function validateGenerationPlan(plan: GenerationPlan): void;

package/dist/sources/validate.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateGenerationPlan = void 0;
+const types_1 = require("./types");
+const messages_1 = require("./messages");
+function serviceIdForDomain(services, domainId) {
+    const owner = services.find((service) => service.domains.includes(domainId));
+    return owner?.id;
+}
+function entityServiceMap(plan) {
+    const map = new Map();
+    for (const domain of plan.domains) {
+        const serviceId = serviceIdForDomain(plan.services, domain.id) || plan.services[0]?.id;
+        for (const entity of domain.entities) {
+            if (serviceId)
+                map.set(entity.name, serviceId);
+        }
+    }
+    return map;
+}
+/**
+ * Fail closed with named messages (exit code 1 via SourceResolutionError).
+ */
+function validateGenerationPlan(plan) {
+    const hasCore = plan.services.some((service) => service.kind === 'core');
+    if (!hasCore) {
+        throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.NO_CORE_SERVICE);
+    }
+    const seenEntities = new Map();
+    for (const domain of plan.domains) {
+        for (const entity of domain.entities) {
+            if (!entity.primaryKey || !String(entity.primaryKey).trim()) {
+                throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.ENTITY_WITHOUT_PRIMARY_KEY(entity.name, domain.id));
+            }
+            const priorDomain = seenEntities.get(entity.name);
+            if (priorDomain && priorDomain !== domain.id) {
+                throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.DUPLICATE_ENTITY_NAMES(entity.name, priorDomain, domain.id));
+            }
+            seenEntities.set(entity.name, domain.id);
+        }
+    }
+    for (const service of plan.services) {
+        if (!types_1.ALLOWED_HTTP.includes(service.interfaces.http)) {
+            throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.UNSUPPORTED_INTERFACE(service.id, 'http', String(service.interfaces.http)));
+        }
+        if (!types_1.ALLOWED_REALTIME.includes(service.interfaces.realtime)) {
+            throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.UNSUPPORTED_INTERFACE(service.id, 'realtime', String(service.interfaces.realtime)));
+        }
+    }
+    if (plan.mode === 'monolith') {
+        const entityServices = entityServiceMap(plan);
+        for (const domain of plan.domains) {
+            for (const entity of domain.entities) {
+                const fromService = entityServices.get(entity.name);
+                for (const relation of entity.relations) {
+                    const toService = entityServices.get(relation.entity);
+                    if (fromService && toService && fromService !== toService) {
+                        throw new types_1.SourceResolutionError(messages_1.SOURCE_MESSAGES.RELATION_CROSSING_BOUNDARY(relation.name || `${entity.name}->${relation.entity}`, fromService, toService));
+                    }
+                }
+            }
+        }
+    }
+}
+exports.validateGenerationPlan = validateGenerationPlan;
+//# sourceMappingURL=validate.js.map

package/dist/sources/validate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/sources/validate.ts"],"names":[],"mappings":"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"}

package/dist/upgrade/threeWay.d.ts

@@ -0,0 +1,39 @@
+export type UpgradeFileStatus = 'updated' | 'conflicted' | 'skipped' | 'added' | 'removed';
+export type UpgradeFileResult = {
+    path: string;
+    status: UpgradeFileStatus;
+    content: string | null;
+};
+export type UpgradeReport = {
+    updated: string[];
+    conflicted: string[];
+    skipped: string[];
+    added: string[];
+    removed: string[];
+};
+export declare function sha256Text(content: string): string;
+/**
+ * Three-way merge via `git merge-file -p`. Returns conflict markers when edits
+ * overlap. Falls back to a labeled two-way conflict block when git is missing.
+ */
+export declare function threeWayMerge(base: string, ours: string, theirs: string): {
+    content: string;
+    conflicted: boolean;
+};
+/**
+ * Classify and (optionally) merge one path using manifest baseline hash vs
+ * current bytes vs incoming template bytes.
+ */
+export declare function planFileUpgrade(input: {
+    relPath: string;
+    baseHash: string | undefined;
+    baseContent: string | null;
+    oursContent: string | null;
+    theirsContent: string | null;
+}): UpgradeFileResult;
+export declare function summarizeResults(results: UpgradeFileResult[]): UpgradeReport;
+export declare function formatUpgradeReportMarkdown(input: {
+    cliVersion: string;
+    dryRun: boolean;
+    report: UpgradeReport;
+}): string;

package/dist/upgrade/threeWay.js

@@ -0,0 +1,165 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatUpgradeReportMarkdown = exports.summarizeResults = exports.planFileUpgrade = exports.threeWayMerge = exports.sha256Text = void 0;
+const node_child_process_1 = require("node:child_process");
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
+function sha256Text(content) {
+    return node_crypto_1.default.createHash('sha256').update(content).digest('hex');
+}
+exports.sha256Text = sha256Text;
+/**
+ * Three-way merge via `git merge-file -p`. Returns conflict markers when edits
+ * overlap. Falls back to a labeled two-way conflict block when git is missing.
+ */
+function threeWayMerge(base, ours, theirs) {
+    const dir = node_fs_1.default.mkdtempSync(node_path_1.default.join(node_os_1.default.tmpdir(), 'jumentix-merge-'));
+    try {
+        const basePath = node_path_1.default.join(dir, 'base');
+        const oursPath = node_path_1.default.join(dir, 'ours');
+        const theirsPath = node_path_1.default.join(dir, 'theirs');
+        node_fs_1.default.writeFileSync(basePath, base, 'utf8');
+        node_fs_1.default.writeFileSync(oursPath, ours, 'utf8');
+        node_fs_1.default.writeFileSync(theirsPath, theirs, 'utf8');
+        const result = (0, node_child_process_1.spawnSync)('/usr/bin/git', [
+            'merge-file',
+            '-p',
+            '-L',
+            'current',
+            '-L',
+            'base',
+            '-L',
+            'template',
+            oursPath,
+            basePath,
+            theirsPath
+        ], { encoding: 'utf8' });
+        if (result.error || result.status === null) {
+            return {
+                content: [
+                    '<<<<<<< current',
+                    ours.replace(/\n$/, ''),
+                    '=======',
+                    theirs.replace(/\n$/, ''),
+                    '>>>>>>> template',
+                    ''
+                ].join('\n'),
+                conflicted: true
+            };
+        }
+        return {
+            content: result.stdout ?? '',
+            conflicted: (result.status ?? 1) > 0
+        };
+    }
+    finally {
+        node_fs_1.default.rmSync(dir, { recursive: true, force: true });
+    }
+}
+exports.threeWayMerge = threeWayMerge;
+/**
+ * Classify and (optionally) merge one path using manifest baseline hash vs
+ * current bytes vs incoming template bytes.
+ */
+function planFileUpgrade(input) {
+    const { relPath, baseHash, baseContent, oursContent, theirsContent } = input;
+    if (theirsContent === null && oursContent === null) {
+        return { path: relPath, status: 'skipped', content: null };
+    }
+    if (theirsContent === null && oursContent !== null) {
+        // Template no longer emits this path — report, keep user file.
+        return { path: relPath, status: 'removed', content: oursContent };
+    }
+    if (theirsContent !== null && oursContent === null) {
+        return { path: relPath, status: 'added', content: theirsContent };
+    }
+    const ours = oursContent;
+    const theirs = theirsContent;
+    const oursHash = sha256Text(ours);
+    const theirsHash = sha256Text(theirs);
+    const recorded = baseHash || '';
+    const userEdited = Boolean(recorded) && oursHash !== recorded;
+    const templateChanged = !recorded || theirsHash !== recorded;
+    if (!userEdited && !templateChanged) {
+        return { path: relPath, status: 'skipped', content: ours };
+    }
+    if (!userEdited && templateChanged) {
+        return { path: relPath, status: 'updated', content: theirs };
+    }
+    if (userEdited && !templateChanged) {
+        return { path: relPath, status: 'skipped', content: ours };
+    }
+    // Both changed → three-way merge when baseline content is available.
+    let base = null;
+    if (baseContent !== null) {
+        base = baseContent;
+    }
+    else if (recorded && oursHash === recorded) {
+        base = ours;
+    }
+    if (base === null) {
+        const conflicted = threeWayMerge('', ours, theirs);
+        return {
+            path: relPath,
+            status: 'conflicted',
+            content: conflicted.content
+        };
+    }
+    if (sha256Text(base) === theirsHash) {
+        return { path: relPath, status: 'skipped', content: ours };
+    }
+    if (sha256Text(base) === oursHash) {
+        return { path: relPath, status: 'updated', content: theirs };
+    }
+    const merged = threeWayMerge(base, ours, theirs);
+    return {
+        path: relPath,
+        status: merged.conflicted ? 'conflicted' : 'updated',
+        content: merged.content
+    };
+}
+exports.planFileUpgrade = planFileUpgrade;
+function summarizeResults(results) {
+    const report = {
+        updated: [],
+        conflicted: [],
+        skipped: [],
+        added: [],
+        removed: []
+    };
+    for (const entry of results) {
+        report[entry.status].push(entry.path);
+    }
+    for (const key of Object.keys(report)) {
+        report[key].sort((left, right) => left.localeCompare(right));
+    }
+    return report;
+}
+exports.summarizeResults = summarizeResults;
+function formatUpgradeReportMarkdown(input) {
+    const { cliVersion, dryRun, report } = input;
+    const section = (title, files) => [
+        `## ${title} (${files.length})`,
+        '',
+        ...(files.length === 0 ? ['_(none)_', ''] : files.map((file) => `- \`${file}\``).concat(['']))
+    ];
+    return [
+        `# jumentix upgrade report (${cliVersion})`,
+        '',
+        dryRun ? '_Dry run — no files were written._' : '_Applied to the working tree._',
+        '',
+        ...section('Updated', report.updated),
+        ...section('Conflicted', report.conflicted),
+        ...section('Skipped', report.skipped),
+        ...section('Added', report.added),
+        ...section('Removed (kept on disk)', report.removed),
+        ''
+    ].join('\n');
+}
+exports.formatUpgradeReportMarkdown = formatUpgradeReportMarkdown;
+//# sourceMappingURL=threeWay.js.map

package/dist/upgrade/threeWay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"threeWay.js","sourceRoot":"","sources":["../../src/upgrade/threeWay.ts"],"names":[],"mappings":"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"}

package/fixtures/designer-export.json

@@ -0,0 +1,163 @@
+{
+  "kind": "service-management-suite",
+  "version": "2.0.0",
+  "domains": [
+    {
+      "id": "domain-users",
+      "name": "Users",
+      "color": "#4F46E5",
+      "x": 120,
+      "y": 90,
+      "entities": [
+        {
+          "id": "entity-user",
+          "name": "User",
+          "x": 14,
+          "y": 14,
+          "fields": [
+            {
+              "name": "id",
+              "type": "string",
+              "format": "uuid",
+              "required": true,
+              "pk": true,
+              "fk": false,
+              "unique": true,
+              "indexed": false,
+              "nullable": false
+            },
+            {
+              "name": "username",
+              "type": "string",
+              "required": true,
+              "pk": false,
+              "fk": false,
+              "unique": true,
+              "indexed": false,
+              "nullable": false
+            },
+            {
+              "name": "organizationId",
+              "type": "string",
+              "format": "uuid",
+              "required": false,
+              "pk": false,
+              "fk": true,
+              "unique": false,
+              "indexed": false,
+              "nullable": true
+            }
+          ],
+          "meta": {
+            "aggregateRoot": true,
+            "invariants": [],
+            "rbac": {
+              "list": { "roles": ["admin"], "tenantScoped": true },
+              "getById": { "roles": ["admin"], "tenantScoped": true },
+              "create": { "roles": ["admin"], "tenantScoped": true },
+              "update": { "roles": ["admin"], "tenantScoped": true },
+              "delete": { "roles": ["admin"], "tenantScoped": true }
+            },
+            "contracts": [],
+            "oasComposition": { "mode": "", "refs": "", "externalRefs": "", "discriminator": "" }
+          }
+        },
+        {
+          "id": "entity-org",
+          "name": "Organization",
+          "x": 220,
+          "y": 14,
+          "fields": [
+            {
+              "name": "id",
+              "type": "string",
+              "format": "uuid",
+              "required": true,
+              "pk": true,
+              "fk": false,
+              "unique": true,
+              "indexed": false,
+              "nullable": false
+            },
+            {
+              "name": "name",
+              "type": "string",
+              "required": true,
+              "pk": false,
+              "fk": false,
+              "unique": true,
+              "indexed": false,
+              "nullable": false
+            }
+          ],
+          "meta": {
+            "aggregateRoot": true,
+            "invariants": [],
+            "rbac": {
+              "list": { "roles": ["admin"], "tenantScoped": false },
+              "getById": { "roles": ["admin"], "tenantScoped": false },
+              "create": { "roles": ["admin"], "tenantScoped": false },
+              "update": { "roles": ["admin"], "tenantScoped": false },
+              "delete": { "roles": ["admin"], "tenantScoped": false }
+            },
+            "contracts": [],
+            "oasComposition": { "mode": "", "refs": "", "externalRefs": "", "discriminator": "" }
+          }
+        }
+      ]
+    }
+  ],
+  "relationships": [
+    {
+      "id": "rel-user-org",
+      "name": "UserBelongsToOrganization",
+      "fromEntityId": "entity-user",
+      "toEntityId": "entity-org",
+      "fromCardinality": "many",
+      "toCardinality": "one"
+    }
+  ],
+  "interfaces": [
+    {
+      "type": "http-rest",
+      "framework": "express",
+      "entrypoint": "src/http.ts",
+      "controller": "UsersHttp"
+    }
+  ],
+  "serviceConfiguration": {
+    "serviceKind": "rest-api",
+    "runMode": "local",
+    "cloudProvider": "",
+    "staticAssetsPath": "public",
+    "ports": { "rest": 3000, "websocket": 3001, "grpc": 50051 }
+  },
+  "runtimeEnvironment": {
+    "environment": "dev",
+    "fileName": ".env.dev"
+  },
+  "codeWorkspace": { "files": {}, "activePath": "" },
+  "deployments": [],
+  "architecture": {
+    "services": [
+      {
+        "id": "core",
+        "name": "Core",
+        "kind": "core",
+        "url": "http://localhost:3000/api/1.0.0",
+        "domains": ["domain-users"],
+        "deployTargetId": "",
+        "x": 80,
+        "y": 80,
+        "width": 280,
+        "height": 200
+      }
+    ],
+    "links": []
+  },
+  "view": {
+    "zoom": 1,
+    "panX": 0,
+    "panY": 0
+  }
+}

package/fixtures/invalid-duplicate-entity.yml

@@ -0,0 +1,28 @@
+openapi: 3.1.0
+info:
+  title: Invalid — duplicate entity names
+  version: 1.0.0
+x-services:
+  - id: core
+    name: Core
+    kind: core
+components:
+  schemas:
+    UsersUser:
+      type: object
+      x-primary-key: id
+      x-domain: Users
+      x-entity: User
+      x-service: core
+      properties:
+        id:
+          type: string
+    BillingUser:
+      type: object
+      x-primary-key: id
+      x-domain: Billing
+      x-entity: User
+      x-service: core
+      properties:
+        id:
+          type: string