endpoints-sdk-cli 2.1.2 → 2.3.0

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.2 darwin-x64 node-v12.17.0
+endpoints-sdk-cli/2.3.0 darwin-arm64 node-v18.3.0
 $ mes --help [COMMAND]
 USAGE
   $ mes COMMAND
@@ -49,12 +49,12 @@ DESCRIPTION
   1. make endpoints.config.json for version control.
 
   {
-     "dependencies": {
-       "service-name": {
-         "version": "26177ed7e673daf0cc5a69e9793dd863424d272f",
-         "repository": "git@github.com:[username/repository].git"
-       }
-     }
+    "dependencies": {
+      "service-name": {
+        "version": "26177ed7e673daf0cc5a69e9793dd863424d272f",
+        "repository": "git@github.com:[username/repository].git"
+      }
+    }
   }
 
   > service name is inferred from Repository name.
@@ -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.2/src/commands/add.ts)_
+_See code: [src/commands/add.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.3.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.2.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.3.1/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.2/src/commands/install.ts)_
+_See code: [src/commands/install.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.3.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.2/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/matsuri-tech/endpoints-sdk-cli/blob/v2.3.0/src/commands/update.ts)_
 <!-- commandsstop -->
 
 

package/lib/classes/Config.js

@@ -2,15 +2,15 @@
 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 fs = tslib_1.__importStar(require("node:fs"));
