endpoints-sdk-cli 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.2.0](https://github.com/matsuri-tech/endpoints-sdk-cli/compare/v2.1.3...v2.2.0) (2022-01-10)
+
+
+### Features
+
+* make it work with repositories whose main branch is not master ([574c1e8](https://github.com/matsuri-tech/endpoints-sdk-cli/commit/574c1e8d769cb6402ba32472f602db8a73ed7ec4))
+
+### [2.1.3](https://github.com/matsuri-tech/endpoints-sdk-cli/compare/v2.1.2...v2.1.3) (2020-12-04)
+
+
+### Bug Fixes
+
+* make config.output use relative path instead of absolute path ([5a57c95](https://github.com/matsuri-tech/endpoints-sdk-cli/commit/5a57c95034d685153839b6d05a3ec67b2f2643f9))
+
+### [2.1.2](https://github.com/matsuri-tech/endpoints-sdk-cli/compare/v2.1.1...v2.1.2) (2020-09-10)
+
+
+### Bug Fixes
+
+* make function names camelCase ([8fcd5d2](https://github.com/matsuri-tech/endpoints-sdk-cli/commit/8fcd5d276648b320209c5fae172732f4ebb284db))
+
+### [2.1.1](https://github.com/matsuri-tech/endpoints-sdk-cli/compare/v2.1.0...v2.1.1) (2020-08-20)
+
+
+### Bug Fixes
+
+* replace path.relative with path.resolve ([c125116](https://github.com/matsuri-tech/endpoints-sdk-cli/commit/c125116f2ed2d3e0f1dfb936bd8eee2c7f98e134))
+
 ## [2.1.0](https://github.com/matsuri-tech/endpoints-sdk-cli/compare/v2.0.6...v2.1.0) (2020-07-16)
 
 

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g endpoints-sdk-cli
 $ mes COMMAND
 running command...
 $ mes (-v|--version|version)
-endpoints-sdk-cli/2.1.0 darwin-x64 node-v12.17.0
+endpoints-sdk-cli/2.2.0 darwin-x64 node-v16.6.0
 $ mes --help [COMMAND]
 USAGE
   $ mes COMMAND
@@ -74,7 +74,7 @@ EXAMPLES
   $ mes add https://github.com/[username/repository].git
 ```
 
-_See code: [src/commands/add.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.1.0/src/commands/add.ts)_
+_See code: [src/commands/add.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.2.0/src/commands/add.ts)_
 
 ## `mes help [COMMAND]`
 
@@ -91,7 +91,7 @@ OPTIONS
   --all  see all commands in CLI
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.1.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.0/src/commands/help.ts)_
 
 ## `mes install`
 
@@ -102,7 +102,7 @@ USAGE
   $ mes install
 ```
 
-_See code: [src/commands/install.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.1.0/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.2.0/src/commands/install.ts)_
 
 ## `mes update [SERVICE]`
 
@@ -113,7 +113,7 @@ USAGE
   $ mes update [SERVICE]
 ```
 
-_See code: [src/commands/update.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.1.0/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.2.0/src/commands/update.ts)_
 <!-- commandsstop -->
 
 

package/lib/classes/Config.d.ts

@@ -0,0 +1,20 @@
+export declare class Config {
+    dependencies: {
+        [service: string]: {
+            version: string;
+            repository: string;
+            workspaces?: string[];
+        };
+    };
+    path: string;
+    output: string;
+    environment_identifier: string;
+    constructor();
+    push({ name, path, version, workspace }: {
+        name: string;
+        path: string;
+        version: string;
+        workspace?: string;
+    }): void;
+    publish(): void;
+}

package/lib/classes/Config.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
+const tslib_1 = require("tslib");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+const prettier = tslib_1.__importStar(require("prettier"));
+const unique_1 = require("../utils/unique");
+class Config {
+    constructor() {
+        this.dependencies = {};
+        this.path = 'endpoints.config.json';
+        this.output = fs.existsSync(path.resolve('./src')) ? './src/endpoints/' : './endpoints/';
+        this.environment_identifier = 'process.env.NODE_ENV';
+        if (fs.existsSync(this.path)) {
+            const data = JSON.parse(fs.readFileSync(this.path).toString());
+            if (data.dependencies) {
+                this.dependencies = data.dependencies;
+            }
+            if (data.output) {
+                this.output = data.output;
+            }
+            if (!fs.existsSync(this.output)) {
+                fs.mkdirSync(this.output);
+            }
+            if (data.environment_identifier) {
+                this.environment_identifier = data.environment_identifier;
+            }
+        }
+    }
+    push({ name, path, version, workspace }) {
+        var _a, _b;
+        const workspaces = unique_1.unique([
+            ...(((_b = (_a = this.dependencies) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b.workspaces) || []),
+            workspace,
+        ]).filter((w) => Boolean(w));
+        this.dependencies = Object.assign(Object.assign({}, this.dependencies), { [name]: {
+                version,
+                repository: path,
+                workspaces: workspaces.length > 0 ? workspaces : undefined,
+            } });
+    }
+    publish() {
+        const data = {
+            output: this.output,
+            environment_identifier: this.environment_identifier,
+            dependencies: this.dependencies,
+        };
+        fs.writeFileSync(this.path, prettier.format(JSON.stringify(data, null, 2), { parser: 'json' }));
+    }
+}
+exports.Config = Config;

package/lib/classes/Repository.d.ts

@@ -0,0 +1,38 @@
+export interface Env {
+    local: string;
+    dev: string;
+    prod: string;
+    [key: string]: string;
+}
+export interface Endpoint {
+    path: string;
+    desc: string;
+}
+export interface Api {
+    [endpoint: string]: Endpoint;
+}
+export interface Period {
+    env: Env;
+    api: Api;
+}
+export interface Data {
+    [version: string]: Period;
+}
+export declare class Repository {
+    name: string;
+    path: string;
+    cache: string;
+    hash: string;
+    data: Data;
+    constructor(str: string);
+    clone({ version, workspace }: {
+        version?: string;
+        workspace?: string;
+    }): void;
+    private checkout;
+    private revParse;
+    private reset;
+    clean(): void;
+    private inferPath;
+    private getName;
+}

package/lib/classes/Repository.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Repository = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const child_process_1 = require("child_process");
+const fs = tslib_1.__importStar(require("fs"));
+const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+class Repository {
+    constructor(str) {
+        this.hash = 'latest';
+        this.data = {};
+        this.path = this.inferPath(str);
+        this.name = this.getName();
+        this.cache = path.resolve(`./node_modules/.endpoints-tmp/${Math.random().toString(36).slice(-8)}`);
+    }
+    clone({ version, workspace = '' }) {
+        child_process_1.execSync(`git clone --no-checkout --quiet ${this.path} ${this.cache}`);
+        this.reset(version);
+        this.hash = this.revParse();
+        this.data = this.checkout(workspace);
+    }
+    checkout(workspace) {
+        const file = path.resolve(this.cache, workspace, '.endpoints.json');
+        const mainBranch = child_process_1.execSync(`cd ${this.cache}; git rev-parse --abbrev-ref origin/HEAD`).toString().trim();
+        child_process_1.execSync(`cd ${this.cache}; git checkout ${mainBranch} -- ${file}`);
+        return JSON.parse(fs.readFileSync(file).toString());
+    }
+    revParse() {
+        const hash = child_process_1.execSync(`cd ${this.cache}; git rev-parse HEAD`)
+            .toString()
+            .trim();
+        return hash;
+    }
+    reset(version) {
+        if (version && version !== 'latest') {
+            child_process_1.execSync(`cd ${this.cache}; git reset --hard ${version}`);
+        }
+    }
+    clean() {
+        rimraf_1.default.sync(this.cache);
+    }
+    inferPath(str) {
+        if (str.startsWith('https://') ||
+            str.startsWith('git@') ||
+            str.startsWith('/')) {
+            return str;
+        }
+        if (str.startsWith('./')) {
+            return path.resolve(str);
+        }
+        return `git@github.com:${str}.git`;
+    }
+    getName() {
+        const splits = this.path.split('/');
+        const name = splits[splits.length - 1].split(/\./)[0];
+        return name;
+    }
+}
+exports.Repository = Repository;

package/lib/commands/add.js

@@ -1,43 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Config_1 = require("../classes/Config");
 const command_1 = require("@oclif/command");
-const fs_1 = require("fs");
 const color_1 = require("@oclif/color");
-const makeEndpointsSourceFromRepository_1 = require("../parts/makeEndpointsSourceFromRepository");
-const makeEndpointsFiles_1 = require("../parts/makeEndpointsFiles");
-const inferRepository_1 = require("../utils/inferRepository");
-const extractServiceNameFromPath_1 = require("../utils/extractServiceNameFromPath");
-const constants_1 = require("../constants");
-const updateConfigFile_1 = require("../utils/updateConfigFile");
+const Repository_1 = require("../classes/Repository");
+const makeFiles_1 = require("../makeFiles");
 class Add extends command_1.Command {
     async run() {
-        const { flags, args } = this.parse(Add);
-        const repository = inferRepository_1.inferRepository(args.repository);
-        const repository_name = extractServiceNameFromPath_1.extractServiceNameFromPath(repository);
-        const { getEndpointsSourceFromRepository, cleanEndpointsSourceFromRepository, } = makeEndpointsSourceFromRepository_1.makeEndpointsSourceFromRepository();
+        const { flags: { version, workspace }, args } = this.parse(Add);
+        const repository = new Repository_1.Repository(args.repository);
         try {
-            const { hash, data } = getEndpointsSourceFromRepository({
-                repository,
-                version: flags.version,
-                workspace: flags.version,
+            repository.clone({ version, workspace });
+            const config = new Config_1.Config();
+            makeFiles_1.makeFiles({ repository, config, workspace });
+            config.push({
+                name: repository.name,
+                path: repository.path,
+                version: version || repository.hash,
+                workspace,
             });
-            const config = fs_1.existsSync(constants_1.CONFIG_FILE) ?
-                JSON.parse(fs_1.readFileSync(constants_1.CONFIG_FILE).toString()) :
-                { dependencies: {} };
-            makeEndpointsFiles_1.makeEndpointsFiles({ workspace: flags.workspace, data, config, repository_name });
-            updateConfigFile_1.updateConfigFile(config, {
-                service: repository_name,
-                repository,
-                workspace: flags.workspace,
-                version: flags.version || hash,
-            });
-            this.log(`${color_1.color.green('success')}: ${repository_name} updated!`);
+            config.publish();
+            this.log(`${color_1.color.green('success')}: ${repository.name} updated!`);
         }
         catch (error) {
-            this.error(color_1.color.red(error.message));
+            this.error(color_1.color.red(error.stack));
         }
         finally {
-            cleanEndpointsSourceFromRepository();
+            repository.clean();
         }
     }
 }

package/lib/commands/install.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Config_1 = require("../classes/Config");
 const command_1 = require("@oclif/command");
 const color_1 = require("@oclif/color");
-const makeEndpointsSourceFromRepository_1 = require("../parts/makeEndpointsSourceFromRepository");
-const getConfig_1 = require("../utils/getConfig");
-const makeEndpointsFiles_1 = require("../parts/makeEndpointsFiles");
+const Repository_1 = require("../classes/Repository");
+const makeFiles_1 = require("../makeFiles");
 class Install extends command_1.Command {
     async run() {
-        const { getEndpointsSourceFromRepository, cleanEndpointsSourceFromRepository } = makeEndpointsSourceFromRepository_1.makeEndpointsSourceFromRepository();
+        const repositories = [];
         try {
-            const config = getConfig_1.getConfig();
+            const config = new Config_1.Config();
             if (!config.dependencies) {
                 throw new Error('Dependencies property of the endpoints.config.json does not exist. Use the add command to add dependencies before installing');
             }
-            // eslint-disable-next-line array-callback-return
-            Object.entries(config.dependencies).map(([repository_name, { version, repository, workspaces = [''] }]) => {
-                // eslint-disable-next-line array-callback-return
-                workspaces.map(workspace => {
-                    const { data } = getEndpointsSourceFromRepository({ repository, version, workspace });
-                    makeEndpointsFiles_1.makeEndpointsFiles({ workspace, data, repository_name, config });
+            Object.values(config.dependencies).forEach(({ repository: path, version, workspaces = [''] }) => {
+                workspaces.forEach(workspace => {
+                    const repository = new Repository_1.Repository(path);
+                    repositories.push(repository);
+                    repository.clone({ version, workspace });
+                    makeFiles_1.makeFiles({ repository, workspace, config });
                 });
             });
         }
@@ -26,7 +26,9 @@ class Install extends command_1.Command {
             this.error(color_1.color.red(error.message));
         }
         finally {
-            cleanEndpointsSourceFromRepository();
+            repositories.forEach(repository => {
+                repository.clean();
+            });
         }
     }
 }

package/lib/commands/update.js

@@ -1,41 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Repository_1 = require("../classes/Repository");
+const Config_1 = require("../classes/Config");
 const command_1 = require("@oclif/command");
 const color_1 = require("@oclif/color");
-const getConfig_1 = require("../utils/getConfig");
-const makeEndpointsSourceFromRepository_1 = require("../parts/makeEndpointsSourceFromRepository");
-const makeEndpointsFiles_1 = require("../parts/makeEndpointsFiles");
-const updateConfigFile_1 = require("../utils/updateConfigFile");
+const makeFiles_1 = require("../makeFiles");
 class Update extends command_1.Command {
     async run() {
         const { args } = this.parse(Update);
-        const { getEndpointsSourceFromRepository, cleanEndpointsSourceFromRepository } = makeEndpointsSourceFromRepository_1.makeEndpointsSourceFromRepository();
+        const repositories = [];
         try {
-            const config = getConfig_1.getConfig();
+            const config = new Config_1.Config();
             if (!config.dependencies) {
                 throw new Error('Dependencies property of the endpoints.config.json does not exist. Use the add command to add dependencies before installing');
             }
             if (!(args.service in config.dependencies)) {
                 throw new Error('The service does not exist in the dependency. Check dependencies property of the endpoints.config.json. Or use the add command to add dependencies before installing');
             }
-            const { repository, version, workspaces = [''] } = config.dependencies[args.service];
-            // eslint-disable-next-line array-callback-return
-            workspaces.map(workspace => {
-                const { hash, data } = getEndpointsSourceFromRepository({ repository, workspace });
-                makeEndpointsFiles_1.makeEndpointsFiles({ data, workspace, repository_name: args.service, config });
-                updateConfigFile_1.updateConfigFile(config, {
-                    service: args.service,
-                    version: version === 'latest' ? 'latest' : hash,
-                    repository,
+            const { repository: path, version, workspaces = [''] } = config.dependencies[args.service];
+            workspaces.forEach(workspace => {
+                const repository = new Repository_1.Repository(path);
+                repository.clone({ version, workspace });
+                makeFiles_1.makeFiles({ repository, config, workspace });
+                config.push({
+                    name: repository.name,
+                    path: repository.path,
+                    version: version || repository.hash,
                     workspace,
                 });
+                repositories.push(repository);
             });
+            config.publish();
         }
         catch (error) {
             this.error(color_1.color.red(error.message));
         }
         finally {
-            cleanEndpointsSourceFromRepository();
+            repositories.forEach(repository => {
+                repository.clean();
+            });
         }
     }
 }

package/lib/endpoints/m2m-core.d.ts

@@ -0,0 +1,4 @@
+import * as v1 from "./m2m-core.v1";
+export declare const m2mCore: {
+    v1: typeof v1;
+};

package/lib/endpoints/m2m-core.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.m2mCore = void 0;
+const tslib_1 = require("tslib");
+/* eslint-disable */
+const v1 = tslib_1.__importStar(require("./m2m-core.v1"));
+exports.m2mCore = { v1 };