@salesforce/templates 61.0.1 → 61.1.0

package/lib/service/templateService.js

@@ -6,27 +6,28 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateService = void 0;
+exports.TemplateService = exports.importGenerator = void 0;
 const tslib_1 = require("tslib");
-const fs = require("fs");
-const path = require("path");
-const yeoman = require("yeoman-environment");
-const i18n_1 = require("../i18n");
-const utils_1 = require("../utils");
 const types_1 = require("../utils/types");
-const gitRepoUtils_1 = require("./gitRepoUtils");
+function importGenerator(templateType) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generatorClass = types_1.TemplateType[templateType].toString().charAt(0).toLowerCase() +
+            types_1.TemplateType[templateType].toString().slice(1) +
+            'Generator';
+        return (yield Promise.resolve(`${`../generators/${generatorClass}`}`).then(s => require(s))).default;
+    });
+}
+exports.importGenerator = importGenerator;
 /**
  * Template Service
  */
 class TemplateService {
     constructor(cwd = process.cwd()) {
-        this.adapter = new utils_1.ForceGeneratorAdapter();
-        // @ts-ignore the adaptor doesn't fully implement yeoman's adaptor yet
-        this.env = yeoman.createEnv(undefined, { cwd }, this.adapter);
+        this._cwd = cwd;
     }
     /**
      * Get an instance of TemplateService
-     * @param cwd cwd of current yeoman environment. CLI: don't need to set explicitly. VS Code: it's typically the root workspace path
+     * @param cwd cwd of current environment. CLI: don't need to set explicitly. VS Code: it's typically the root workspace path
      */
     static getInstance(cwd) {
         if (!TemplateService.instance) {
@@ -38,25 +39,17 @@ class TemplateService {
         return TemplateService.instance;
     }
     /**
-     * Getting cwd of current yeoman environment
+     * Getting cwd of current environment
      */
     get cwd() {
-        return this.env.cwd;
+        return this._cwd;
     }
     /**
-     * Setting cwd of current yeoman environment
+     * Setting cwd of current environment
      * In VS Code, it's typically the root workspace path
      */
     set cwd(cwd) {
-        this.env.cwd = cwd;
-    }
-    /**
-     * Look up package version of @salesforce/templates package to supply a default API version
-     */
-    static getDefaultApiVersion() {
-        const packageJsonPath = path.join('..', '..', 'package.json');
-        const versionTrimmed = require(packageJsonPath).salesforceApiVersion.trim();
-        return `${versionTrimmed.split('.')[0]}.0`;
+        this._cwd = cwd;
     }
     /**
      * Create using templates
@@ -66,82 +59,13 @@ class TemplateService {
      */
     create(templateType, templateOptions, customTemplatesRootPathOrGitRepo) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield this.setCustomTemplatesRootPathOrGitRepo(customTemplatesRootPathOrGitRepo);
-            if (customTemplatesRootPathOrGitRepo) {
-                // In VS Code, if creating using a custom template, we need to reset the yeoman environment
-                this.resetEnv();
-            }
-            const generatorClass = types_1.TemplateType[templateType].toString().charAt(0).toLowerCase() +
-                types_1.TemplateType[templateType].toString().slice(1) +
-                'Generator';
-            const generatorNamespace = `@salesforce/${generatorClass}`;
-            let generator = this.env.get(generatorNamespace);
-            if (!generator) {
-                generator = (yield Promise.resolve(`${`../generators/${generatorClass}`}`).then(s => require(s))).default;
-                const generatorPackagePath = path.join(__dirname, '..', '..');
-                this.env.registerStub(generator, generatorNamespace, generatorPackagePath);
-            }
-            this.adapter.log.clear();
-            return new Promise((resolve, reject) => {
-                this.env
-                    .run(generatorNamespace, templateOptions)
-                    .then(() => {
-                    const outputDir = path.resolve(this.cwd, templateOptions.outputdir);
-                    const created = this.adapter.log.getCleanOutput();
-                    const rawOutput = i18n_1.nls.localize('RawOutput', [
-                        outputDir,
-                        this.adapter.log.getOutput(),
-                    ]);
-                    const result = {
-                        outputDir,
-                        created,
-                        rawOutput,
-                    };
-                    resolve(result);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
-            });
-        });
-    }
-    resetEnv() {
-        const cwd = this.env.cwd;
-        // @ts-ignore
-        this.env = yeoman.createEnv(undefined, { cwd }, this.adapter);
-    }
-    /**
-     * Set custom templates root path or git repo.
-     * Throws an error if local path doesn't exist or cannot reach git repo.
-     * @param customTemplatesRootPathOrGitRepo custom templates root path or git repo
-     * @param forceLoadingRemoteRepo by default do not reload remote repo if the repo is already downloaded
-     */
-    setCustomTemplatesRootPathOrGitRepo(pathOrRepoUri_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (pathOrRepoUri, forceLoadingRemoteRepo = false) {
-            if (pathOrRepoUri === undefined) {
-                this.customTemplatesRootPath = undefined;
-                return;
-            }
-            try {
-                // if pathOrRepoUri is valid url, load the repo
-                const url = new URL(pathOrRepoUri);
-                if (url) {
-                    this.customTemplatesRootPath = yield (0, gitRepoUtils_1.loadCustomTemplatesGitRepo)(url, forceLoadingRemoteRepo);
-                }
-            }
-            catch (error) {
-                const err = error;
-                if (err.code !== 'ERR_INVALID_URL') {
-                    throw error;
-                }
-                const localTemplatesPath = pathOrRepoUri;
-                if (fs.existsSync(localTemplatesPath)) {
-                    this.customTemplatesRootPath = localTemplatesPath;
-                }
-                else {
-                    throw new Error(i18n_1.nls.localize('localCustomTemplateDoNotExist', localTemplatesPath));
-                }
-            }
+            const runOptions = {
+                cwd: this.cwd,
+                customTemplatesRootPathOrGitRepo,
+            };
+            const Generator = yield importGenerator(templateType);
+            const instance = new Generator(templateOptions);
+            return instance.run(runOptions);
         });
     }
 }

