@vendure/cli 2.2.1 → 2.2.3

package/dist/commands/add/plugin/create-new-plugin.js

@@ -32,6 +32,7 @@ const change_case_1 = require("change-case");
 const fs = __importStar(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const cli_command_1 = require("../../../shared/cli-command");
+const shared_prompts_1 = require("../../../shared/shared-prompts");
 const vendure_config_ref_1 = require("../../../shared/vendure-config-ref");
 const vendure_plugin_ref_1 = require("../../../shared/vendure-plugin-ref");
 const ast_utils_1 = require("../../../utilities/ast-utils");
@@ -50,9 +51,9 @@ exports.createNewPluginCommand = new cli_command_1.CliCommand({
 });
 const cancelledMessage = 'Plugin setup cancelled.';
 async function createNewPlugin() {
-    var _a;
     const options = { name: '', customEntityName: '', pluginDir: '' };
     (0, prompts_1.intro)('Adding a new Vendure plugin!');
+    const { project } = await (0, shared_prompts_1.analyzeProject)({ cancelledMessage });
     if (!options.name) {
         const name = await (0, prompts_1.text)({
             message: 'What is the name of the plugin?',
@@ -71,7 +72,8 @@ async function createNewPlugin() {
             options.name = name;
         }
     }
-    const pluginDir = getPluginDirName(options.name);
+    const existingPluginDir = findExistingPluginsDir(project);
+    const pluginDir = getPluginDirName(options.name, existingPluginDir);
     const confirmation = await (0, prompts_1.text)({
         message: 'Plugin location',
         initialValue: pluginDir,
@@ -87,7 +89,7 @@ async function createNewPlugin() {
         process.exit(0);
     }
     options.pluginDir = confirmation;
-    const { plugin, project, modifiedSourceFiles } = await generatePlugin(options);
+    const { plugin, modifiedSourceFiles } = await generatePlugin(project, options);
     const configSpinner = (0, prompts_1.spinner)();
     configSpinner.start('Updating VendureConfig...');
     await (0, utils_1.pauseForPromptDisplay)();
@@ -109,9 +111,6 @@ async function createNewPlugin() {
         add_codegen_1.addCodegenCommand,
     ];
     let allModifiedSourceFiles = [...modifiedSourceFiles];
-    const pluginClassName = plugin.name;
-    let workingPlugin = plugin;
-    let workingProject = project;
     while (!done) {
         const featureType = await (0, prompts_1.select)({
             message: `Add features to ${options.name}?`,
@@ -130,17 +129,9 @@ async function createNewPlugin() {
             done = true;
         }
         else {
-            const newProject = (0, ast_utils_1.getTsMorphProject)();
-            workingProject = newProject;
-            const newPlugin = (_a = newProject
-                .getSourceFile(workingPlugin.getSourceFile().getFilePath())) === null || _a === void 0 ? void 0 : _a.getClass(pluginClassName);
-            if (!newPlugin) {
-                throw new Error(`Could not find class "${pluginClassName}" in the new project`);
-            }
-            workingPlugin = new vendure_plugin_ref_1.VendurePluginRef(newPlugin);
             const command = followUpCommands.find(c => c.id === featureType);
             try {
-                const result = await command.run({ plugin: new vendure_plugin_ref_1.VendurePluginRef(newPlugin) });
+                const result = await command.run({ plugin });
                 allModifiedSourceFiles = result.modifiedSourceFiles;
                 for (const sourceFile of allModifiedSourceFiles) {
                     sourceFile.organizeImports();
@@ -150,7 +141,6 @@ async function createNewPlugin() {
                 prompts_1.log.error(`Error adding feature "${command.id}"`);
                 prompts_1.log.error(e.stack);
             }
-            await workingProject.save();
         }
     }
     return {
@@ -159,51 +149,77 @@ async function createNewPlugin() {
     };
 }
 exports.createNewPlugin = createNewPlugin;
-async function generatePlugin(options) {
-    var _a, _b;
+async function generatePlugin(project, options) {
+    var _a, _b, _c, _d;
     const nameWithoutPlugin = options.name.replace(/-?plugin$/i, '');
     const normalizedName = nameWithoutPlugin + '-plugin';
     const templateContext = Object.assign(Object.assign({}, options), { pluginName: (0, change_case_1.pascalCase)(normalizedName), pluginInitOptionsName: (0, change_case_1.constantCase)(normalizedName) + '_OPTIONS' });
     const projectSpinner = (0, prompts_1.spinner)();
     projectSpinner.start('Generating plugin scaffold...');
     await (0, utils_1.pauseForPromptDisplay)();
-    const project = (0, ast_utils_1.getTsMorphProject)({ skipAddingFilesFromTsConfig: true });
-    const pluginFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/plugin.template.ts'));
+    const pluginFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/plugin.template.ts'), path_1.default.join(options.pluginDir, (0, change_case_1.paramCase)(nameWithoutPlugin) + '.plugin.ts'));
     const pluginClass = pluginFile.getClass('TemplatePlugin');
     if (!pluginClass) {
         throw new Error('Could not find the plugin class in the generated file');
     }
+    (_a = pluginFile.getImportDeclaration('./constants.template')) === null || _a === void 0 ? void 0 : _a.setModuleSpecifier('./constants');
+    (_b = pluginFile.getImportDeclaration('./types.template')) === null || _b === void 0 ? void 0 : _b.setModuleSpecifier('./types');
     pluginClass.rename(templateContext.pluginName);
-    const typesFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/types.template.ts'));
-    const constantsFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/constants.template.ts'));
-    (_a = constantsFile
-        .getVariableDeclaration('TEMPLATE_PLUGIN_OPTIONS')) === null || _a === void 0 ? void 0 : _a.rename(templateContext.pluginInitOptionsName).set({ initializer: `Symbol('${templateContext.pluginInitOptionsName}')` });
-    (_b = constantsFile
-        .getVariableDeclaration('loggerCtx')) === null || _b === void 0 ? void 0 : _b.set({ initializer: `'${templateContext.pluginName}'` });
-    typesFile.move(path_1.default.join(options.pluginDir, 'types.ts'));
-    pluginFile.move(path_1.default.join(options.pluginDir, (0, change_case_1.paramCase)(nameWithoutPlugin) + '.plugin.ts'));
-    constantsFile.move(path_1.default.join(options.pluginDir, 'constants.ts'));
+    const typesFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/types.template.ts'), path_1.default.join(options.pluginDir, 'types.ts'));
+    const constantsFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/constants.template.ts'), path_1.default.join(options.pluginDir, 'constants.ts'));
+    (_c = constantsFile
+        .getVariableDeclaration('TEMPLATE_PLUGIN_OPTIONS')) === null || _c === void 0 ? void 0 : _c.rename(templateContext.pluginInitOptionsName).set({ initializer: `Symbol('${templateContext.pluginInitOptionsName}')` });
+    (_d = constantsFile
+        .getVariableDeclaration('loggerCtx')) === null || _d === void 0 ? void 0 : _d.set({ initializer: `'${templateContext.pluginName}'` });
     projectSpinner.stop('Generated plugin scaffold');
     await project.save();
     return {
-        project,
         modifiedSourceFiles: [pluginFile, typesFile, constantsFile],
         plugin: new vendure_plugin_ref_1.VendurePluginRef(pluginClass),
     };
 }
 exports.generatePlugin = generatePlugin;
-function getPluginDirName(name) {
+function findExistingPluginsDir(project) {
+    const pluginClasses = (0, ast_utils_1.getPluginClasses)(project);
+    if (pluginClasses.length === 0) {
+        return;
+    }
+    const pluginDirs = pluginClasses.map(c => {
+        return c.getSourceFile().getDirectoryPath();
+    });
+    const prefix = findCommonPath(pluginDirs);
+    const suffixStartIndex = prefix.length;
+    const rest = pluginDirs[0].substring(suffixStartIndex).replace(/^\//, '').split('/');
+    const suffix = rest.length > 1 ? rest.slice(1).join('/') : '';
+    return { prefix, suffix };
+}
+function getPluginDirName(name, existingPluginDirPattern) {
     const cwd = process.cwd();
-    const pathParts = cwd.split(path_1.default.sep);
-    const currentlyInPluginsDir = pathParts[pathParts.length - 1] === 'plugins';
-    const currentlyInRootDir = fs.pathExistsSync(path_1.default.join(cwd, 'package.json'));
     const nameWithoutPlugin = name.replace(/-?plugin$/i, '');
-    if (currentlyInPluginsDir) {
-        return path_1.default.join(cwd, (0, change_case_1.paramCase)(nameWithoutPlugin));
+    if (existingPluginDirPattern) {
+        return path_1.default.join(existingPluginDirPattern.prefix, (0, change_case_1.paramCase)(nameWithoutPlugin), existingPluginDirPattern.suffix);
     }
-    if (currentlyInRootDir) {
+    else {
         return path_1.default.join(cwd, 'src', 'plugins', (0, change_case_1.paramCase)(nameWithoutPlugin));
     }
-    return path_1.default.join(cwd, (0, change_case_1.paramCase)(nameWithoutPlugin));
+}
+function findCommonPath(paths) {
+    if (paths.length === 0) {
+        return '';
+    }
+    const pathSegmentsList = paths.map(p => p.split('/'));
+    const minLength = Math.min(...pathSegmentsList.map(segments => segments.length));
+    const commonPath = [];
+    for (let i = 0; i < minLength; i++) {
+        const currentSegment = pathSegmentsList[0][i];
+        const isCommon = pathSegmentsList.every(segments => segments[i] === currentSegment);
+        if (isCommon) {
+            commonPath.push(currentSegment);
+        }
+        else {
+            break;
+        }
+    }
+    return commonPath.join('/');
 }
 //# sourceMappingURL=create-new-plugin.js.map

package/dist/commands/add/plugin/create-new-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-new-plugin.js","sourceRoot":"","sources":["../../../../src/commands/add/plugin/create-new-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-new-plugin.js","sourceRoot":"","sources":["../../../../src/commands/add/plugin/create-new-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAqF;AACrF,6CAAkE;AAClE,6CAA+B;AAC/B,gDAAwB;AAGxB,6DAA8E;AAC9E,mEAAgE;AAChE,2EAAsE;AACtE,2EAAsE;AACtE,4DAA8F;AAC9F,oDAAiE;AACjE,0EAA4E;AAC5E,wDAA2D;AAC3D,qDAAwD;AACxD,8DAAgE;AAChE,wDAA2D;AAC3D,0EAA4E;AAI/D,QAAA,sBAAsB,GAAG,IAAI,wBAAU,CAAC;IACjD,EAAE,EAAE,mBAAmB;IACvB,QAAQ,EAAE,QAAQ;IAClB,WAAW,EAAE,6BAA6B;IAC1C,GAAG,EAAE,eAAe;CACvB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAE5C,KAAK,UAAU,eAAe;IACjC,MAAM,OAAO,GAA0B,EAAE,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAS,CAAC;IAChG,IAAA,eAAK,EAAC,8BAA8B,CAAC,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,+BAAc,EAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,MAAM,IAAA,cAAI,EAAC;YACpB,OAAO,EAAE,iCAAiC;YAC1C,YAAY,EAAE,gBAAgB;YAC9B,QAAQ,EAAE,KAAK,CAAC,EAAE;gBACd,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnC,OAAO,gFAAgF,CAAC;gBAC5F,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;YACjB,IAAA,gBAAM,EAAC,gBAAgB,CAAC,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,CAAC;IACL,CAAC;IACD,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,MAAM,IAAA,cAAI,EAAC;QAC5B,OAAO,EAAE,iBAAiB;QAC1B,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,KAAK,CAAC,EAAE;YACd,IAAI,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO,sBAAsB,KAAK,yDAAyD,CAAC;YAChG,CAAC;QACL,CAAC;KACJ,CAAC,CAAC;IAEH,IAAI,IAAA,kBAAQ,EAAC,YAAY,CAAC,EAAE,CAAC;QACzB,IAAA,gBAAM,EAAC,gBAAgB,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE/E,MAAM,aAAa,GAAG,IAAA,iBAAO,GAAE,CAAC;IAChC,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACjD,MAAM,IAAA,6BAAqB,GAAE,CAAC;IAC9B,MAAM,aAAa,GAAG,IAAI,qCAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,aAAa,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC,IAAI,WAAW,CAAC,CAAC;IAC3D,IAAA,4BAAgB,EAAC,aAAa,CAAC,UAAU,EAAE;QACvC,eAAe,EAAE,MAAM,CAAC,aAAa,EAAE;QACvC,YAAY,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;IACH,MAAM,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;IACnD,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAE5C,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,MAAM,gBAAgB,GAAG;QACrB,6BAAgB;QAChB,+BAAiB;QACjB,0CAAsB;QACtB,kCAAkB;QAClB,0CAAsB;QACtB,+BAAiB;KACpB,CAAC;IACF,IAAI,sBAAsB,GAAG,CAAC,GAAG,mBAAmB,CAAC,CAAC;IACtD,OAAO,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,MAAM,IAAA,gBAAM,EAAC;YAC7B,OAAO,EAAE,mBAAmB,OAAO,CAAC,IAAI,GAAG;YAC3C,OAAO,EAAE;gBACL,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,wBAAwB,EAAE;gBAChD,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC1B,KAAK,EAAE,CAAC,CAAC,EAAE;oBACX,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,WAAW,EAAE;iBAC5C,CAAC,CAAC;aACN;SACJ,CAAC,CAAC;QACH,IAAI,IAAA,kBAAQ,EAAC,WAAW,CAAC,EAAE,CAAC;YACxB,IAAI,GAAG,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YAEJ,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAE,CAAC;YAElE,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC7C,sBAAsB,GAAG,MAAM,CAAC,mBAAmB,CAAC;gBAGpD,KAAK,MAAM,UAAU,IAAI,sBAAsB,EAAE,CAAC;oBAC9C,UAAU,CAAC,eAAe,EAAE,CAAC;gBACjC,CAAC;YACL,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBACd,aAAG,CAAC,KAAK,CAAC,yBAAyB,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;gBAClD,aAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO;QACH,OAAO;QACP,mBAAmB,EAAE,EAAE;KAC1B,CAAC;AACN,CAAC;AAxGD,0CAwGC;AAEM,KAAK,UAAU,cAAc,CAChC,OAAgB,EAChB,OAA8B;;IAE9B,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACjE,MAAM,cAAc,GAAG,iBAAiB,GAAG,SAAS,CAAC;IACrD,MAAM,eAAe,mCACd,OAAO,KACV,UAAU,EAAE,IAAA,wBAAU,EAAC,cAAc,CAAC,EACtC,qBAAqB,EAAE,IAAA,0BAAY,EAAC,cAAc,CAAC,GAAG,UAAU,GACnE,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,iBAAO,GAAE,CAAC;IACjC,cAAc,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACtD,MAAM,IAAA,6BAAqB,GAAE,CAAC;IAE9B,MAAM,UAAU,GAAG,IAAA,sBAAU,EACzB,OAAO,EACP,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,EACpD,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAA,uBAAS,EAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,CAC5E,CAAC;IACF,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC7E,CAAC;IACD,MAAA,UAAU,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,0CAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAC3F,MAAA,UAAU,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,0CAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACnF,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,SAAS,GAAG,IAAA,sBAAU,EACxB,OAAO,EACP,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,6BAA6B,CAAC,EACnD,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAC3C,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,sBAAU,EAC5B,OAAO,EACP,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAiC,CAAC,EACvD,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAC/C,CAAC;IACF,MAAA,aAAa;SACR,sBAAsB,CAAC,yBAAyB,CAAC,0CAChD,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAC7C,GAAG,CAAC,EAAE,WAAW,EAAE,WAAW,eAAe,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;IAChF,MAAA,aAAa;SACR,sBAAsB,CAAC,WAAW,CAAC,0CAClC,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,eAAe,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;IAE9D,cAAc,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACjD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACrB,OAAO;QACH,mBAAmB,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC;QAC3D,MAAM,EAAE,IAAI,qCAAgB,CAAC,WAAW,CAAC;KAC5C,CAAC;AACN,CAAC;AAtDD,wCAsDC;AAED,SAAS,sBAAsB,CAAC,OAAgB;IAC5C,MAAM,aAAa,GAAG,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO;IACX,CAAC;IACD,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACrC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACvC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,gBAAgB,CACrB,IAAY,EACZ,wBAAwE;IAExE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACzD,IAAI,wBAAwB,EAAE,CAAC;QAC3B,OAAO,cAAI,CAAC,IAAI,CACZ,wBAAwB,CAAC,MAAM,EAC/B,IAAA,uBAAS,EAAC,iBAAiB,CAAC,EAC5B,wBAAwB,CAAC,MAAM,CAClC,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,OAAO,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,IAAA,uBAAS,EAAC,iBAAiB,CAAC,CAAC,CAAC;IAC1E,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,KAAe;IACnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAGD,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAGtD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAGjF,MAAM,UAAU,GAAa,EAAE,CAAC;IAGhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QAEjC,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC;QACpF,IAAI,QAAQ,EAAE,CAAC;YAEX,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YAEJ,MAAM;QACV,CAAC;IACL,CAAC;IAGD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC"}

package/dist/commands/add/plugin/templates/plugin.template.ts

@@ -1,25 +1,25 @@
-import { PluginCommonModule, Type, VendurePlugin } from '@vendure/core';
-
-import { TEMPLATE_PLUGIN_OPTIONS } from './constants.template';
-import { PluginInitOptions } from './types.template';
-
-@VendurePlugin({
-    imports: [PluginCommonModule],
-    providers: [{ provide: TEMPLATE_PLUGIN_OPTIONS, useFactory: () => TemplatePlugin.options }],
-    configuration: config => {
-        // Plugin-specific configuration
-        // such as custom fields, custom permissions,
-        // strategies etc. can be configured here by
-        // modifying the `config` object.
-        return config;
-    },
-    compatibility: '^2.0.0',
-})
-export class TemplatePlugin {
-    static options: PluginInitOptions;
-
-    static init(options: PluginInitOptions): Type<TemplatePlugin> {
-        this.options = options;
-        return TemplatePlugin;
-    }
-}
+import { PluginCommonModule, Type, VendurePlugin } from '@vendure/core';
+
+import { TEMPLATE_PLUGIN_OPTIONS } from './constants.template';
+import { PluginInitOptions } from './types.template';
+
+@VendurePlugin({
+    imports: [PluginCommonModule],
+    providers: [{ provide: TEMPLATE_PLUGIN_OPTIONS, useFactory: () => TemplatePlugin.options }],
+    configuration: config => {
+        // Plugin-specific configuration
+        // such as custom fields, custom permissions,
+        // strategies etc. can be configured here by
+        // modifying the `config` object.
+        return config;
+    },
+    compatibility: '^2.0.0',
+})
+export class TemplatePlugin {
+    static options: PluginInitOptions;
+
+    static init(options: PluginInitOptions): Type<TemplatePlugin> {
+        this.options = options;
+        return TemplatePlugin;
+    }
+}

package/dist/commands/add/service/add-service.js

@@ -7,6 +7,7 @@ exports.addServiceCommand = void 0;
 const prompts_1 = require("@clack/prompts");
 const change_case_1 = require("change-case");
 const path_1 = __importDefault(require("path"));
+const ts_morph_1 = require("ts-morph");
 const constants_1 = require("../../../constants");
 const cli_command_1 = require("../../../shared/cli-command");
 const service_ref_1 = require("../../../shared/service-ref");
@@ -22,9 +23,9 @@ exports.addServiceCommand = new cli_command_1.CliCommand({
     run: options => addService(options),
 });
 async function addService(providedOptions) {
-    var _a;
+    var _a, _b;
     const providedVendurePlugin = providedOptions === null || providedOptions === void 0 ? void 0 : providedOptions.plugin;
-    const project = await (0, shared_prompts_1.analyzeProject)({ providedVendurePlugin, cancelledMessage });
+    const { project } = await (0, shared_prompts_1.analyzeProject)({ providedVendurePlugin, cancelledMessage });
     const vendurePlugin = providedVendurePlugin !== null && providedVendurePlugin !== void 0 ? providedVendurePlugin : (await (0, shared_prompts_1.selectPlugin)(project, cancelledMessage));
     const modifiedSourceFiles = [];
     const type = (_a = providedOptions === null || providedOptions === void 0 ? void 0 : providedOptions.type) !== null && _a !== void 0 ? _a : (await (0, prompts_1.select)({
@@ -84,8 +85,9 @@ async function addService(providedOptions) {
         }
         options.serviceName = name;
         serviceSpinner.start(`Creating ${options.serviceName}...`);
+        const serviceSourceFilePath = getServiceFilePath(vendurePlugin, options.serviceName);
         await (0, utils_1.pauseForPromptDisplay)();
-        serviceSourceFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/basic-service.template.ts'));
+        serviceSourceFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/basic-service.template.ts'), serviceSourceFilePath);
         serviceClassDeclaration = serviceSourceFile
             .getClass('BasicServiceTemplate')
             .rename(options.serviceName);
@@ -93,7 +95,8 @@ async function addService(providedOptions) {
     else {
         serviceSpinner.start(`Creating ${options.serviceName}...`);
         await (0, utils_1.pauseForPromptDisplay)();
-        serviceSourceFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/entity-service.template.ts'));
+        const serviceSourceFilePath = getServiceFilePath(vendurePlugin, options.serviceName);
+        serviceSourceFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/entity-service.template.ts'), serviceSourceFilePath);
         serviceClassDeclaration = serviceSourceFile
             .getClass('EntityServiceTemplate')
             .rename(options.serviceName);
@@ -132,9 +135,29 @@ async function addService(providedOptions) {
         customizeUpdateMethod(serviceClassDeclaration, entityRef);
         removedUnusedConstructorArgs(serviceClassDeclaration, entityRef);
     }
+    const pluginOptions = vendurePlugin.getPluginOptions();
+    if (pluginOptions) {
+        (0, ast_utils_1.addImportsToFile)(serviceSourceFile, {
+            moduleSpecifier: pluginOptions.constantDeclaration.getSourceFile(),
+            namedImports: [pluginOptions.constantDeclaration.getName()],
+        });
+        (0, ast_utils_1.addImportsToFile)(serviceSourceFile, {
+            moduleSpecifier: pluginOptions.typeDeclaration.getSourceFile(),
+            namedImports: [pluginOptions.typeDeclaration.getName()],
+        });
+        (0, ast_utils_1.addImportsToFile)(serviceSourceFile, {
+            moduleSpecifier: '@nestjs/common',
+            namedImports: ['Inject'],
+        });
+        (_b = serviceClassDeclaration
+            .getConstructors()[0]) === null || _b === void 0 ? void 0 : _b.addParameter({
+            scope: ts_morph_1.Scope.Private,
+            name: 'options',
+            type: pluginOptions.typeDeclaration.getName(),
+            decorators: [{ name: 'Inject', arguments: [pluginOptions.constantDeclaration.getName()] }],
+        }).formatText();
+    }
     modifiedSourceFiles.push(serviceSourceFile);
-    const serviceFileName = (0, change_case_1.paramCase)(options.serviceName).replace(/-service$/, '.service');
-    serviceSourceFile === null || serviceSourceFile === void 0 ? void 0 : serviceSourceFile.move(path_1.default.join(vendurePlugin.getPluginDir().getPath(), 'services', `${serviceFileName}.ts`));
     serviceSpinner.message(`Registering service with plugin...`);
     vendurePlugin.addProvider(options.serviceName);
     (0, ast_utils_1.addImportsToFile)(vendurePlugin.classDeclaration.getSourceFile(), {
@@ -149,15 +172,19 @@ async function addService(providedOptions) {
         serviceRef: new service_ref_1.ServiceRef(serviceClassDeclaration),
     };
 }
+function getServiceFilePath(plugin, serviceName) {
+    const serviceFileName = (0, change_case_1.paramCase)(serviceName).replace(/-service$/, '.service');
+    return path_1.default.join(plugin.getPluginDir().getPath(), 'services', `${serviceFileName}.ts`);
+}
 function customizeFindOneMethod(serviceClassDeclaration, entityRef) {
     const findOneMethod = serviceClassDeclaration.getMethod('findOne');
     findOneMethod
         .setBodyText(writer => {
-        writer.write(` return this.connection
-            .getRepository(ctx, ${entityRef.name})
-            .findOne({
-                where: { id },
-                relations,
+        writer.write(` return this.connection
+            .getRepository(ctx, ${entityRef.name})
+            .findOne({
+                where: { id },
+                relations,
             })`);
         if (entityRef.isTranslatable()) {
             writer.write(`.then(entity => entity && this.translator.translate(entity, ctx));`);
@@ -206,14 +233,14 @@ function customizeCreateMethod(serviceClassDeclaration, entityRef) {
         .setBodyText(writer => {
         var _a;
         if (entityRef.isTranslatable()) {
-            writer.write(`const newEntity = await this.translatableSaver.create({
-                                ctx,
-                                input,
-                                entityType: ${entityRef.name},
-                                translationType: ${(_a = entityRef.getTranslationClass()) === null || _a === void 0 ? void 0 : _a.getName()},
-                                beforeSave: async f => {
-                                    // Any pre-save logic can go here
-                                },
+            writer.write(`const newEntity = await this.translatableSaver.create({
+                                ctx,
+                                input,
+                                entityType: ${entityRef.name},
+                                translationType: ${(_a = entityRef.getTranslationClass()) === null || _a === void 0 ? void 0 : _a.getName()},
+                                beforeSave: async f => {
+                                    // Any pre-save logic can go here
+                                },
                             });`);
         }
         else {
@@ -235,14 +262,14 @@ function customizeUpdateMethod(serviceClassDeclaration, entityRef) {
         .setBodyText(writer => {
         var _a;
         if (entityRef.isTranslatable()) {
-            writer.write(`const updatedEntity = await this.translatableSaver.update({
-                                ctx,
-                                input,
-                                entityType: ${entityRef.name},
-                                translationType: ${(_a = entityRef.getTranslationClass()) === null || _a === void 0 ? void 0 : _a.getName()},
-                                beforeSave: async f => {
-                                    // Any pre-save logic can go here
-                                },
+            writer.write(`const updatedEntity = await this.translatableSaver.update({
+                                ctx,
+                                input,
+                                entityType: ${entityRef.name},
+                                translationType: ${(_a = entityRef.getTranslationClass()) === null || _a === void 0 ? void 0 : _a.getName()},
+                                beforeSave: async f => {
+                                    // Any pre-save logic can go here
+                                },
                             });`);
         }
         else {

package/dist/commands/add/service/add-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-service.js","sourceRoot":"","sources":["../../../../src/commands/add/service/add-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-service.js","sourceRoot":"","sources":["../../../../src/commands/add/service/add-service.ts"],"names":[],"mappings":"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"}

package/dist/commands/add/ui-extensions/add-ui-extensions.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addUiExtensionsCommand = void 0;
 const prompts_1 = require("@clack/prompts");
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const cli_command_1 = require("../../../shared/cli-command");
 const package_json_ref_1 = require("../../../shared/package-json-ref");
@@ -21,7 +22,7 @@ exports.addUiExtensionsCommand = new cli_command_1.CliCommand({
 });
 async function addUiExtensions(options) {
     const providedVendurePlugin = options === null || options === void 0 ? void 0 : options.plugin;
-    const project = await (0, shared_prompts_1.analyzeProject)({ providedVendurePlugin });
+    const { project } = await (0, shared_prompts_1.analyzeProject)({ providedVendurePlugin });
     const vendurePlugin = providedVendurePlugin !== null && providedVendurePlugin !== void 0 ? providedVendurePlugin : (await (0, shared_prompts_1.selectPlugin)(project, 'Add UI extensions cancelled'));
     const packageJson = new package_json_ref_1.PackageJson(project);
     if (vendurePlugin.hasUiExtensions()) {
@@ -31,7 +32,15 @@ async function addUiExtensions(options) {
     (0, add_ui_extension_static_prop_1.addUiExtensionStaticProp)(vendurePlugin);
     prompts_1.log.success('Updated the plugin class');
     const installSpinner = (0, prompts_1.spinner)();
-    installSpinner.start(`Installing dependencies...`);
+    const packageManager = packageJson.determinePackageManager();
+    const packageJsonFile = packageJson.locatePackageJsonWithVendureDependency();
+    prompts_1.log.info(`Detected package manager: ${packageManager}`);
+    if (!packageJsonFile) {
+        (0, prompts_1.cancel)(`Could not locate package.json file with a dependency on Vendure.`);
+        process.exit(1);
+    }
+    prompts_1.log.info(`Detected package.json: ${packageJsonFile}`);
+    installSpinner.start(`Installing dependencies using ${packageManager}...`);
     try {
         const version = packageJson.determineVendureVersion();
         await packageJson.installPackages([
@@ -47,10 +56,14 @@ async function addUiExtensions(options) {
     }
     installSpinner.stop('Dependencies installed');
     const pluginDir = vendurePlugin.getPluginDir().getPath();
-    const providersFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/providers.template.ts'));
-    providersFile.move(path_1.default.join(pluginDir, 'ui', 'providers.ts'));
-    const routesFile = (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/routes.template.ts'));
-    routesFile.move(path_1.default.join(pluginDir, 'ui', 'routes.ts'));
+    const providersFileDest = path_1.default.join(pluginDir, 'ui', 'providers.ts');
+    if (!fs_extra_1.default.existsSync(providersFileDest)) {
+        (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/providers.template.ts'), providersFileDest);
+    }
+    const routesFileDest = path_1.default.join(pluginDir, 'ui', 'routes.ts');
+    if (!fs_extra_1.default.existsSync(routesFileDest)) {
+        (0, ast_utils_1.createFile)(project, path_1.default.join(__dirname, 'templates/routes.template.ts'), routesFileDest);
+    }
     prompts_1.log.success('Created UI extension scaffold');
     const vendureConfig = new vendure_config_ref_1.VendureConfigRef(project);
     if (!vendureConfig) {

package/dist/commands/add/ui-extensions/add-ui-extensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-ui-extensions.js","sourceRoot":"","sources":["../../../../src/commands/add/ui-extensions/add-ui-extensions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-ui-extensions.js","sourceRoot":"","sources":["../../../../src/commands/add/ui-extensions/add-ui-extensions.ts"],"names":[],"mappings":"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"}

package/dist/commands/migrate/generate-migration/generate-migration.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateMigrationCommand = void 0;
 const prompts_1 = require("@clack/prompts");
+const unique_1 = require("@vendure/common/lib/unique");
 const core_1 = require("@vendure/core");
+const path_1 = __importDefault(require("path"));
 const cli_command_1 = require("../../../shared/cli-command");
 const shared_prompts_1 = require("../../../shared/shared-prompts");
 const vendure_config_ref_1 = require("../../../shared/vendure-config-ref");
@@ -15,7 +20,7 @@ exports.generateMigrationCommand = new cli_command_1.CliCommand({
     run: () => runGenerateMigration(),
 });
 async function runGenerateMigration() {
-    const project = await (0, shared_prompts_1.analyzeProject)({ cancelledMessage });
+    const { project, tsConfigPath } = await (0, shared_prompts_1.analyzeProject)({ cancelledMessage });
     const vendureConfig = new vendure_config_ref_1.VendureConfigRef(project);
     prompts_1.log.info('Using VendureConfig from ' + vendureConfig.getPathRelativeToProjectRoot());
     const name = await (0, prompts_1.text)({
@@ -32,10 +37,43 @@ async function runGenerateMigration() {
         (0, prompts_1.cancel)(cancelledMessage);
         process.exit(0);
     }
-    const config = await (0, load_vendure_config_file_1.loadVendureConfigFile)(vendureConfig);
+    const config = await (0, load_vendure_config_file_1.loadVendureConfigFile)(vendureConfig, tsConfigPath);
+    const migrationsDirs = getMigrationsDir(vendureConfig, config);
+    let migrationDir = migrationsDirs[0];
+    if (migrationsDirs.length > 1) {
+        const migrationDirSelect = await (0, prompts_1.select)({
+            message: 'Migration file location',
+            options: migrationsDirs
+                .map(c => ({
+                value: c,
+                label: c,
+            }))
+                .concat({
+                value: 'other',
+                label: 'Other',
+            }),
+        });
+        if ((0, prompts_1.isCancel)(migrationDirSelect)) {
+            (0, prompts_1.cancel)(cancelledMessage);
+            process.exit(0);
+        }
+        migrationDir = migrationDirSelect;
+    }
+    if (migrationsDirs.length === 1 || migrationDir === 'other') {
+        const confirmation = await (0, prompts_1.text)({
+            message: 'Migration file location',
+            initialValue: migrationsDirs[0],
+            placeholder: '',
+        });
+        if ((0, prompts_1.isCancel)(confirmation)) {
+            (0, prompts_1.cancel)(cancelledMessage);
+            process.exit(0);
+        }
+        migrationDir = confirmation;
+    }
     const migrationSpinner = (0, prompts_1.spinner)();
     migrationSpinner.start('Generating migration...');
-    const migrationName = await (0, core_1.generateMigration)(config, { name, outputDir: './src/migrations' });
+    const migrationName = await (0, core_1.generateMigration)(config, { name, outputDir: migrationDir });
     const report = typeof migrationName === 'string'
         ? `New migration generated: ${migrationName}`
         : 'No changes in database schema were found, so no migration was generated';
@@ -45,4 +83,27 @@ async function runGenerateMigration() {
         modifiedSourceFiles: [],
     };
 }
+function getMigrationsDir(vendureConfigRef, config) {
+    const options = [];
+    if (Array.isArray(config.dbConnectionOptions.migrations) &&
+        config.dbConnectionOptions.migrations.length) {
+        const firstEntry = config.dbConnectionOptions.migrations[0];
+        if (typeof firstEntry === 'string') {
+            options.push(path_1.default.dirname(firstEntry));
+        }
+    }
+    const migrationFile = vendureConfigRef.sourceFile
+        .getProject()
+        .getSourceFiles()
+        .find(sf => {
+        return sf
+            .getClasses()
+            .find(c => c.getImplements().find(i => i.getText() === 'MigrationInterface'));
+    });
+    if (migrationFile) {
+        options.push(migrationFile.getDirectory().getPath());
+    }
+    options.push(path_1.default.join(vendureConfigRef.sourceFile.getDirectory().getPath(), '../migrations'));
+    return (0, unique_1.unique)(options.map(p => path_1.default.normalize(p)));
+}
 //# sourceMappingURL=generate-migration.js.map