@vendure/cli 2.2.0-next.3 → 2.2.0-next.4

package/dist/utilities/package-utils.js

@@ -0,0 +1,96 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installPackages = exports.installRequiredPackages = exports.determineVendureVersion = void 0;
+const prompts_1 = require("@clack/prompts");
+const cross_spawn_1 = __importDefault(require("cross-spawn"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+function determineVendureVersion() {
+    const packageJson = getPackageJsonContent();
+    return packageJson.dependencies['@vendure/core'];
+}
+exports.determineVendureVersion = determineVendureVersion;
+async function installRequiredPackages(requiredPackages) {
+    const packageJson = getPackageJsonContent();
+    const packagesToInstall = requiredPackages.filter(({ pkg, version, isDevDependency }) => {
+        const hasDependency = isDevDependency
+            ? packageJson.devDependencies[pkg]
+            : packageJson.dependencies[pkg];
+        return !hasDependency;
+    });
+    const depsToInstall = packagesToInstall
+        .filter(p => !p.isDevDependency)
+        .map(p => `${p.pkg}${p.version ? `@${p.version}` : ''}`);
+    const devDepsToInstall = packagesToInstall
+        .filter(p => p.isDevDependency)
+        .map(p => `${p.pkg}${p.version ? `@${p.version}` : ''}`);
+    if (depsToInstall.length) {
+        await installPackages(depsToInstall, false);
+    }
+    if (devDepsToInstall.length) {
+        await installPackages(devDepsToInstall, true);
+    }
+}
+exports.installRequiredPackages = installRequiredPackages;
+async function installPackages(dependencies, isDev) {
+    return new Promise((resolve, reject) => {
+        const packageManager = determinePackageManagerBasedOnLockFile();
+        let command = '';
+        let args = [];
+        if (packageManager === 'yarn') {
+            command = 'yarnpkg';
+            args = ['add', '--exact', '--ignore-engines'];
+            if (isDev) {
+                args.push('--dev');
+            }
+            args = args.concat(dependencies);
+        }
+        else {
+            command = 'npm';
+            args = ['install', '--save', '--save-exact', '--loglevel', 'error'].concat(dependencies);
+            if (isDev) {
+                args.push('--save-dev');
+            }
+        }
+        const child = (0, cross_spawn_1.default)(command, args, { stdio: 'ignore' });
+        child.on('close', code => {
+            if (code !== 0) {
+                const message = 'An error occurred when installing dependencies.';
+                reject({
+                    message,
+                    command: `${command} ${args.join(' ')}`,
+                });
+                return;
+            }
+            resolve();
+        });
+    });
+}
+exports.installPackages = installPackages;
+function determinePackageManagerBasedOnLockFile() {
+    const yarnLockPath = path_1.default.join(process.cwd(), 'yarn.lock');
+    const npmLockPath = path_1.default.join(process.cwd(), 'package-lock.json');
+    const pnpmLockPath = path_1.default.join(process.cwd(), 'pnpm-lock.yaml');
+    if (fs_extra_1.default.existsSync(yarnLockPath)) {
+        return 'yarn';
+    }
+    if (fs_extra_1.default.existsSync(npmLockPath)) {
+        return 'npm';
+    }
+    if (fs_extra_1.default.existsSync(pnpmLockPath)) {
+        return 'pnpm';
+    }
+    return 'npm';
+}
+function getPackageJsonContent() {
+    const packageJsonPath = path_1.default.join(process.cwd(), 'package.json');
+    if (!fs_extra_1.default.existsSync(packageJsonPath)) {
+        (0, prompts_1.note)(`Could not find a package.json in the current directory. Please run this command from the root of a Vendure project.`);
+        return false;
+    }
+    return fs_extra_1.default.readJsonSync(packageJsonPath);
+}
+//# sourceMappingURL=package-utils.js.map

package/dist/utilities/package-utils.js.map

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

package/dist/utilities/scaffolder.d.ts

@@ -0,0 +1,8 @@
+export declare class Scaffolder<TemplateContext = Record<string, any>> {
+    private files;
+    addFile(render: (context: TemplateContext) => string, filePath: string): void;
+    createScaffold(options: {
+        dir: string;
+        context: TemplateContext;
+    }): void;
+}

package/dist/utilities/scaffolder.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Scaffolder = void 0;
+const fs = __importStar(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+class Scaffolder {
+    constructor() {
+        this.files = [];
+    }
+    addFile(render, filePath) {
+        this.files.push({ render, path: filePath });
+    }
+    createScaffold(options) {
+        fs.ensureDirSync(options.dir);
+        this.files.forEach(file => {
+            const filePath = path_1.default.join(options.dir, file.path);
+            const rendered = file.render(options.context).trim();
+            fs.ensureFileSync(filePath);
+            fs.writeFileSync(filePath, rendered);
+        });
+    }
+}
+exports.Scaffolder = Scaffolder;
+//# sourceMappingURL=scaffolder.js.map

package/dist/utilities/scaffolder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaffolder.js","sourceRoot":"","sources":["../../src/utilities/scaffolder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,gDAAwB;AAExB,MAAa,UAAU;IAAvB;QACY,UAAK,GAA0E,EAAE,CAAC;IAe9F,CAAC;IAbG,OAAO,CAAC,MAA4C,EAAE,QAAgB;QAClE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,cAAc,CAAC,OAAkD;QAC7D,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACrD,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC5B,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,gCAgBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/cli",
-    "version": "2.2.0-next.3",
+    "version": "2.2.0-next.4",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -19,9 +19,10 @@
     "license": "MIT",
     "type": "commonjs",
     "scripts": {
-        "build": "rimraf dist && tsc -p ./tsconfig.cli.json",
+        "build": "rimraf dist && tsc -p ./tsconfig.cli.json && ts-node ./build.ts",
         "watch": "tsc -p ./tsconfig.cli.json --watch",
-        "ci": "yarn build"
+        "ci": "yarn build",
+        "test": "vitest --config ./vitest.config.ts --run"
     },
     "publishConfig": {
         "access": "public"
@@ -34,14 +35,15 @@
     ],
     "dependencies": {
         "@clack/prompts": "^0.7.0",
-        "@vendure/common": "2.2.0-next.3",
+        "@vendure/common": "2.2.0-next.4",
         "change-case": "^4.1.2",
         "commander": "^11.0.0",
         "fs-extra": "^11.1.1",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.0.0",
+        "ts-morph": "^21.0.1"
     },
     "devDependencies": {
-        "typescript": "4.9.5"
+        "typescript": "5.1.6"
     },
-    "gitHead": "28f529c4b3328150021c19cc1363d4b9a56e928c"
+    "gitHead": "bec677ca0eaaaeea453c8b78cab143c95dece174"
 }

package/dist/commands/new/plugin/scaffold/entities/entity.d.ts

@@ -1,2 +0,0 @@
-import { TemplateContext } from '../../types';
-export declare function renderEntity(context: TemplateContext): string;

package/dist/commands/new/plugin/scaffold/entities/entity.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderEntity = void 0;
-function renderEntity(context) {
-    return `
-import { Entity, Column } from 'typeorm';
-import { VendureEntity, DeepPartial } from '@vendure/core';
-
-@Entity()
-export class ${context.entity.className} extends VendureEntity {
-    constructor(input?: DeepPartial<${context.entity.className}>) {
-        super(input);
-    }
-
-    @Column()
-    name: string;
-}
-`;
-}
-exports.renderEntity = renderEntity;
-//# sourceMappingURL=entity.js.map

package/dist/commands/new/plugin/scaffold/entities/entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../../src/commands/new/plugin/scaffold/entities/entity.ts"],"names":[],"mappings":";;;AAEA,SAAgB,YAAY,CAAC,OAAwB;IACjD,OAAiC;;;;;eAKtB,OAAO,CAAC,MAAM,CAAC,SAAS;sCACD,OAAO,CAAC,MAAM,CAAC,SAAS;;;;;;;CAO7D,CAAC;AACF,CAAC;AAfD,oCAeC"}