package/lib/service/templateService.js.map

@@ -1 +1 @@
-{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../src/service/templateService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../src/service/templateService.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,0CAIwB;AAExB,SAAsB,eAAe,CAAC,YAA0B;;QAC9D,MAAM,cAAc,GAClB,oBAAY,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;YAC7D,oBAAY,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9C,WAAW,CAAC;QACd,OAAO,CAAC,yBAAa,iBAAiB,cAAc,EAAE,yBAAC,CAAC,CAAC,OAAO,CAAC;IACnE,CAAC;CAAA;AAND,0CAMC;AAED;;GAEG;AACH,MAAa,eAAe;IAI1B,YAAY,MAAc,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,WAAW,CAAC,GAAY;QACpC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC9B,eAAe,CAAC,QAAQ,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,eAAe,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;QACrC,CAAC;QACD,OAAO,eAAe,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,IAAW,GAAG,CAAC,GAAW;QACxB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACU,MAAM,CACjB,YAA0B,EAC1B,eAAyB,EACzB,gCAAyC;;YAEzC,MAAM,UAAU,GAAG;gBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,gCAAgC;aACjC,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,eAAe,CAAC,CAAC;YAChD,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;KAAA;CACF;AAxDD,0CAwDC"}

package/lib/utils/index.d.ts

@@ -1,4 +1 @@
 export { CreateUtil } from './createUtil';
-export { Log } from './logger';
-export { ForceGeneratorAdapter } from './adapter';
-export { Answers } from './types';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ForceGeneratorAdapter = exports.Log = exports.CreateUtil = void 0;
+exports.CreateUtil = void 0;
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
@@ -9,8 +9,4 @@ exports.ForceGeneratorAdapter = exports.Log = exports.CreateUtil = void 0;
  */
 var createUtil_1 = require("./createUtil");
 Object.defineProperty(exports, "CreateUtil", { enumerable: true, get: function () { return createUtil_1.CreateUtil; } });
-var logger_1 = require("./logger");
-Object.defineProperty(exports, "Log", { enumerable: true, get: function () { return logger_1.Log; } });
-var adapter_1 = require("./adapter");
-Object.defineProperty(exports, "ForceGeneratorAdapter", { enumerable: true, get: function () { return adapter_1.ForceGeneratorAdapter; } });
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,mCAA+B;AAAtB,6FAAA,GAAG,OAAA;AACZ,qCAAkD;AAAzC,gHAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA0C;AAAjC,wGAAA,UAAU,OAAA"}

package/lib/utils/types.d.ts

@@ -1,17 +1,13 @@
-interface StringKeyValueObject<V> {
-    [opt: string]: V;
-}
-export type Answers = StringKeyValueObject<string>;
-export interface CreateOutput {
+export type CreateOutput = {
     outputDir: string;
     created: string[];
     rawOutput: string;
-}
+};
 /**
  * Available Template types
  * Each template type must have a corresponding generator class:
  * - generator class file should locate in generators/
- * - generator class file should default export a generator class extending SfdxGenerator
+ * - generator class file should default export a generator class extending SfGenerator
  * - generator class file should have a name same as the type name, except with the first letter lowercased
  */
 export declare enum TemplateType {

package/lib/utils/types.js

@@ -1,11 +1,17 @@
 "use strict";
+/*
+ * Copyright (c) 2019, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateType = void 0;
 /**
  * Available Template types
  * Each template type must have a corresponding generator class:
  * - generator class file should locate in generators/
- * - generator class file should default export a generator class extending SfdxGenerator
+ * - generator class file should default export a generator class extending SfGenerator
  * - generator class file should have a name same as the type name, except with the first letter lowercased
  */
 var TemplateType;

package/lib/utils/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":";;;AAgBA;;;;;;GAMG;AACH,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB,yEAAiB,CAAA;IACjB,yDAAS,CAAA;IACT,6DAAW,CAAA;IACX,+DAAY,CAAA;IACZ,2EAAkB,CAAA;IAClB,mEAAc,CAAA;IACd,2EAAkB,CAAA;IAClB,iEAAa,CAAA;IACb,qDAAO,CAAA;IACP,+EAAoB,CAAA;IACpB,sEAAe,CAAA;IACf,oEAAc,CAAA;AAChB,CAAC,EAbW,YAAY,4BAAZ,YAAY,QAavB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAQH;;;;;;GAMG;AACH,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB,yEAAiB,CAAA;IACjB,yDAAS,CAAA;IACT,6DAAW,CAAA;IACX,+DAAY,CAAA;IACZ,2EAAkB,CAAA;IAClB,mEAAc,CAAA;IACd,2EAAkB,CAAA;IAClB,iEAAa,CAAA;IACb,qDAAO,CAAA;IACP,+EAAoB,CAAA;IACpB,sEAAe,CAAA;IACf,oEAAc,CAAA;AAChB,CAAC,EAbW,YAAY,4BAAZ,YAAY,QAavB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "61.0.1",
+  "version": "61.1.0",
   "salesforceApiVersion": "61",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
@@ -15,28 +15,24 @@
   "dependencies": {
     "@salesforce/core": "^7.3.10",
     "@salesforce/kit": "^3.1.2",
+    "ejs": "^3.1.10",
     "got": "^11.8.2",
     "hpagent": "^1.2.0",
     "mime-types": "^2.1.35",
     "proxy-from-env": "^1.1.0",
     "tar": "^6.2.0",
-    "tslib": "^2.6.2",
-    "yeoman-environment": "^3.9.1",
-    "yeoman-generator": "^5.6.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@salesforce/dev-config": "^4.1.0",
     "@salesforce/dev-scripts": "^6.0.3",
     "@salesforce/prettier-config": "^0.0.3",
     "@types/chai-as-promised": "^7.1.8",
-    "@types/fs-extra": "^11.0.4",
+    "@types/ejs": "^3.1.5",
     "@types/got": "^9.6.12",
     "@types/mime-types": "^2.1.4",
     "@types/proxy-from-env": "^1.0.4",
     "@types/tar": "^6.1.8",
-    "@types/yeoman-assert": "^3.1.4",
-    "@types/yeoman-environment": "^2.10.11",
-    "@types/yeoman-generator": "^5.2.14",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",
     "chai": "^4.3.10",
@@ -59,10 +55,9 @@
     "pretty-quick": "^3.1.0",
     "shelljs": "^0.8.5",
     "shx": "^0.3.4",
-    "sinon": "^17.0.1",
+    "sinon": "^18",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5",
-    "yeoman-assert": "^3.1.1"
+    "typescript": "^5.4.5"
   },
   "engines": {
     "node": ">=18.18.2"
@@ -79,7 +74,7 @@
     "compile": "tsc -b",
     "lint": "eslint -c .eslintrc.json --ext .ts ./src ./test",
     "lint:fix": "eslint -c .eslintrc.json --ext .ts ./src ./test --fix",
-    "test": "nyc --exclude src/i18n/localization.ts --extension .ts mocha --parallel --forbid-only \"test/**/*.test.ts\"",
+    "test": "nyc --exclude src/i18n/localization.ts --extension .ts mocha --parallel --forbid-only \"test/**/*.test.ts\" --timeout 600000",
     "prepare": "husky install"
   },
   "config": {

package/lib/generators/sfdxGenerator.d.ts

@@ -1,32 +0,0 @@
-import * as Generator from 'yeoman-generator';
-import { TemplateOptions } from '../utils/types';
-/**
- * Base class for generators
- */
-export declare abstract class SfdxGenerator<TOptions extends TemplateOptions> extends Generator<Generator.GeneratorOptions> {
-    options: TOptions;
-    /**
-     * Set by sourceRootWithPartialPath called in generator
-     */
-    builtInTemplatesRootPath?: string;
-    protected outputdir: string;
-    protected apiversion: string;
-    /**
-     * The constructor for the SFDXGenerator.
-     *
-     * @param args arguments to pass to the yeoman generator constructor.
-     * @param options SFDXGenerator specific options.
-     * @param features The yeoman GeneratorFeatures. Defaults to a customInstallTask of false in order to skip the automatic npm/yarn install. Override to true if you need to run the package manager install.
-     */
-    constructor(args: string | string[], options: TOptions, features?: Generator.GeneratorFeatures);
-    /**
-     * Validate provided options
-     */
-    abstract validateOptions(): void;
-    /**
-     * Set source root to built-in templates or custom templates root if available.
-     * @param partialPath the relative path from the templates folder to templates root folder.
-     */
-    sourceRootWithPartialPath(partialPath: string): void;
-    templatePath(...paths: string[]): string;
-}

package/lib/generators/sfdxGenerator.js

@@ -1,69 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfdxGenerator = void 0;
-const fs = require("fs");
-const path = require("path");
-const Generator = require("yeoman-generator");
-const templateService_1 = require("../service/templateService");
-/**
- * Base class for generators
- */
-class SfdxGenerator extends Generator {
-    /**
-     * The constructor for the SFDXGenerator.
-     *
-     * @param args arguments to pass to the yeoman generator constructor.
-     * @param options SFDXGenerator specific options.
-     * @param features The yeoman GeneratorFeatures. Defaults to a customInstallTask of false in order to skip the automatic npm/yarn install. Override to true if you need to run the package manager install.
-     */
-    constructor(args, options, 
-    // custom install task set to true keeps us from getting a warning message about a missing package.json file.
-    // Note for generators that need an npm install it should be set to false.
-    features = {
-        customInstallTask: true,
-    }) {
-        var _a, _b;
-        super(args, options, features);
-        this.apiversion =
-            (_a = options.apiversion) !== null && _a !== void 0 ? _a : templateService_1.TemplateService.getDefaultApiVersion();
-        this.outputdir = (_b = options.outputdir) !== null && _b !== void 0 ? _b : process.cwd();
-        this.validateOptions();
-    }
-    /**
-     * Set source root to built-in templates or custom templates root if available.
-     * @param partialPath the relative path from the templates folder to templates root folder.
-     */
-    sourceRootWithPartialPath(partialPath) {
-        this.builtInTemplatesRootPath = path.join(__dirname, '..', 'templates', partialPath);
-        const { customTemplatesRootPath } = templateService_1.TemplateService.getInstance();
-        if (!customTemplatesRootPath) {
-            this.sourceRoot(path.join(this.builtInTemplatesRootPath));
-        }
-        else {
-            if (fs.existsSync(path.join(customTemplatesRootPath, partialPath))) {
-                this.sourceRoot(path.join(customTemplatesRootPath, partialPath));
-            }
-        }
-    }
-    templatePath(...paths) {
-        // The template paths are relative to the generator's source root
-        // If we have set a custom template root, the source root should have already been set.
-        // Otherwise we'll fallback to the built-in templates
-        const customPath = super.templatePath(...paths);
-        if (fs.existsSync(customPath)) {
-            return customPath;
-        }
-        else {
-            // files that are builtin and not in the custom template folder
-            return super.templatePath(path.join(this.builtInTemplatesRootPath, ...paths));
-        }
-    }
-}
-exports.SfdxGenerator = SfdxGenerator;
-//# sourceMappingURL=sfdxGenerator.js.map

package/lib/generators/sfdxGenerator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sfdxGenerator.js","sourceRoot":"","sources":["../../src/generators/sfdxGenerator.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,6BAA6B;AAC7B,8CAA8C;AAC9C,gEAA6D;AAG7D;;GAEG;AACH,MAAsB,aAEpB,SAAQ,SAAqC;IAU7C;;;;;;OAMG;IACH,YACE,IAAuB,EACvB,OAAiB;IACjB,6GAA6G;IAC7G,0EAA0E;IAC1E,WAAwC;QACtC,iBAAiB,EAAE,IAAI;KACxB;;QAED,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,UAAU;YACb,MAAA,OAAO,CAAC,UAAU,mCAAI,iCAAe,CAAC,oBAAoB,EAAE,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACpD,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAOD;;;OAGG;IACI,yBAAyB,CAAC,WAAmB;QAClD,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACvC,SAAS,EACT,IAAI,EACJ,WAAW,EACX,WAAW,CACZ,CAAC;QACF,MAAM,EAAE,uBAAuB,EAAE,GAAG,iCAAe,CAAC,WAAW,EAAE,CAAC;QAClE,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;gBACnE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;IACH,CAAC;IAEM,YAAY,CAAC,GAAG,KAAe;QACpC,iEAAiE;QACjE,uFAAuF;QACvF,qDAAqD;QACrD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,CAAC;QAChD,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,+DAA+D;YAC/D,OAAO,KAAK,CAAC,YAAY,CACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAyB,EAAE,GAAG,KAAK,CAAC,CACpD,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA3ED,sCA2EC"}

package/lib/utils/adapter.d.ts

@@ -1,8 +0,0 @@
-import * as generator from 'yeoman-generator';
-import { Answers } from './types';
-export declare class ForceGeneratorAdapter {
-    private _log;
-    log: import("./logger").ILogRef;
-    constructor();
-    prompt(opt: [generator.Questions], cb: () => void): Promise<Answers>;
-}

package/lib/utils/adapter.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ForceGeneratorAdapter = void 0;
-const logger_1 = require("./logger");
-class ForceGeneratorAdapter {
-    constructor() {
-        this._log = new logger_1.Log();
-        this.log = (0, logger_1.getYeomanLogger)(this._log);
-    }
-    prompt(opt, cb) {
-        const promptPromise = new Promise((resolve) => {
-            const answers = {};
-            answers[0] = '';
-            resolve(answers);
-        });
-        promptPromise.then(cb || undefined).catch(() => {
-            throw new Error('Error resolving conflicting files');
-        });
-        return promptPromise;
-    }
-}
-exports.ForceGeneratorAdapter = ForceGeneratorAdapter;
-//# sourceMappingURL=adapter.js.map

package/lib/utils/adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/utils/adapter.ts"],"names":[],"mappings":";;;AAOA,qCAAgD;AAGhD,MAAa,qBAAqB;IAIhC;QAHQ,SAAI,GAAG,IAAI,YAAG,EAAE,CAAC;QAClB,QAAG,GAAG,IAAA,wBAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzB,CAAC;IAET,MAAM,CAAC,GAA0B,EAAE,EAAc;QACtD,MAAM,aAAa,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;YACrD,MAAM,OAAO,GAAY,EAAE,CAAC;YAC5B,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAjBD,sDAiBC"}

package/lib/utils/logger.d.ts

@@ -1,40 +0,0 @@
-export declare class Log {
-    private output;
-    private cleanOutput;
-    [index: string]: any;
-    constructor();
-    getOutput(): string;
-    getCleanOutput(): string[];
-    write(...args: [string]): Log;
-    pad(status: string): string;
-    setOutput(text: string): void;
-    setCleanOutput(cleanText: string[]): void;
-    clear(): void;
-}
-export interface ILogRef {
-    (args: string): void;
-    clear(): void;
-    setCleanOutput(...args: string[]): void;
-    setOutput(text: string): void;
-    pad(status: string): string;
-    write(arg: string): ILogRef;
-    getCleanOutput(): string[];
-    getOutput(): string;
-    skip(arg: string): ILogRef;
-    force(arg: string): ILogRef;
-    create(arg: string): ILogRef;
-    invoke(arg: string): ILogRef;
-    conflict(arg: string): ILogRef;
-    identical(arg: string): ILogRef;
-    info(arg: string): ILogRef;
-}
-/**
- * The Yeoman adapter had a log property that has the unusual
- * requirement of being both a function and an object. See the yeoman
- * environment log implementation
- * https://github.com/yeoman/environment/blob/5f0e87b696c4926ba69b9fbd83e4486a02492fcc/lib/util/log.js#L59
- *
- * @param log The Log instance for the Yeoman logger to utilize.
- * @returns The log instance that is both a function and an object.
- */
-export declare const getYeomanLogger: (log: Log) => ILogRef;

package/lib/utils/logger.js

@@ -1,130 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2021, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYeomanLogger = exports.Log = void 0;
-const util = require("util");
-const padding = ' ';
-const statuses = [
-    'skip',
-    'force',
-    'create',
-    'invoke',
-    'conflict',
-    'identical',
-    'info',
-];
-class Log {
-    constructor() {
-        this.output = '';
-        this.cleanOutput = [];
-        for (const status of statuses) {
-            this[status] = (arg) => {
-                if (status !== 'identical' && status !== 'conflict') {
-                    this.cleanOutput.push(arg);
-                }
-                this.write(this.pad(status)).write(padding);
-                this.write(`${arg}\n`);
-                return this;
-            };
-        }
-    }
-    getOutput() {
-        return this.output;
-    }
-    getCleanOutput() {
-        return this.cleanOutput;
-    }
-    write(...args) {
-        /* eslint prefer-spread: off */
-        this.output = this.output + util.format.apply(util, args);
-        return this;
-    }
-    pad(status) {
-        const max = 'identical'.length;
-        const delta = max - status.length;
-        return delta ? new Array(delta + 1).join(' ') + status : status;
-    }
-    setOutput(text) {
-        this.output = text;
-    }
-    setCleanOutput(cleanText) {
-        this.cleanOutput = cleanText;
-    }
-    clear() {
-        this.output = '';
-        this.cleanOutput = [];
-    }
-}
-exports.Log = Log;
-/**
- * The Yeoman adapter had a log property that has the unusual
- * requirement of being both a function and an object. See the yeoman
- * environment log implementation
- * https://github.com/yeoman/environment/blob/5f0e87b696c4926ba69b9fbd83e4486a02492fcc/lib/util/log.js#L59
- *
- * @param log The Log instance for the Yeoman logger to utilize.
- * @returns The log instance that is both a function and an object.
- */
-const getYeomanLogger = (log) => {
-    const yeomanLogger = (args) => {
-        log.info(args);
-    };
-    yeomanLogger.skip = (args) => {
-        log.skip(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.force = (args) => {
-        log.force(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.create = (args) => {
-        log.create(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.invoke = (args) => {
-        log.invoke(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.conflict = (args) => {
-        log.conflict(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.identical = (args) => {
-        log.identical(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.info = (args) => {
-        log.info(args);
-        return yeomanLogger;
-    };
-    yeomanLogger.clear = () => {
-        log.clear();
-    };
-    yeomanLogger.setCleanOutput = (...args) => {
-        log.setCleanOutput(args);
-    };
-    yeomanLogger.setOutput = (text) => {
-        log.setOutput(text);
-    };
-    yeomanLogger.pad = (status) => {
-        return log.pad(status);
-    };
-    yeomanLogger.write = (...args) => {
-        log.write(...args);
-        return yeomanLogger;
-    };
-    yeomanLogger.getCleanOutput = () => {
-        return log.getCleanOutput();
-    };
-    yeomanLogger.getOutput = () => {
-        return log.getOutput();
-    };
-    return yeomanLogger;
-};
-exports.getYeomanLogger = getYeomanLogger;
-//# sourceMappingURL=logger.js.map

package/lib/utils/logger.js.map

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