@contrail/flexplm 1.7.0-alpha.71b4d30 → 1.7.0

package/lib/cli/commands/{config-file/create.d.ts → create.d.ts}

@@ -1,4 +1,5 @@
 export declare class CreateCommand {
+    private prompt;
     private findTemplate;
     run(): Promise<void>;
 }

package/lib/cli/commands/{mapping-file/create.js → create.js}

@@ -26,14 +26,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateCommand = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const prompts_1 = require("../shared/prompts");
+const readline = __importStar(require("readline"));
 const TEMPLATE_FILENAME = 'mapping-template.ts.template';
 const PLACEHOLDER = '<ORG_NAME>';
 class CreateCommand {
+    prompt(question) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        const onSigint = () => {
+            rl.close();
+            process.stdout.write('\n');
+            process.exit(130);
+        };
+        process.once('SIGINT', onSigint);
+        return new Promise((resolve) => {
+            rl.question(question, (answer) => {
+                process.removeListener('SIGINT', onSigint);
+                rl.close();
+                resolve(answer);
+            });
+        });
+    }
     findTemplate() {
         const candidates = [
-            path.join(__dirname, '..', '..', 'template', TEMPLATE_FILENAME),
-            path.join(__dirname, '..', '..', '..', '..', 'src', 'cli', 'template', TEMPLATE_FILENAME),
+            path.join(__dirname, '..', 'template', TEMPLATE_FILENAME),
+            path.join(__dirname, '..', '..', '..', 'src', 'cli', 'template', TEMPLATE_FILENAME),
         ];
         for (const candidate of candidates) {
             if (fs.existsSync(candidate)) {
@@ -43,7 +59,7 @@ class CreateCommand {
         throw new Error(`Could not locate ${TEMPLATE_FILENAME}. Tried:\n  ${candidates.join('\n  ')}`);
     }
     async run() {
-        const orgName = (await (0, prompts_1.prompt)('orgName: ')).trim();
+        const orgName = (await this.prompt('orgName: ')).trim();
         if (!orgName) {
             throw new Error('orgName is required');
         }

package/lib/cli/commands/{mapping-file/create.spec.js → create.spec.js}

@@ -34,7 +34,7 @@ jest.mock('readline', () => ({
     }),
 }));
 const create_1 = require("./create");
-describe('runCreate (mapping-file)', () => {
+describe('runCreate', () => {
     let tempDir;
     let originalCwd;
     let logSpy;

package/lib/cli/commands/upload.d.ts

@@ -0,0 +1,19 @@
+interface UploadOptions {
+    filePath: string;
+    message?: string;
+    branch?: string;
+    skipGit: boolean;
+    updateConfig: boolean;
+}
+export declare class UploadCommand {
+    static parseArgs(args: string[]): UploadOptions;
+    static buildCommitMessage(userMessage: string, fileId: string): string;
+    private prompt;
+    private promptHidden;
+    private runGit;
+    private tryRunGit;
+    private commitToGit;
+    run(args: string[]): Promise<void>;
+    private setTransformMapFileOnAppOrg;
+}
+export {};

package/lib/cli/commands/upload.js

@@ -0,0 +1,254 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadCommand = void 0;
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const readline = __importStar(require("readline"));
+const sdk_1 = require("@contrail/sdk");
+const compile_1 = require("./compile");
+class UploadCommand {
+    static parseArgs(args) {
+        let filePath;
+        let message;
+        let branch;
+        let skipGit = false;
+        let updateConfig = false;
+        for (let i = 0; i < args.length; i++) {
+            const a = args[i];
+            if (a === '-m') {
+                message = args[++i];
+                if (message === undefined) {
+                    throw new Error('-m requires a commit message argument');
+                }
+            }
+            else if (a === '-b') {
+                branch = args[++i];
+                if (branch === undefined) {
+                    throw new Error('-b requires a branch name argument');
+                }
+            }
+            else if (a === '--skip-git' || a === '--skipGit') {
+                skipGit = true;
+            }
+            else if (a === '--update-config') {
+                updateConfig = true;
+            }
+            else if (a.startsWith('-')) {
+                throw new Error(`Unknown option: ${a}`);
+            }
+            else if (!filePath) {
+                filePath = a;
+            }
+            else {
+                throw new Error(`Unexpected argument: ${a}`);
+            }
+        }
+        if (!filePath) {
+            throw new Error('upload: missing <path.ts> argument');
+        }
+        return { filePath, message, branch, skipGit, updateConfig };
+    }
+    static buildCommitMessage(userMessage, fileId) {
+        const lines = userMessage.split(/\r?\n/);
+        lines[0] = `${lines[0]} [fileId: ${fileId}]`;
+        return lines.join('\n');
+    }
+    prompt(question) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        return new Promise((resolve) => {
+            rl.question(question, (answer) => {
+                rl.close();
+                resolve(answer.trim());
+            });
+        });
+    }
+    promptHidden(question) {
+        return new Promise((resolve) => {
+            const rl = readline.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
+            const rlAny = rl;
+            rlAny._writeToOutput = (str) => {
+                if (str.includes(question)) {
+                    rlAny.output.write(str);
+                }
+            };
+            rl.question(question, (answer) => {
+                rl.close();
+                process.stdout.write('\n');
+                resolve(answer);
+            });
+        });
+    }
+    runGit(args, cwd) {
+        return (0, child_process_1.execFileSync)('git', args, { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+    }
+    tryRunGit(args, cwd) {
+        try {
+            const stdout = this.runGit(args, cwd);
+            return { ok: true, stdout, stderr: '' };
+        }
+        catch (err) {
+            return {
+                ok: false,
+                stdout: err && err.stdout ? err.stdout.toString() : '',
+                stderr: err && err.stderr ? err.stderr.toString() : (err && err.message) || '',
+            };
+        }
+    }
+    async commitToGit(absPaths, fileId, options) {
+        const repoDir = path.dirname(absPaths[0]);
+        const relPaths = absPaths.map((p) => path.basename(p));
+        const versionCheck = this.tryRunGit(['--version'], repoDir);
+        if (!versionCheck.ok) {
+            console.log('git command not available; skipping git commit.');
+            return;
+        }
+        const insideRepo = this.tryRunGit(['rev-parse', '--is-inside-work-tree'], repoDir);
+        if (!insideRepo.ok || insideRepo.stdout.trim() !== 'true') {
+            console.log(`Not inside a git working tree (${repoDir}); skipping git commit.`);
+            return;
+        }
+        for (const relPath of relPaths) {
+            const tracked = this.tryRunGit(['ls-files', '--error-unmatch', relPath], repoDir);
+            if (!tracked.ok) {
+                const answer = (await this.prompt(`File is not tracked by git: ${relPath}\nAdd it to git? (Y/n): `)).toLowerCase();
+                if (answer === 'n' || answer === 'no') {
+                    console.log('Nothing was done in git.');
+                    return;
+                }
+            }
+        }
+        if (options.branch) {
+            const branchResult = this.tryRunGit(['checkout', '-b', options.branch], repoDir);
+            if (!branchResult.ok) {
+                throw new Error(`Failed to create branch "${options.branch}": ${branchResult.stderr.trim()}`);
+            }
+            console.log(`Created and switched to branch "${options.branch}"`);
+        }
+        let message = options.message;
+        if (!message) {
+            message = await this.prompt('Commit message: ');
+            if (!message) {
+                throw new Error('A commit message is required');
+            }
+        }
+        const finalMessage = UploadCommand.buildCommitMessage(message, fileId);
+        const addResult = this.tryRunGit(['add', '--', ...relPaths], repoDir);
+        if (!addResult.ok) {
+            throw new Error(`git add failed: ${addResult.stderr.trim()}`);
+        }
+        const commitResult = this.tryRunGit(['commit', '-m', finalMessage, '--', ...relPaths], repoDir);
+        if (!commitResult.ok) {
+            throw new Error(`git commit failed: ${commitResult.stderr.trim() || commitResult.stdout.trim()}`);
+        }
+        console.log(commitResult.stdout.trim());
+    }
+    async run(args) {
+        const options = UploadCommand.parseArgs(args);
+        const tsAbsPath = path.resolve(process.cwd(), options.filePath);
+        if (!fs.existsSync(tsAbsPath)) {
+            throw new Error(`File not found: ${tsAbsPath}`);
+        }
+        if (!tsAbsPath.endsWith('.ts')) {
+            throw new Error(`Expected a .ts file, got: ${tsAbsPath}`);
+        }
+        await new compile_1.CompileCommand().run(tsAbsPath);
+        const absPath = tsAbsPath.replace(/\.ts$/, '.js');
+        if (!fs.existsSync(absPath)) {
+            throw new Error(`Compiled file not found: ${absPath}`);
+        }
+        let email = process.env.CONTRAIL_CLI_EMAIL;
+        let password = process.env.CONTRAIL_CLI_PASSWORD;
+        if (!email) {
+            email = await this.prompt('Email: ');
+        }
+        if (!password) {
+            password = await this.promptHidden('Password: ');
+        }
+        if (!email || !password) {
+            throw new Error('Email and password are required');
+        }
+        delete require.cache[absPath];
+        const loaded = require(absPath);
+        const mapping = loaded && loaded.mapping;
+        if (!mapping || !mapping.orgInfo) {
+            throw new Error(`Mapping file is missing "mapping.orgInfo" export: ${absPath}`);
+        }
+        const { orgName, appIdentifier } = mapping.orgInfo;
+        if (!orgName) {
+            throw new Error(`Mapping file is missing "mapping.orgInfo.orgName": ${absPath}`);
+        }
+        if (!appIdentifier) {
+            throw new Error(`Mapping file is missing "mapping.orgInfo.appIdentifier": ${absPath}`);
+        }
+        await (0, sdk_1.login)({ orgSlug: orgName, email, password });
+        console.log(`Logged in to org "${orgName}" as ${email}`);
+        const apps = await new sdk_1.Entities().get({
+            entityName: 'app',
+            criteria: { identifier: appIdentifier },
+        });
+        if (!apps || apps.length !== 1) {
+            throw new Error(`Expected exactly one app with identifier "${appIdentifier}" in org "${orgName}", found ${apps ? apps.length : 0}`);
+        }
+        const app = apps[0];
+        const buffer = fs.readFileSync(absPath);
+        const fileName = path.basename(absPath);
+        const fileOwner = `app:${app.id}`;
+        const uploadedFile = await new sdk_1.Files().createAndUploadFileFromBuffer(buffer, 'application/javascript', fileName, fileOwner);
+        const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+        const responsePath = `${absPath}.uploaded-${timestamp}.json`;
+        fs.writeFileSync(responsePath, JSON.stringify(uploadedFile, null, 2), 'utf8');
+        console.log(`Wrote response to ${responsePath}`);
+        console.log(`FILE ID: ${uploadedFile.id}`);
+        if (!options.skipGit) {
+            await this.commitToGit([tsAbsPath, absPath], uploadedFile.id, options);
+        }
+        if (options.updateConfig) {
+            await this.setTransformMapFileOnAppOrg(app.id, appIdentifier, orgName, uploadedFile.id);
+        }
+    }
+    async setTransformMapFileOnAppOrg(appId, appIdentifier, orgName, fileId) {
+        const appOrgs = await new sdk_1.Entities().get({
+            entityName: 'app-org',
+            criteria: { appId },
+        });
+        if (!appOrgs || appOrgs.length === 0) {
+            throw new Error(`Failed to set the file onto the app config for "${appIdentifier}" because it is not installed in org "${orgName}". Install it via the admin console before using --update-config. You can paste the uploaded file's ID into the app config without needing to re-run this command.`);
+        }
+        if (appOrgs.length > 1) {
+            throw new Error(`Failed to set the file onto the app config for "${appIdentifier}" in org "${orgName}" because ${appOrgs.length} installations were identified. Expected one. Please contact customer support for assistance.`);
+        }
+        const appOrg = appOrgs[0];
+        const nextAppConfig = { ...(appOrg.appConfig || {}), transformMapFile: fileId };
+        await new sdk_1.Entities().update({
+            entityName: 'app-org',
+            id: appOrg.id,
+            object: { appConfig: nextAppConfig },
+        });
+        console.log(`Successfully set "appConfig.transformMapFile" for installed "${appIdentifier}" to new FILE ID: "${fileId}" on org "${orgName}"`);
+    }
+}
+exports.UploadCommand = UploadCommand;

package/lib/cli/commands/upload.spec.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('@contrail/sdk', () => ({
+    Entities: jest.fn(),
+    Files: jest.fn(),
+    login: jest.fn(),
+}));
+const upload_1 = require("./upload");
+describe('UploadCommand.parseArgs', () => {
+    it('parses a bare file path', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts']);
+        expect(opts).toEqual({
+            filePath: 'mapping.ts',
+            message: undefined,
+            branch: undefined,
+            skipGit: false,
+            updateConfig: false,
+        });
+    });
+    it('parses -m commit message option', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '-m', 'my message']);
+        expect(opts.message).toEqual('my message');
+        expect(opts.skipGit).toBe(false);
+    });
+    it('parses -b branch option', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '-b', 'feature/x']);
+        expect(opts.branch).toEqual('feature/x');
+    });
+    it('parses --skip-git flag', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '--skip-git']);
+        expect(opts.skipGit).toBe(true);
+    });
+    it('accepts the legacy --skipGit alias', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '--skipGit']);
+        expect(opts.skipGit).toBe(true);
+    });
+    it('parses options before the file path', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['-m', 'msg', '-b', 'br', 'mapping.ts']);
+        expect(opts).toEqual({
+            filePath: 'mapping.ts',
+            message: 'msg',
+            branch: 'br',
+            skipGit: false,
+            updateConfig: false,
+        });
+    });
+    it('parses --update-config flag', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '--update-config']);
+        expect(opts.updateConfig).toBe(true);
+    });
+    it('parses all options together', () => {
+        const opts = upload_1.UploadCommand.parseArgs(['mapping.ts', '-m', 'msg', '-b', 'br', '--skip-git', '--update-config']);
+        expect(opts).toEqual({
+            filePath: 'mapping.ts',
+            message: 'msg',
+            branch: 'br',
+            skipGit: true,
+            updateConfig: true,
+        });
+    });
+    it('throws when -m is missing its value', () => {
+        expect(() => upload_1.UploadCommand.parseArgs(['mapping.ts', '-m'])).toThrow(/-m requires a commit message/);
+    });
+    it('throws when -b is missing its value', () => {
+        expect(() => upload_1.UploadCommand.parseArgs(['mapping.ts', '-b'])).toThrow(/-b requires a branch name/);
+    });
+    it('throws on unknown option', () => {
+        expect(() => upload_1.UploadCommand.parseArgs(['mapping.ts', '--bogus'])).toThrow(/Unknown option: --bogus/);
+    });
+    it('throws when an extra positional argument is supplied', () => {
+        expect(() => upload_1.UploadCommand.parseArgs(['mapping.ts', 'extra.ts'])).toThrow(/Unexpected argument: extra\.ts/);
+    });
+    it('throws when no file path is provided', () => {
+        expect(() => upload_1.UploadCommand.parseArgs([])).toThrow(/missing <path\.ts>/);
+    });
+    it('throws when only options are provided', () => {
+        expect(() => upload_1.UploadCommand.parseArgs(['--skip-git'])).toThrow(/missing <path\.ts>/);
+    });
+});
+describe('UploadCommand.buildCommitMessage', () => {
+    it('appends fileId to the first line of a single-line message', () => {
+        expect(upload_1.UploadCommand.buildCommitMessage('initial commit', 'abc123')).toEqual('initial commit [fileId: abc123]');
+    });
+    it('only appends fileId to the first line of a multi-line message', () => {
+        const result = upload_1.UploadCommand.buildCommitMessage('header line\nbody line 1\nbody line 2', 'xyz');
+        expect(result).toEqual('header line [fileId: xyz]\nbody line 1\nbody line 2');
+    });
+    it('handles CRLF line endings', () => {
+        const result = upload_1.UploadCommand.buildCommitMessage('header\r\nbody', 'fid');
+        expect(result).toEqual('header [fileId: fid]\nbody');
+    });
+    it('handles an empty message', () => {
+        expect(upload_1.UploadCommand.buildCommitMessage('', 'fid')).toEqual(' [fileId: fid]');
+    });
+});

