endpoints-sdk-cli 2.3.3 → 2.4.1

package/lib/makeFiles.d.ts

@@ -1,7 +1,8 @@
-import type { Config } from './classes/Config';
+import type { Config, Roots } from './classes/Config';
 import type { Repository } from './classes/Repository';
 export declare const makeFiles: (args: {
     repository: Repository;
     workspace?: string;
     config: Config;
+    roots?: Roots;
 }) => void;

package/lib/makeFiles.js

@@ -9,10 +9,10 @@ const format_1 = require("./utils/format");
 const makeName = (...args) => {
     return args.filter(e => Boolean(e)).join('.');
 };
-const makeFiles = ({ repository, workspace, config }) => {
+const makeFiles = ({ repository, workspace, config, roots }) => {
     const files = [];
     for (const [version, period] of Object.entries(repository.data)) {
-        const content = templates.files.endpoints({ repository, version, period, config });
+        const content = templates.files.endpoints({ repository, version, period, config, roots });
         const basename = makeName(repository.name, workspace, version);
         files.push({ version, basename });
         fs.writeFileSync(path.resolve(config.output, `${basename}.ts`), (0, format_1.format)(content));

package/lib/templates/files/endpoints.d.ts

@@ -1,8 +1,9 @@
-import type { Config } from '../../classes/Config';
+import type { Config, Roots } from '../../classes/Config';
 import type { Repository, Period } from '../../classes/Repository';
-export declare const endpoints: ({ repository, version, period, config, }: {
+export declare const endpoints: ({ repository, version, period, config, roots, }: {
     repository: Repository;
     version: string;
     period: Period;
     config: Config;
+    roots?: Roots | undefined;
 }) => string;

package/lib/templates/files/endpoints.js

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

package/lib/templates/functions/root.d.ts

@@ -1,6 +1,6 @@
 import type { Config } from '../../classes/Config';
 import type { Period } from '../../classes/Repository';
-export declare const root: (args: {
-    period: Period;
+export declare const root: ({ env, config }: {
+    env: Period['env'];
     config: Config;
-}) => void;
+}) => string;

package/lib/templates/functions/root.js

@@ -10,8 +10,8 @@ const normalizeName = (n) => {
 const normalizeUrl = (u) => {
     return u.endsWith('/') ? u.slice(0, -1) : u;
 };
-const root = ({ period, config }) => {
-    const content = Object.entries(period.env).map(([n, u]) => {
+const root = ({ env, config }) => {
+    const content = Object.entries(env).map(([n, u]) => {
         return `
       if(${config.environment_identifier}==="${normalizeName(n)}"){
         __root = '${normalizeUrl(u)}'

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.3.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.4.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.3.3",
+  "version": "2.4.1",
   "author": "hrdtbs",
   "bin": {
     "mes": "./bin/run"
@@ -44,7 +44,8 @@
     "/bin",
     "/lib",
     "/npm-shrinkwrap.json",
-    "/oclif.manifest.json"
+    "/oclif.manifest.json",
+    "/schema.json"
   ],
   "homepage": "https://github.com/matsuri-tech/endpoints-sdk-cli",
   "keywords": [

package/schema.json

@@ -0,0 +1,52 @@
+{
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "required": ["output", "environment_identifier", "dependencies"],
+  "properties": {
+    "output": {
+      "$id": "#/properties/output",
+      "type": "string",
+      "title": "Output directory",
+      "default": "./src/endpoints/"
+    },
+    "environment_identifier": {
+      "$id": "#/properties/environment_identifier",
+      "type": "string",
+      "title": "Environment identifier",
+      "default": "process.env.NODE_ENV",
+      "examples": ["process.env.NODE_ENV", "process.env.RUNTIME_ENV"]
+    },
+    "dependencies": {
+      "$id": "#/properties/dependencies",
+      "type": "object",
+      "title": "Dependencies",
+      "default": {},
+      "additionalProperties": {
+        "type": "object",
+        "required": ["version", "repository"],
+        "properties": {
+          "version": {
+            "type": "string"
+          },
+          "repository": {
+            "type": "string"
+          },
+          "roots": {
+            "type": "object",
+            "title": "Override roots",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "workspaces": {
+            "type": "array",
+            "title": "Set workspaces",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}