+const path = tslib_1.__importStar(require("node: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 = path.resolve(fs.existsSync(path.resolve('./src')) ? './src/endpoints/' : './endpoints/');
+        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());
@@ -18,7 +18,7 @@ class Config {
                 this.dependencies = data.dependencies;
             }
             if (data.output) {
-                this.output = path.resolve(data.output);
+                this.output = data.output;
             }
             if (!fs.existsSync(this.output)) {
                 fs.mkdirSync(this.output);
@@ -30,7 +30,7 @@ class Config {
     }
     push({ name, path, version, workspace }) {
         var _a, _b;
-        const workspaces = unique_1.unique([
+        const workspaces = (0, 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));

package/lib/classes/Repository.d.ts

@@ -7,6 +7,7 @@ export interface Env {
 export interface Endpoint {
     path: string;
     desc: string;
+    method?: string;
 }
 export interface Api {
     [endpoint: string]: Endpoint;

package/lib/classes/Repository.js

@@ -2,9 +2,9 @@
 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 path = tslib_1.__importStar(require("node:path"));
+const node_child_process_1 = require("node:child_process");
+const fs = tslib_1.__importStar(require("node:fs"));
 const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
 class Repository {
     constructor(str) {
@@ -15,25 +15,26 @@ class Repository {
         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}`);
+        (0, node_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');
-        child_process_1.execSync(`cd ${this.cache} && git checkout origin/master -- ${file}`);
+        const mainBranch = (0, node_child_process_1.execSync)(`cd ${this.cache}; git rev-parse --abbrev-ref origin/HEAD`).toString().trim();
+        (0, node_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`)
+        const hash = (0, node_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}`);
+            (0, node_child_process_1.execSync)(`cd ${this.cache}; git reset --hard ${version}`);
         }
     }
     clean() {

package/lib/commands/add.js

@@ -12,7 +12,7 @@ class Add extends command_1.Command {
         try {
             repository.clone({ version, workspace });
             const config = new Config_1.Config();
-            makeFiles_1.makeFiles({ repository, config, workspace });
+            (0, makeFiles_1.makeFiles)({ repository, config, workspace });
             config.push({
                 name: repository.name,
                 path: repository.path,
@@ -23,6 +23,7 @@ class Add extends command_1.Command {
             this.log(`${color_1.color.green('success')}: ${repository.name} updated!`);
         }
         catch (error) {
+            // @ts-expect-error
             this.error(color_1.color.red(error.stack));
         }
         finally {

package/lib/commands/install.js

@@ -13,22 +13,23 @@ class Install extends command_1.Command {
             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');
             }
-            Object.values(config.dependencies).forEach(({ repository: path, version, workspaces = [''] }) => {
-                workspaces.forEach(workspace => {
+            for (const { repository: path, version, workspaces = [''] } of Object.values(config.dependencies)) {
+                for (const workspace of workspaces) {
                     const repository = new Repository_1.Repository(path);
                     repositories.push(repository);
                     repository.clone({ version, workspace });
-                    makeFiles_1.makeFiles({ repository, workspace, config });
-                });
-            });
+                    (0, makeFiles_1.makeFiles)({ repository, workspace, config });
+                }
+            }
         }
         catch (error) {
+            // @ts-expect-error
             this.error(color_1.color.red(error.message));
         }
         finally {
-            repositories.forEach(repository => {
+            for (const repository of repositories) {
                 repository.clean();
-            });
+            }
         }
     }
 }

package/lib/commands/update.js

@@ -18,10 +18,10 @@ class Update extends command_1.Command {
                 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: path, version, workspaces = [''] } = config.dependencies[args.service];
-            workspaces.forEach(workspace => {
+            for (const workspace of workspaces) {
                 const repository = new Repository_1.Repository(path);
                 repository.clone({ version, workspace });
-                makeFiles_1.makeFiles({ repository, config, workspace });
+                (0, makeFiles_1.makeFiles)({ repository, config, workspace });
                 config.push({
                     name: repository.name,
                     path: repository.path,
@@ -29,16 +29,17 @@ class Update extends command_1.Command {
                     workspace,
                 });
                 repositories.push(repository);
-            });
+            }
             config.publish();
         }
         catch (error) {
+            // @ts-expect-error
             this.error(color_1.color.red(error.message));
         }
         finally {
-            repositories.forEach(repository => {
+            for (const repository of repositories) {
                 repository.clean();
-            });
+            }
         }
     }
 }

package/lib/makeFiles.js

@@ -2,20 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFiles = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
+const path = tslib_1.__importStar(require("node:path"));
 const templates = tslib_1.__importStar(require("./templates"));
-const fs = tslib_1.__importStar(require("fs"));
+const fs = tslib_1.__importStar(require("node:fs"));
 const format_1 = require("./utils/format");
 const makeName = (...args) => {
     return args.filter(e => Boolean(e)).join('.');
 };
-exports.makeFiles = ({ repository, workspace, config }) => {
+const makeFiles = ({ repository, workspace, config }) => {
     const files = [];
-    Object.entries(repository.data).forEach(([version, period]) => {
+    for (const [version, period] of Object.entries(repository.data)) {
         const content = templates.files.endpoints({ repository, version, period, config });
         const basename = makeName(repository.name, workspace, version);
         files.push({ version, basename });
-        fs.writeFileSync(path.resolve(config.output, `${basename}.ts`), format_1.format(content));
-    });
-    fs.writeFileSync(path.resolve(config.output, `${makeName(repository.name, workspace)}.ts`), format_1.format(templates.files.index({ files, repository })));
+        fs.writeFileSync(path.resolve(config.output, `${basename}.ts`), (0, format_1.format)(content));
+    }
+    fs.writeFileSync(path.resolve(config.output, `${makeName(repository.name, workspace)}.ts`), (0, format_1.format)(templates.files.index({ files, repository })));
 };
+exports.makeFiles = makeFiles;

package/lib/templates/files/endpoints.js

@@ -4,14 +4,14 @@ exports.endpoints = void 0;
 const tslib_1 = require("tslib");
 const templates = tslib_1.__importStar(require("../functions"));
 const camelCase_1 = require("../../utils/camelCase");
-exports.endpoints = ({ repository, version, period, config, }) => {
+const endpoints = ({ repository, version, period, config, }) => {
     const names = [];
     const fns = Object.entries(period.api).map(([_name, endpoint]) => {
-        const name = camelCase_1.camelCase(_name);
+        const name = (0, camelCase_1.camelCase)(_name);
         names.push(name);
         return templates.endpoint(name, endpoint);
     });
-    const exportFns = `export const ${camelCase_1.camelCase(repository.name)}_${camelCase_1.camelCase(version)} = {${names.join(',')}}`;
+    const exportFns = `export const ${(0, camelCase_1.camelCase)(repository.name)}_${(0, camelCase_1.camelCase)(version)} = {${names.join(',')}}`;
     return [
         '/* eslint-disable */',
         templates.root({ period, config }),
@@ -19,3 +19,4 @@ exports.endpoints = ({ repository, version, period, config, }) => {
         exportFns,
     ].join('');
 };
+exports.endpoints = endpoints;

package/lib/templates/files/indexFile.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.indexFile = void 0;
 const camelCase_1 = require("../../utils/camelCase");
-exports.indexFile = ({ files, repository, }) => {
+const indexFile = ({ files, repository, }) => {
     return `
     /* eslint-disable */
     ${files
         .map(({ version, basename }) => {
-        return `import * as ${camelCase_1.camelCase(version)} from './${basename}'`;
+        return `import * as ${(0, camelCase_1.camelCase)(version)} from './${basename}'`;
     })
         .join('\n')}
-  export const ${camelCase_1.camelCase(repository.name)} = {${files
-        .map(({ version }) => camelCase_1.camelCase(version))
+  export const ${(0, camelCase_1.camelCase)(repository.name)} = {${files
+        .map(({ version }) => (0, camelCase_1.camelCase)(version))
         .join(',')}}`;
 };
+exports.indexFile = indexFile;

package/lib/templates/functions/endpoint.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.endpoint = void 0;
 const unique_1 = require("../../utils/unique");
 const isNumberLiteral = (str) => {
-    return str && isFinite(Number(str));
+    return str && Number.isFinite(Number(str));
 };
 const detectType = (str) => {
     return isNumberLiteral(str) ? 'number' : 'string';
@@ -56,19 +56,19 @@ const makePathTemplate = (p) => {
         .join('/');
     return t.startsWith('/') ? t.slice(1) : t;
 };
-exports.endpoint = (name, e) => {
+const endpoint = (name, e) => {
     const [path, queryParamsStr] = e.path.split('?');
     const queryParams = makeQueryParams(queryParamsStr);
     const pathParams = makePathParams(path);
     const queryParamNames = pickNames(queryParams);
     const pathParamNames = pickNames(pathParams);
-    const paramNames = unique_1.unique([...queryParamNames, ...pathParamNames]);
-    const params = unique_1.unique([...queryParams, ...pathParams]);
+    const paramNames = (0, unique_1.unique)([...queryParamNames, ...pathParamNames]);
+    const params = (0, unique_1.unique)([...queryParams, ...pathParams]);
     const QUERY_PARAMS_COMMENTS = makeQueryParamsComments(queryParams);
     const QUERY_PARAMS_OBJECT = `{${queryParamNames.join(',')}}`;
     const ARGUMENTS = makeArguments(params, paramNames, pathParamNames);
     const PATH_TEMPLATE = makePathTemplate(path);
-    return `
+    return [`
     /**
      * ${e.desc}
      ${QUERY_PARAMS_COMMENTS}
@@ -84,6 +84,8 @@ exports.endpoint = (name, e) => {
         }).join("&");
       const __path = \`\${__root}/\${\`${PATH_TEMPLATE}\`}\`;
       return __queries ? \`\${__path}?\${__queries}\` : __path;
-    }
-  `;
+    };
+  `,
+        e.method ? `${name}.method='${e.method}'` : null].filter(Boolean).join('\n');
 };
+exports.endpoint = endpoint;

package/lib/templates/functions/root.js

@@ -4,13 +4,13 @@ exports.root = void 0;
 const normalizeName = (n) => {
     return n === 'dev' ?
         'development' :
-        n === 'prod' ?
-            'production' : n;
+        (n === 'prod' ?
+            'production' : n);
 };
 const normalizeUrl = (u) => {
     return u.endsWith('/') ? u.slice(0, -1) : u;
 };
-exports.root = ({ period, config }) => {
+const root = ({ period, config }) => {
     const content = Object.entries(period.env).map(([n, u]) => {
         return `
       if(${config.environment_identifier}==="${normalizeName(n)}"){
@@ -28,3 +28,4 @@ exports.root = ({ period, config }) => {
     return __root
   }`;
 };
+exports.root = root;

package/lib/utils/camelCase.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.camelCase = void 0;
-exports.camelCase = (str) => {
+const camelCase = (str) => {
     const tmp = str.charAt(0).toLowerCase() + str.slice(1);
-    return tmp.replace(/[-_.](.)/g, (_, group1) => {
+    return tmp.replace(/[._-](.)/g, (_, group1) => {
         return group1.toUpperCase();
     });
 };
+exports.camelCase = camelCase;

package/lib/utils/format.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = void 0;
 const tslib_1 = require("tslib");
 const prettier = tslib_1.__importStar(require("prettier"));
-exports.format = (content) => {
+const format = (content) => {
     return prettier.format(content, { parser: 'typescript' });
 };
+exports.format = format;

package/lib/utils/unique.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unique = void 0;
-exports.unique = (arr) => {
-    const a = arr.concat();
+const unique = (arr) => {
+    const a = [...arr];
     for (let i = 0; i < a.length; ++i) {
         for (let j = i + 1; j < a.length; ++j) {
             if (a[i] === a[j]) {
@@ -12,3 +12,4 @@ exports.unique = (arr) => {
     }
     return a;
 };
+exports.unique = unique;

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.1.2","commands":{"add":{"id":"add","description":"\nadd service to dependencies & make endpoints files.\n\n1. make endpoints.config.json for version control.\n\n{\n  \"dependencies\": {\n    \"service-name\": {\n      \"version\": \"26177ed7e673daf0cc5a69e9793dd863424d272f\",\n      \"repository\": \"git@github.com:[username/repository].git\"\n    }\n  }\n}\n\n> service name is inferred from Repository name.\n\n2. make src/endpoints/[service-name].ts\n","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"examples":["$ mes add [username/repository]","$ mes add [username/repository] --version [commmit hash]","$ mes add [username/repository] -v [commmit hash]","$ mes add [username/repository] -v latest","$ mes add [username/repository] --workspace [workspace directory]","$ mes add [username/repository] -w [workspace directory]","$ mes add /Users/.../local-repository/","$ mes add ./local-repository","$ mes add git@github.com:[username/repository].git","$ mes add https://github.com/[username/repository].git"],"flags":{"version":{"name":"version","type":"option","char":"v","description":"latest or commit hash"},"workspace":{"name":"workspace","type":"option","char":"w","description":"a path to workspace containing .endpoints.json"}},"args":[{"name":"repository"}]},"install":{"id":"install","description":"generate endpoints files based on endpoints.config.json","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"update":{"id":"update","description":"update service version & regenerate endpoints files","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"service"}]}}}
+{"version":"2.3.0","commands":{"add":{"id":"add","description":"\nadd service to dependencies & make endpoints files.\n\n1. make endpoints.config.json for version control.\n\n{\n  \"dependencies\": {\n    \"service-name\": {\n      \"version\": \"26177ed7e673daf0cc5a69e9793dd863424d272f\",\n      \"repository\": \"git@github.com:[username/repository].git\"\n    }\n  }\n}\n\n> service name is inferred from Repository name.\n\n2. make src/endpoints/[service-name].ts\n","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"examples":["$ mes add [username/repository]","$ mes add [username/repository] --version [commmit hash]","$ mes add [username/repository] -v [commmit hash]","$ mes add [username/repository] -v latest","$ mes add [username/repository] --workspace [workspace directory]","$ mes add [username/repository] -w [workspace directory]","$ mes add /Users/.../local-repository/","$ mes add ./local-repository","$ mes add git@github.com:[username/repository].git","$ mes add https://github.com/[username/repository].git"],"flags":{"version":{"name":"version","type":"option","char":"v","description":"latest or commit hash"},"workspace":{"name":"workspace","type":"option","char":"w","description":"a path to workspace containing .endpoints.json"}},"args":[{"name":"repository"}]},"install":{"id":"install","description":"generate endpoints files based on endpoints.config.json","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"update":{"id":"update","description":"update service version & regenerate endpoints files","pluginName":"endpoints-sdk-cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"service"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "endpoints-sdk-cli",
   "description": "endpoints sdk cli",
-  "version": "2.1.2",
+  "version": "2.3.0",
   "author": "hrdtbs",
   "bin": {
     "mes": "./bin/run"
@@ -31,7 +31,7 @@
     "eslint-config-oclif": "^3.1",
     "eslint-config-oclif-typescript": "^0.2.0",
     "globby": "^11.0.1",
-    "mocha": "^8.1.2",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "standard-version": "^9.0.0",
     "ts-node": "^9.0.0",