@trayio/cdk-cli 0.0.7 → 0.0.9

package/README.md

@@ -24,7 +24,7 @@ $ npm install -g @trayio/cdk-cli
 $ tray-cdk COMMAND
 running command...
 $ tray-cdk (--version|-v)
-@trayio/cdk-cli/0.0.7 linux-x64 node-v18.16.1
+@trayio/cdk-cli/0.0.9 linux-x64 node-v18.17.0
 $ tray-cdk --help [COMMAND]
 USAGE
   $ tray-cdk COMMAND
@@ -36,10 +36,10 @@ USAGE
 
 <!-- commands -->
 * [`tray-cdk`](#tray-cdk)
+* [`tray-cdk add-operation [OPERATIONNAME] [OPERATIONTYPE]`](#tray-cdk-add-operation-operationname-operationtype)
 * [`tray-cdk autocomplete [SHELL]`](#tray-cdk-autocomplete-shell)
-* [`tray-cdk connector init [CONNECTORNAME]`](#tray-cdk-connector-init-connectorname)
-* [`tray-cdk connector operation add [OPERATIONNAME] [OPERATIONTYPE]`](#tray-cdk-connector-operation-add-operationname-operationtype)
 * [`tray-cdk help [COMMANDS]`](#tray-cdk-help-commands)
+* [`tray-cdk init [CONNECTORNAME]`](#tray-cdk-init-connectorname)
 * [`tray-cdk version`](#tray-cdk-version)
 
 ## `tray-cdk`
@@ -49,6 +49,22 @@ USAGE
   $ tray-cdk
 ```
 
+## `tray-cdk add-operation [OPERATIONNAME] [OPERATIONTYPE]`
+
+Add an operation to connector project
+
+```
+USAGE
+  $ tray-cdk add-operation [OPERATIONNAME] [OPERATIONTYPE]
+
+ARGUMENTS
+  OPERATIONNAME  Operation name
+  OPERATIONTYPE  (http|composite) Operation type
+
+DESCRIPTION
+  Add an operation to connector project
+```
+
 ## `tray-cdk autocomplete [SHELL]`
 
 display autocomplete installation instructions
@@ -78,57 +94,41 @@ EXAMPLES
 
 _See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.1.9/src/commands/autocomplete/index.ts)_
 
-## `tray-cdk connector init [CONNECTORNAME]`
+## `tray-cdk help [COMMANDS]`
 
-Initialize a connector project
+Display help for tray-cdk.
 
 ```
 USAGE
-  $ tray-cdk connector init [CONNECTORNAME]
+  $ tray-cdk help [COMMANDS] [-n]
 
 ARGUMENTS
-  CONNECTORNAME  Connector directory name to generate template files
-
-DESCRIPTION
-  Initialize a connector project
-```
-
-## `tray-cdk connector operation add [OPERATIONNAME] [OPERATIONTYPE]`
-
-Add an operation to connector project
-
-```
-USAGE
-  $ tray-cdk connector operation add [OPERATIONNAME] [OPERATIONTYPE]
+  COMMANDS  Command to show help for.
 
-ARGUMENTS
-  OPERATIONNAME  Operation name
-  OPERATIONTYPE  (http|composite) Operation type
+FLAGS
+  -n, --nested-commands  Include all nested commands in the output.
 
 DESCRIPTION
-  Add an operation to connector project
+  Display help for tray-cdk.
 ```
 
-## `tray-cdk help [COMMANDS]`
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.9/src/commands/help.ts)_
 
-Display help for tray-cdk.
+## `tray-cdk init [CONNECTORNAME]`
+
+Initialize a connector project
 
 ```
 USAGE
-  $ tray-cdk help [COMMANDS] [-n]
+  $ tray-cdk init [CONNECTORNAME]
 
 ARGUMENTS
-  COMMANDS  Command to show help for.
-
-FLAGS
-  -n, --nested-commands  Include all nested commands in the output.
+  CONNECTORNAME  Connector directory name to generate template files
 
 DESCRIPTION
-  Display help for tray-cdk.
+  Initialize a connector project
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.9/src/commands/help.ts)_
-
 ## `tray-cdk version`
 
 ```

package/dist/{connector/operation/add.d.ts → add-operation.d.ts}

@@ -9,4 +9,4 @@ export default class ConnectorOperationAdd extends Command {
     };
     run(): Promise<void>;
 }
-//# sourceMappingURL=add.d.ts.map
+//# sourceMappingURL=add-operation.d.ts.map

package/dist/add-operation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-operation.d.ts","sourceRoot":"","sources":["../src/add-operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,aAAa,CAAC;AAc5C,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MACQ,CAAC;AAEnD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,MACd,CAAC;AAe9B,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,OAAO;IACzD,MAAM,CAAC,WAAW,SAA2C;IAE7D,MAAM,CAAC,IAAI;;;MAYT;IAEI,GAAG;CAqDT"}

package/dist/{connector/operation/add.js → add-operation.js}

@@ -17,13 +17,24 @@ const core_1 = require("@oclif/core");
 const inquirer_1 = __importDefault(require("inquirer"));
 const chalk_1 = __importDefault(require("chalk"));
 const NodeFsGenerator_1 = require("@trayio/tray-generator/generator/NodeFsGenerator");
-const path_1 = require("path");
+const path_1 = __importDefault(require("path"));
 const lodash_1 = require("lodash");
 // TODO add to try-common in ts-modules
 const titleCase = (value) => (0, lodash_1.capitalize)((0, lodash_1.startCase)(value).replace(/_|-/g, ' '));
 exports.titleCase = titleCase;
 const pascalCase = (value) => (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(value));
 exports.pascalCase = pascalCase;
+const isInSrcFolder = (currentDirectory) => {
+    const { base } = path_1.default.parse(currentDirectory);
+    return base === 'src';
+};
+const getConnectorName = (currentDirectory) => {
+    const { base } = path_1.default.parse(currentDirectory);
+    if (base === 'src') {
+        return path_1.default.basename(path_1.default.dirname(currentDirectory));
+    }
+    return base;
+};
 class ConnectorOperationAdd extends core_1.Command {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -34,7 +45,7 @@ class ConnectorOperationAdd extends core_1.Command {
                     message: 'Operation name',
                     type: 'input',
                     when: !args.operationName,
-                    default: 'MyOperation',
+                    default: 'my-operation',
                 },
                 {
                     name: 'operationType',
@@ -48,20 +59,26 @@ class ConnectorOperationAdd extends core_1.Command {
                     default: 'http',
                 },
             ]);
-            const operationName = (0, exports.pascalCase)(args.operationName || promptRes.operationName);
-            const operationDirectory = (0, lodash_1.kebabCase)(operationName);
-            const operationTitle = (0, exports.titleCase)(operationName);
+            const operationName = args.operationName || promptRes.operationName;
+            const operationNameKebabCase = (0, lodash_1.kebabCase)(operationName);
+            const operationNamePascalCase = (0, exports.pascalCase)(operationName);
+            const operationNameCamelCase = (0, lodash_1.camelCase)(operationName);
+            const currentDirectory = process.cwd();
+            const connectorNamePascalCase = (0, exports.pascalCase)(getConnectorName(currentDirectory));
             const operationType = args.operationType || promptRes.operationType;
             const rootDir = __dirname;
             const templatePath = operationType === 'http'
-                ? (0, path_1.join)(rootDir, 'http-operation-template.zip')
-                : (0, path_1.join)(rootDir, 'composite-operation-template.zip');
+                ? path_1.default.join(rootDir, 'http-operation-template.zip')
+                : path_1.default.join(rootDir, 'composite-operation-template.zip');
             const generator = new NodeFsGenerator_1.NodeFsGenerator();
-            // TODO should we check if we are inside the src dir?
-            yield generator.generate(templatePath, process.cwd(), {
-                operationName,
-                operationTitle,
-                operationDirectory,
+            const targetPath = isInSrcFolder(currentDirectory)
+                ? currentDirectory
+                : path_1.default.join(currentDirectory, 'src');
+            yield generator.generate(templatePath, targetPath, {
+                operationNameKebabCase,
+                operationNamePascalCase,
+                operationNameCamelCase,
+                connectorNamePascalCase,
             })();
             this.log(chalk_1.default.bold(chalk_1.default.green(`Success! Added operation: ${operationName}`)));
         });

package/dist/init.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,aAAa,CAAC;AAc5C,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MACQ,CAAC;AAEnD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,MACd,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IACjD,MAAM,CAAC,WAAW,SAAoC;IAEtD,MAAM,CAAC,IAAI;;MAMT;IAEI,GAAG;CAgCT"}

package/dist/{connector/init.js → init.js}

@@ -37,16 +37,20 @@ class ConnectorInit extends core_1.Command {
                     default: 'my-connector',
                 },
             ]);
-            const connectorName = (0, lodash_1.kebabCase)(args.connectorName || promptRes.connectorName);
-            const connectorTitle = (0, exports.titleCase)(connectorName);
+            const connectorNameKebabCase = (0, lodash_1.kebabCase)(args.connectorName || promptRes.connectorName);
+            const connectorNameTitleCase = (0, exports.titleCase)(connectorNameKebabCase);
+            const connectorNamePascalCase = (0, exports.pascalCase)(connectorNameKebabCase);
+            const connectorNameCamelCase = (0, lodash_1.camelCase)(connectorNameKebabCase);
             const rootDir = __dirname;
             const templatePath = (0, path_1.join)(rootDir, 'connector-template.zip');
             const generator = new NodeFsGenerator_1.NodeFsGenerator();
             yield generator.generate(templatePath, process.cwd(), {
-                connectorName,
-                connectorTitle,
+                connectorNameKebabCase,
+                connectorNameTitleCase,
+                connectorNamePascalCase,
+                connectorNameCamelCase,
             })();
-            this.log(chalk_1.default.bold(chalk_1.default.green(`Success! Added ${connectorName}`)));
+            this.log(chalk_1.default.bold(chalk_1.default.green(`Success! Added ${connectorNameKebabCase}`)));
         });
     }
 }

package/oclif.manifest.json

@@ -1,34 +1,8 @@
 {
-  "version": "0.0.7",
+  "version": "0.0.9",
   "commands": {
-    ".": {
-      "id": ".",
-      "pluginName": "@trayio/cdk-cli",
-      "pluginAlias": "@trayio/cdk-cli",
-      "pluginType": "core",
-      "aliases": [],
-      "flags": {},
-      "args": {}
-    },
-    "connector:init": {
-      "id": "connector:init",
-      "description": "Initialize a connector project",
-      "strict": true,
-      "pluginName": "@trayio/cdk-cli",
-      "pluginAlias": "@trayio/cdk-cli",
-      "pluginType": "core",
-      "aliases": [],
-      "flags": {},
-      "args": {
-        "connectorName": {
-          "name": "connectorName",
-          "description": "Connector directory name to generate template files",
-          "required": false
-        }
-      }
-    },
-    "connector:operation:add": {
-      "id": "connector:operation:add",
+    "add-operation": {
+      "id": "add-operation",
       "description": "Add an operation to connector project",
       "strict": true,
       "pluginName": "@trayio/cdk-cli",
@@ -52,6 +26,32 @@
           ]
         }
       }
+    },
+    ".": {
+      "id": ".",
+      "pluginName": "@trayio/cdk-cli",
+      "pluginAlias": "@trayio/cdk-cli",
+      "pluginType": "core",
+      "aliases": [],
+      "flags": {},
+      "args": {}
+    },
+    "init": {
+      "id": "init",
+      "description": "Initialize a connector project",
+      "strict": true,
+      "pluginName": "@trayio/cdk-cli",
+      "pluginAlias": "@trayio/cdk-cli",
+      "pluginType": "core",
+      "aliases": [],
+      "flags": {},
+      "args": {
+        "connectorName": {
+          "name": "connectorName",
+          "description": "Connector directory name to generate template files",
+          "required": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "A collection of CLI commands for connector development.",
   "exports": {
     "./*": "./dist/*.js"

package/dist/connector/init.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/connector/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,aAAa,CAAC;AAc5C,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MACQ,CAAC;AAEnD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,MACd,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,OAAO;IACjD,MAAM,CAAC,WAAW,SAAoC;IAEtD,MAAM,CAAC,IAAI;;MAMT;IAEI,GAAG;CAyBT"}

package/dist/connector/operation/add.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/connector/operation/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,aAAa,CAAC;AAc5C,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MACQ,CAAC;AAEnD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,MACd,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,OAAO;IACzD,MAAM,CAAC,WAAW,SAA2C;IAE7D,MAAM,CAAC,IAAI;;;MAYT;IAEI,GAAG;CA6CT"}