endpoints-sdk-cli 2.1.3 → 2.3.1

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.3","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.1","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.3",
+  "version": "2.3.1",
   "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",