Sm/fixes (#543)

* fix: align base class with TemplateOptions interface, update deps, fix Windows UT
forcedotcom · Feb 9, 2023 · 4ae7c3a · 4ae7c3a
1 parent b5e880f
commit 4ae7c3a
Show file tree

Hide file tree

Showing 18 changed files with 204 additions and 275 deletions.
diff --git a/.github/workflows/unitTestsWindows.yml b/.github/workflows/unitTestsWindows.yml
@@ -15,7 +15,6 @@ jobs:
         run: git config --global core.autocrlf false
         shell: bash
       - uses: actions/checkout@v3
-      - uses: salesforcecli/github-workflows/.github/actions/windowsCachePerf@main
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node_version }}

diff --git a/package.json b/package.json
@@ -19,8 +19,7 @@
     "mime-types": "^2.1.27",
     "proxy-agent": "^5.0.0",
     "proxy-from-env": "^1.1.0",
-    "shelljs": "^0.8.5",
-    "tar": "^6.1.10",
+    "tar": "^6.1.13",
     "tslib": "^1",
     "yeoman-environment": "^3.9.1",
     "yeoman-generator": "^5.6.1"
@@ -59,6 +58,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",
+    "shelljs": "^0.8.5",
     "shx": "^0.3.4",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
@@ -88,4 +88,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}
diff --git a/src/generators/analyticsTemplateGenerator.ts b/src/generators/analyticsTemplateGenerator.ts
@@ -19,14 +19,14 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
   public validateOptions(): void {
     CreateUtil.checkInputs(this.options.templatename);
 
-    const fileparts = path.resolve(this.options.outputdir).split(path.sep);
+    const fileparts = path.resolve(this.outputdir).split(path.sep);
     if (!fileparts.includes('waveTemplates')) {
       throw new Error(nls.localize('MissingWaveTemplatesDir'));
     }
   }
 
   public writing(): void {
-    const { outputdir, templatename, apiversion } = this.options;
+    const { templatename } = this.options;
     // tslint:disable-next-line:no-unused-expression
     this.fs.copyTpl(
       this.templatePath(
@@ -38,7 +38,7 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
       ),
       this.destinationPath(
         path.join(
-          outputdir,
+          this.outputdir,
           templatename,
           'dashboards',
           templatename + 'Dashboard.json'
@@ -51,21 +51,23 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
         path.join('DefaultAnalyticsTemplate', 'app-to-template-rules.json')
       ),
       this.destinationPath(
-        path.join(outputdir, templatename, 'app-to-template-rules.json')
+        path.join(this.outputdir, templatename, 'app-to-template-rules.json')
       ),
       {}
     );
     this.fs.copyTpl(
       this.templatePath(path.join('DefaultAnalyticsTemplate', 'folder.json')),
-      this.destinationPath(path.join(outputdir, templatename, 'folder.json')),
+      this.destinationPath(
+        path.join(this.outputdir, templatename, 'folder.json')
+      ),
       { templateName: templatename }
     );
     this.fs.copyTpl(
       this.templatePath(
         path.join('DefaultAnalyticsTemplate', 'releaseNotes.html')
       ),
       this.destinationPath(
-        path.join(outputdir, templatename, 'releaseNotes.html')
+        path.join(this.outputdir, templatename, 'releaseNotes.html')
       ),
       {}
     );
@@ -74,33 +76,33 @@ export default class AnalyticsTemplateGenerator extends SfdxGenerator<AnalyticsT
         path.join('DefaultAnalyticsTemplate', 'template-info.json')
       ),
       this.destinationPath(
-        path.join(outputdir, templatename, 'template-info.json')
+        path.join(this.outputdir, templatename, 'template-info.json')
       ),
       {
         templateName: templatename,
-        sourceApiVersion: apiversion,
+        sourceApiVersion: this.apiversion,
       }
     );
     this.fs.copyTpl(
       this.templatePath(
         path.join('DefaultAnalyticsTemplate', 'template-to-app-rules.json')
       ),
       this.destinationPath(
-        path.join(outputdir, templatename, 'template-to-app-rules.json')
+        path.join(this.outputdir, templatename, 'template-to-app-rules.json')
       ),
       {}
     );
     this.fs.copyTpl(
       this.templatePath(path.join('DefaultAnalyticsTemplate', 'ui.json')),
-      this.destinationPath(path.join(outputdir, templatename, 'ui.json')),
+      this.destinationPath(path.join(this.outputdir, templatename, 'ui.json')),
       {}
     );
     this.fs.copyTpl(
       this.templatePath(
         path.join('DefaultAnalyticsTemplate', 'variables.json')
       ),
       this.destinationPath(
-        path.join(outputdir, templatename, 'variables.json')
+        path.join(this.outputdir, templatename, 'variables.json')
       ),
       {}
     );

