Fix build error when source or target path occurs 1+ times in path

Closes CommunitySolidServer/CommunitySolidServer#511

Author: rubensworks

bin/componentsjs-generator.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import * as fs from 'fs';
+import * as Path from 'path';
 import * as minimist from 'minimist';
 import { Generator } from '../lib/generate/Generator';
 import { ResolutionContext } from '../lib/resolution/ResolutionContext';
@@ -24,12 +25,13 @@ const args = minimist(process.argv.slice(2));
 if (args.help) {
   showHelp();
 } else {
+  const packageRootDirectory = Path.posix.join(process.cwd(), args.p || '');
   const generator = new Generator({
     resolutionContext: new ResolutionContext(),
     pathDestination: {
-      packageRootDirectory: args.p || process.cwd(),
-      originalPath: args.s || 'lib',
-      replacementPath: args.c || 'components',
+      packageRootDirectory,
+      originalPath: Path.posix.join(packageRootDirectory, args.s || 'lib'),
+      replacementPath: Path.posix.join(packageRootDirectory, args.c || 'components'),
     },
     fileExtension: args.e || 'jsonld',
     logLevel: args.l || 'info',

lib/serialize/ComponentConstructor.ts

@@ -497,8 +497,17 @@ export interface ComponentConstructorArgs {
 }
 
 export interface PathDestinationDefinition {
+  /**
+   * Absolute path to the package root.
+   */
   packageRootDirectory: string;
+  /**
+   * Absolute path to the package source directory.
+   */
   originalPath: string;
+  /**
+   * Absolute path to the package components target directory.
+   */
   replacementPath: string;
 }
 

lib/serialize/ComponentSerializer.ts

@@ -51,7 +51,6 @@ export class ComponentSerializer {
    */
   public async serializeComponentsIndex(componentsIndex: ComponentDefinitionsIndex): Promise<string> {
     const filePathBase = Path.join(
-      this.pathDestination.packageRootDirectory,
       this.pathDestination.replacementPath,
       'components',
     );
@@ -65,7 +64,6 @@ export class ComponentSerializer {
    */
   public async serializeContext(contextRaw: ContextRaw): Promise<string> {
     const filePathBase = Path.join(
-      this.pathDestination.packageRootDirectory,
       this.pathDestination.replacementPath,
       'context',
     );

test/serialize/ComponentSerialize.test.ts

@@ -12,8 +12,8 @@ describe('ComponentSerializer', () => {
       resolutionContext,
       pathDestination: {
         packageRootDirectory: '/',
-        originalPath: 'src',
-        replacementPath: 'components',
+        originalPath: '/src',
+        replacementPath: '/components',
       },
       fileExtension: 'jsonld',
       indentation: '  ',