Fix windows issues

src/RokuDeploy.spec.ts

@@ -11,7 +11,7 @@ import * as glob from 'glob';
 import type { BeforeZipCallbackInfo } from './RokuDeploy';
 import { RokuDeploy } from './RokuDeploy';
 import * as errors from './Errors';
-import { util, standardizePath as s } from './util';
+import { util, standardizePath as s, standardizePathPosix as sp } from './util';
 import type { FileEntry, RokuDeployOptions } from './RokuDeployOptions';
 import { cwd, expectPathExists, expectPathNotExists, expectThrowsAsync, outDir, rootDir, stagingDir, tempDir, writeFiles } from './testUtils.spec';
 import { createSandbox } from 'sinon';
@@ -1722,7 +1722,7 @@ describe('index', () => {
             await rokuDeploy.prepublishToStaging({
                 files: [
                     {
-                        src: `${rootDir}/manifest`,
+                        src: sp`${rootDir}/manifest`,
                         dest: ''
                     },
                     {
@@ -2093,7 +2093,7 @@ describe('index', () => {
                 src: `long/source/path`,
                 dest: `long/dest/path`
             }])).to.eql([{
-                src: s`long/source/path`,
+                src: sp`long/source/path`,
                 dest: s`long/dest/path`
             }]);
         });
@@ -2151,7 +2151,7 @@ describe('index', () => {
                 src: 'manifest',
                 dest: undefined
             }, {
-                src: s`source/main.brs`,
+                src: sp`source/main.brs`,
                 dest: undefined
             }]);
         });
@@ -2163,7 +2163,7 @@ describe('index', () => {
                     dest: 'source/config.brs'
                 }
             ])).to.eql([{
-                src: s`source/config.dev.brs`,
+                src: sp`source/config.dev.brs`,
                 dest: s`source/config.brs`
             }]);
         });
@@ -2651,7 +2651,7 @@ describe('index', () => {
 
     describe('getFilePaths', () => {
         const otherProjectName = 'otherProject';
-        const otherProjectDir = s`${rootDir}/../${otherProjectName}`;
+        const otherProjectDir = sp`${rootDir}/../${otherProjectName}`;
         //create baseline project structure
         beforeEach(() => {
             fsExtra.ensureDirSync(`${rootDir}/components/emptyFolder`);
@@ -3139,15 +3139,15 @@ describe('index', () => {
 
             //dest not specified
             expect(await rokuDeploy.getFilePaths([{
-                src: s`${cwd}/README.md`
+                src: sp`${cwd}/README.md`
             }], options.rootDir)).to.eql([{
                 src: s`${cwd}/README.md`,
                 dest: s`README.md`
             }]);
 
             //dest specified
             expect(await rokuDeploy.getFilePaths([{
-                src: path.join(cwd, 'README.md'),
+                src: sp`${cwd}/README.md`,
                 dest: 'docs/README.md'
             }], options.rootDir)).to.eql([{
                 src: s`${cwd}/README.md`,
@@ -3157,7 +3157,7 @@ describe('index', () => {
             let paths: any[];
 
             paths = await rokuDeploy.getFilePaths([{
-                src: s`${cwd}/README.md`,
+                src: sp`${cwd}/README.md`,
                 dest: s`docs/README.md`
             }], outDir);
 
@@ -3169,7 +3169,7 @@ describe('index', () => {
             //top-level string paths pointing to files outside the root should thrown an exception
             await expectThrowsAsync(async () => {
                 paths = await rokuDeploy.getFilePaths([
-                    s`${cwd}/README.md`
+                    sp`${cwd}/README.md`
                 ], outDir);
             });
         });
@@ -3180,7 +3180,7 @@ describe('index', () => {
             ]);
             expect(
                 await rokuDeploy.getFilePaths([{
-                    src: path.join('..', 'README.md')
+                    src: sp`../README.md`
                 }], rootDir)
             ).to.eql([{
                 src: s`${rootDir}/../README.md`,
@@ -3189,7 +3189,7 @@ describe('index', () => {
 
             expect(
                 await rokuDeploy.getFilePaths([{
-                    src: path.join('..', 'README.md'),
+                    src: sp`../README.md`,
                     dest: 'docs/README.md'
                 }], rootDir)
             ).to.eql([{
@@ -3204,17 +3204,17 @@ describe('index', () => {
             ]);
             await expectThrowsAsync(
                 rokuDeploy.getFilePaths([
-                    path.join('..', 'README.md')
+                    path.posix.join('..', 'README.md')
                 ], outDir)
             );
         });
 
         it('supports overriding paths', async () => {
             let paths = await rokuDeploy.getFilePaths([{
-                src: s`${rootDir}/components/component1.brs`,
+                src: sp`${rootDir}/components/component1.brs`,
                 dest: 'comp1.brs'
             }, {
-                src: s`${rootDir}/components/screen1/screen1.brs`,
+                src: sp`${rootDir}/components/screen1/screen1.brs`,
                 dest: 'comp1.brs'
             }], rootDir);
             expect(paths).to.be.lengthOf(1);

src/RokuDeploy.ts

@@ -77,7 +77,7 @@ export class RokuDeploy {
                 //objects with src: string
                 if (typeof entry.src === 'string') {
                     result.push({
-                        src: util.standardizePath(entry.src),
+                        src: entry.src,
                         dest: util.standardizePath(entry.dest)
                     });
 
@@ -86,7 +86,7 @@ export class RokuDeploy {
                     //create a distinct entry for each item in the src array
                     for (let srcEntry of entry.src) {
                         result.push({
-                            src: util.standardizePath(srcEntry),
+                            src: srcEntry,
                             dest: util.standardizePath(entry.dest)
                         });
                     }

src/util.ts

@@ -46,11 +46,21 @@ export class Util {
         if (!thePath) {
             return thePath;
         }
-        return path.normalize(
-            thePath.replace(/[\/\\]+/g, path.sep)
-        );
+        return path.normalize(thePath).replace(/[\/\\]+/g, path.sep);
     }
 
+    /**
+     * Normalize path and replace all directory separators with current OS separators
+     * @param thePath
+     */
+    public standardizePathPosix(thePath: string) {
+        if (!thePath) {
+            return thePath;
+        }
+        return path.normalize(thePath).replace(/[\/\\]+/g, '/');
+    }
+
+
     /**
      * Do a case-insensitive string replacement
      * @param subject the string that will have its contents replaced
@@ -232,3 +242,16 @@ export function standardizePath(stringParts, ...expressions: any[]) {
         result.join('')
     );
 }
+
+/**
+ * A tagged template literal function for standardizing the path and making all path separators forward slashes
+ */
+export function standardizePathPosix(stringParts, ...expressions: any[]) {
+    let result = [];
+    for (let i = 0; i < stringParts.length; i++) {
+        result.push(stringParts[i], expressions[i]);
+    }
+    return util.standardizePathPosix(
+        result.join('')
+    );
+}