package/lib/cli/index.js

@@ -2,38 +2,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.Cli = void 0;
-const mapping_file_1 = require("./commands/mapping-file");
-const config_file_1 = require("./commands/config-file");
-const USAGE = `Usage: flexplm <topic> <subcommand> [args]
+const create_1 = require("./commands/create");
+const compile_1 = require("./commands/compile");
+const upload_1 = require("./commands/upload");
+const USAGE = `Usage: flexplm-mapping <command> [args]
 
-Topics:
-  mapping-file <create|compile|upload>   Manage transform mapping .ts files
-  config-file  <create|upload>           Manage connector config .json files
+Commands:
+  create                  Scaffold a new mapping .ts file in the current directory
+  compile <path.ts>       Transpile a mapping .ts file to .js alongside it
+  upload  <path.ts> [opts] Compile a mapping .ts file and upload the resulting .js to VibeIQ
 
-Run "flexplm <topic>" for topic-specific help. Examples:
-  flexplm mapping-file
-  flexplm config-file
+Upload options:
+  -m <message>            Git commit message (prompted if omitted)
+  -b <branch>             Create a new git branch before committing
+  --skip-git              Skip the post-upload git commit (default: commit)
+  --update-config         Patch the app-org appConfig.transformMapFile with the uploaded file ID without needing to paste into the admin console
+
+Environment (upload):
+  CONTRAIL_CLI_EMAIL      VibeIQ user email
+  CONTRAIL_CLI_PASSWORD   VibeIQ user password
 `;
 class Cli {
     async main() {
-        const [, , topic, subcommand, ...rest] = process.argv;
-        switch (topic) {
-            case 'mapping-file':
-                await (0, mapping_file_1.runMappingFile)(subcommand, rest);
+        const [, , command, ...rest] = process.argv;
+        switch (command) {
+            case 'create':
+                await new create_1.CreateCommand().run();
+                return;
+            case 'compile':
+                if (!rest[0]) {
+                    console.error('compile: missing <path.ts> argument');
+                    console.error(USAGE);
+                    process.exit(1);
+                }
+                await new compile_1.CompileCommand().run(rest[0]);
                 return;
-            case 'config-file':
-                await (0, config_file_1.runConfigFile)(subcommand, rest);
+            case 'upload':
+                if (!rest[0]) {
+                    console.error('upload: missing <path.ts> argument');
+                    console.error(USAGE);
+                    process.exit(1);
+                }
+                await new upload_1.UploadCommand().run(rest);
                 return;
             case undefined:
             case '-h':
             case '--help':
             case 'help':
                 console.log(USAGE);
-                console.log(mapping_file_1.MAPPING_FILE_USAGE);
-                console.log(config_file_1.CONFIG_FILE_USAGE);
                 return;
             default:
-                console.error(`Unknown topic: ${topic}`);
+                console.error(`Unknown command: ${command}`);
                 console.error(USAGE);
                 process.exit(1);
         }