Version 0.2.10: Solve several bugs

Author: piraces

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-devops-bicep-task",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "description": "Tasks for installing Bicep CLI and running Bicep CLI build commands",
   "main": "index.js",
   "scripts": {

package.json

@@ -16,7 +16,7 @@
     "version": {
       "Major": 0,
       "Minor": 2,
-      "Patch": 7
+      "Patch": 10
     },
     "instanceNameFormat": "Install Bicep CLI",
     "inputs": [

src/install/task.json

@@ -8,11 +8,11 @@ export function getFilesList(directory: string): string[] {
         directoryToGetFiles = path.join(directoryToGetFiles, '**');
     }
     directoryToGetFiles = directoryToGetFiles.replace(/\\/g, '/');
-    return glob.sync(directoryToGetFiles);
+    return glob.sync(directoryToGetFiles, { nodir: true });
 }
 
-export function createDirectoryIfNotExists(directory: string): void {
-    const dirnamePath = path.dirname(directory);
+export function createDirectoryIfNotExists(directory: string, checkDirname: boolean): void {
+    const dirnamePath = checkDirname ? path.dirname(directory) : directory;
     if (!fs.existsSync(dirnamePath)) {
         fs.mkdirSync(dirnamePath, { recursive: true });
     }

src/common/enums/processingType.ts src/run/common/enums/processingType.tssrc/common/enums/processingType.ts renamed to src/run/common/enums/processingType.ts

@@ -2,8 +2,8 @@ import * as path from 'path';
 import { platform } from 'os';
 import * as taskLib from 'azure-pipelines-task-lib/task';
 import * as toolLib from 'azure-pipelines-tool-lib/tool';
-import { createDirectoryIfNotExists, getFilesList } from '../common/fileUtils';
-import { ProcessingType } from '../common/enums/processingType';
+import { createDirectoryIfNotExists, getFilesList } from './common/fileUtils';
+import { ProcessingType } from './common/enums/processingType';
 
 let processType: string | undefined;
 let sourceDirectory: string | undefined;
@@ -119,12 +119,12 @@ async function run() {
         } else if (outputFile && processingType === ProcessingType.Single) {
             additionalArgsByInputs.push('--outfile');
             additionalArgsByInputs.push(outputFile);
-            createDirectoryIfNotExists(outputFile);
+            createDirectoryIfNotExists(outputFile, true);
         } else if (outputDirectory) {
             taskLib.debug(`Output files will be stored in '${outputDirectory}'`);
             additionalArgsByInputs.push('--outdir');
             additionalArgsByInputs.push(outputDirectory);
-            createDirectoryIfNotExists(outputDirectory);
+            createDirectoryIfNotExists(outputDirectory, false);
         } else {
             taskLib.debug(
                 `No output directory specified... Output files will be stored in source directory: '${sourceDirectory}'`,

src/common/fileUtils.ts src/run/common/fileUtils.tssrc/common/fileUtils.ts renamed to src/run/common/fileUtils.ts

@@ -16,7 +16,7 @@
     "version": {
       "Major": 0,
       "Minor": 2,
-      "Patch": 7
+      "Patch": 10
     },
     "instanceNameFormat": "Run Bicep CLI build command",
     "inputs": [

src/run/index.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import { createDirectoryIfNotExists, getFilesList } from '../../src/common/fileUtils';
+import { createDirectoryIfNotExists, getFilesList } from '../../../src/run/common/fileUtils';
 
 jest.mock('fs');
 
@@ -35,7 +35,7 @@ describe('getFilesList perform valid actions', () => {
         getFilesList('./bicep_files');
         expect(globHasMagicMock).toHaveBeenCalled();
         expect(pathJoinMock).toHaveBeenCalled();
-        expect(globSyncMock).toHaveBeenCalledWith('bicep_files/**');
+        expect(globSyncMock).toHaveBeenCalledWith('bicep_files/**', { nodir: true });
     });
 
     test('if path has wildcards', () => {
@@ -44,7 +44,7 @@ describe('getFilesList perform valid actions', () => {
         getFilesList('./bicep_files/*.bicep');
         expect(globHasMagicMock).toHaveBeenCalled();
         expect(pathJoinMock).not.toHaveBeenCalled();
-        expect(globSyncMock).toHaveBeenCalledWith('./bicep_files/*.bicep');
+        expect(globSyncMock).toHaveBeenCalledWith('./bicep_files/*.bicep', { nodir: true });
     });
 });
 
@@ -54,15 +54,15 @@ describe('createDirectoryIfNotExists creates directory if not exists', () => {
     test('if path already exists', () => {
         prepareMocks(true);
 
-        createDirectoryIfNotExists('any_directory');
+        createDirectoryIfNotExists('any_directory', false);
         expect(existsSyncMock).toHaveBeenCalled();
         expect(mkdirSyncMock).not.toHaveBeenCalled();
     });
 
     test('if path not exists', () => {
         prepareMocks(false);
 
-        createDirectoryIfNotExists('any_directory');
+        createDirectoryIfNotExists('any_directory', false);
         expect(existsSyncMock).toHaveBeenCalled();
         expect(mkdirSyncMock).toHaveBeenCalled();
     });

src/run/task.json

@@ -1,4 +1,4 @@
-import { ProcessingType } from '../../src/common/enums/processingType';
+import { ProcessingType } from '../../src/run/common/enums/processingType';
 import { checkInputsAreValid, getProcessingTypeForFiles } from '../../src/run/index';
 
 describe('checkInputsAreValid throws correct errors', () => {

test/common/fileUtils.spec.ts test/run/common/fileUtils.spec.tstest/common/fileUtils.spec.ts renamed to test/run/common/fileUtils.spec.ts

@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "bicep-tasks",
-    "version": "0.2.7",
+    "version": "0.2.10",
     "name": "Bicep Tasks",
     "publisher": "piraces",
     "description": "Provides Azure DevOps tasks to install and run Microsoft Bicep CLI commands (cross-platform)",
@@ -54,14 +54,6 @@
       {
         "path": "node_modules",
         "packagePath": "run/node_modules"
-      },
-      {
-        "path": "src/common",
-        "packagePath": "install/common"
-      },
-      {
-        "path": "src/common",
-        "packagePath": "run/common"
       }
     ],
     "links": {