diff --git a/src/generators/apexClassGenerator.ts b/src/generators/apexClassGenerator.ts
@@ -21,16 +21,18 @@ export default class ApexClassGenerator extends SfdxGenerator<ApexClassOptions>
   }
 
   public writing(): void {
-    const { template, outputdir, classname, apiversion } = this.options;
+    const { template, classname } = this.options;
     this.fs.copyTpl(
       this.templatePath(`${template}.cls`),
-      this.destinationPath(path.join(outputdir, `${classname}.cls`)),
+      this.destinationPath(path.join(this.outputdir, `${classname}.cls`)),
       { apiName: classname }
     ),
       this.fs.copyTpl(
         this.templatePath('_class.cls-meta.xml'),
-        this.destinationPath(path.join(outputdir, `${classname}.cls-meta.xml`)),
-        { apiName: classname, apiVersion: apiversion }
+        this.destinationPath(
+          path.join(this.outputdir, `${classname}.cls-meta.xml`)
+        ),
+        { apiName: classname, apiVersion: this.apiversion }
       );
   }
 }
diff --git a/src/generators/apexTriggerGenerator.ts b/src/generators/apexTriggerGenerator.ts
@@ -19,25 +19,18 @@ export default class ApexTriggerGenerator extends SfdxGenerator<ApexTriggerOptio
     CreateUtil.checkInputs(this.options.template);
   }
   public writing(): void {
-    const {
-      template,
-      outputdir,
-      triggername,
-      apiversion,
-      triggerevents,
-      sobject,
-    } = this.options;
+    const { template, triggername, triggerevents, sobject } = this.options;
     this.fs.copyTpl(
       this.templatePath(`${template}.trigger`),
-      this.destinationPath(path.join(outputdir, `${triggername}.trigger`)),
+      this.destinationPath(path.join(this.outputdir, `${triggername}.trigger`)),
       { triggername, sobject, triggerEvents: triggerevents }
-    ),
-      this.fs.copyTpl(
-        this.templatePath('_trigger.trigger-meta.xml'),
-        this.destinationPath(
-          path.join(outputdir, `${triggername}.trigger-meta.xml`)
-        ),
-        { apiVersion: apiversion }
-      );
+    );
+    this.fs.copyTpl(
+      this.templatePath('_trigger.trigger-meta.xml'),
+      this.destinationPath(
+        path.join(this.outputdir, `${triggername}.trigger-meta.xml`)
+      ),
+      { apiVersion: this.apiversion }
+    );
   }
 }
diff --git a/src/generators/lightningAppGenerator.ts b/src/generators/lightningAppGenerator.ts
@@ -20,68 +20,74 @@ export default class LightningAppGenerator extends SfdxGenerator<LightningAppOpt
     CreateUtil.checkInputs(this.options.appname);
     CreateUtil.checkInputs(this.options.template);
 
-    const fileparts = path.resolve(this.options.outputdir).split(path.sep);
+    const fileparts = path.resolve(this.outputdir).split(path.sep);
     if (!fileparts.includes('aura') && !this.options.internal) {
       throw new Error(nls.localize('MissingAuraDir'));
     }
   }
 
   public writing(): void {
-    const { template, outputdir, appname, apiversion, internal } = this.options;
+    const { template, appname, internal } = this.options;
     // tslint:disable-next-line:no-unused-expression
     if (!internal) {
       this.fs.copyTpl(
         this.templatePath('_auradefinitionbundle.app-meta.xml'),
         this.destinationPath(
-          path.join(outputdir, appname, `${appname}.app-meta.xml`)
+          path.join(this.outputdir, appname, `${appname}.app-meta.xml`)
         ),
         {
-          apiVersion: apiversion,
+          apiVersion: this.apiversion,
           description: nls.localize('LightningAppBundle'),
         }
       );
     }
     this.fs.copyTpl(
       this.templatePath(`${template}.app`),
-      this.destinationPath(path.join(outputdir, appname, `${appname}.app`)),
+      this.destinationPath(
+        path.join(this.outputdir, appname, `${appname}.app`)
+      ),
       {}
     ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningAuradoc.auradoc'),
         this.destinationPath(
-          path.join(outputdir, appname, `${appname}.auradoc`)
+          path.join(this.outputdir, appname, `${appname}.auradoc`)
         ),
         {}
       ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningController.js'),
         this.destinationPath(
-          path.join(outputdir, appname, `${appname}Controller.js`)
+          path.join(this.outputdir, appname, `${appname}Controller.js`)
         ),
         {}
       ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningCss.css'),
-        this.destinationPath(path.join(outputdir, appname, `${appname}.css`)),
+        this.destinationPath(
+          path.join(this.outputdir, appname, `${appname}.css`)
+        ),
         {}
       ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningHelper.js'),
         this.destinationPath(
-          path.join(outputdir, appname, `${appname}Helper.js`)
+          path.join(this.outputdir, appname, `${appname}Helper.js`)
         ),
         {}
       ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningRenderer.js'),
         this.destinationPath(
-          path.join(outputdir, appname, `${appname}Renderer.js`)
+          path.join(this.outputdir, appname, `${appname}Renderer.js`)
         ),
         {}
       ),
       this.fs.copyTpl(
         this.templatePath('DefaultLightningSVG.svg'),
-        this.destinationPath(path.join(outputdir, appname, `${appname}.svg`)),
+        this.destinationPath(
+          path.join(this.outputdir, appname, `${appname}.svg`)
+        ),
         {}
       );
   }