Merge 651882e into 9b60a46

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [unreleased]
 
 - when a nested dependency is imported directly, re-link all its dependents
+- [#527](https://github.com/teambit/bit/issues/527) rename structure property in bit.json
 
 ## [0.12.0-ext.11] - 2018-01-02
 

src/constants.js

@@ -84,11 +84,11 @@ export const DEFAULT_BINDINGS_PREFIX = '@bit';
 
 export const NODE_PATH_SEPARATOR = '.';
 
-export const DEFAULT_DIR_STRUCTURE = `${BITS_DIRNAME}/{namespace}/{name}`;
+export const DEFAULT_COMPONENTES_DIR = `${BITS_DIRNAME}/{namespace}/{name}`;
 
 export const DEFAULT_DIR_DEPENDENCIES = '.dependencies';
 
-export const DEFAULT_DIR_DEPENDENCIES_STRUCTURE = `${BITS_DIRNAME}/${DEFAULT_DIR_DEPENDENCIES}`;
+export const DEFAULT_DEPENDENCIES_DIR = `${BITS_DIRNAME}/${DEFAULT_DIR_DEPENDENCIES}`;
 
 export const DEFAULT_SEPARATOR = '/';
 

src/consumer/bit-json/consumer-bit-json.js

@@ -4,7 +4,7 @@ import R from 'ramda';
 import path from 'path';
 import AbstractBitJson from './abstract-bit-json';
 import { BitJsonNotFound, BitJsonAlreadyExists, InvalidBitJson } from './exceptions';
-import { BIT_JSON, DEFAULT_DIR_STRUCTURE, DEFAULT_DIR_DEPENDENCIES_STRUCTURE } from '../../constants';
+import { BIT_JSON, DEFAULT_COMPONENTES_DIR, DEFAULT_DEPENDENCIES_DIR } from '../../constants';
 
 function composePath(bitPath: string) {
   return path.join(bitPath, BIT_JSON);
@@ -19,7 +19,8 @@ export default class ConsumerBitJson extends AbstractBitJson {
   // path to remove while storing build artifacts. If, for example the code is in 'src' directory, and the component
   // is-string is in src/components/is-string, the dists files will be in dists/component/is-string (without the 'src')
   distEntry: ?string;
-  structure: Object; // directory structure templates where to store imported components and dependencies
+  componentsDefaultDirectory: string;
+  dependenciesDirectory: string;
   saveDependenciesAsComponents: boolean; // save hub dependencies as bit components rather than npm packages
 
   constructor({
@@ -32,24 +33,24 @@ export default class ConsumerBitJson extends AbstractBitJson {
     lang,
     distTarget,
     distEntry,
-    structure,
+    componentsDefaultDirectory,
+    dependenciesDirectory,
     bindingPrefix,
     extensions
   }) {
     super({ impl, spec, compiler, tester, dependencies, lang, bindingPrefix, extensions });
     this.distTarget = distTarget;
     this.distEntry = distEntry;
-    this.structure = structure || {
-      components: DEFAULT_DIR_STRUCTURE,
-      dependencies: DEFAULT_DIR_DEPENDENCIES_STRUCTURE
-    };
+    this.componentsDefaultDirectory = componentsDefaultDirectory || DEFAULT_COMPONENTES_DIR;
+    this.dependenciesDirectory = dependenciesDirectory || DEFAULT_DEPENDENCIES_DIR;
     this.saveDependenciesAsComponents = saveDependenciesAsComponents || false;
   }
 
   toPlainObject() {
     const superObject = super.toPlainObject();
     const consumerObject = R.merge(superObject, {
-      structure: this.structure,
+      componentsDefaultDirectory: this.componentsDefaultDirectory,
+      dependenciesDirectory: this.dependenciesDirectory,
       saveDependenciesAsComponents: this.saveDependenciesAsComponents
     });
     if (this.distEntry || this.distTarget) {
@@ -94,18 +95,14 @@ export default class ConsumerBitJson extends AbstractBitJson {
       env,
       dependencies,
       lang,
-      structure,
+      componentsDefaultDirectory,
+      dependenciesDirectory,
       dist,
       bindingPrefix,
       extensions,
       saveDependenciesAsComponents
     } = object;
 
-    // todo: this is a backward compatibility, remove it on the next major version
-    const finalStructure = R.is(String, structure)
-      ? { components: structure, dependencies: DEFAULT_DIR_DEPENDENCIES_STRUCTURE }
-      : structure;
-
     return new ConsumerBitJson({
       impl: R.propOr(undefined, 'impl', sources),
       spec: R.propOr(undefined, 'spec', sources),
@@ -116,7 +113,8 @@ export default class ConsumerBitJson extends AbstractBitJson {
       extensions,
       dependencies,
       saveDependenciesAsComponents,
-      structure: finalStructure || {},
+      componentsDefaultDirectory,
+      dependenciesDirectory,
       distTarget: R.propOr(undefined, 'target', dist),
       distEntry: R.propOr(undefined, 'entry', dist)
     });

src/consumer/consumer.js

@@ -93,7 +93,10 @@ export default class Consumer {
 
   get dirStructure(): DirStructure {
     if (!this._dirStructure) {
-      this._dirStructure = new DirStructure(this.bitJson.structure);
+      this._dirStructure = new DirStructure(
+        this.bitJson.componentsDefaultDirectory,
+        this.bitJson.dependenciesDirectory
+      );
     }
     return this._dirStructure;
   }
@@ -613,9 +616,9 @@ export default class Consumer {
   moveExistingComponent(bitMap: BitMap, component: Component, oldPath: string, newPath: string) {
     if (fs.existsSync(newPath)) {
       throw new Error(
-        `could not move the component ${component.id} from ${oldPath} to ${
-          newPath
-        } as the destination path already exists`
+        `could not move the component ${
+          component.id
+        } from ${oldPath} to ${newPath} as the destination path already exists`
       );
     }
     const componentMap = bitMap.getComponent(component.id);

src/consumer/dir-structure/dir-structure.js

@@ -1,13 +1,14 @@
 // @flow
 import R from 'ramda';
-import { DEFAULT_DIR_STRUCTURE, DEFAULT_DIR_DEPENDENCIES_STRUCTURE } from '../../constants';
+import { DEFAULT_COMPONENTES_DIR, DEFAULT_DEPENDENCIES_DIR } from '../../constants';
 
 export default class BitStructure {
-  structureStr: string;
-  dependenciesDir: string;
-  constructor(structure: Object) {
-    this.structureStr = structure.components || DEFAULT_DIR_STRUCTURE;
-    this.dependenciesDir = structure.dependencies || DEFAULT_DIR_DEPENDENCIES_STRUCTURE;
+  componentsDefaultDirectory: string;
+  dependenciesDirectory: string;
+  constructor(componentsDefaultDirectory, dependenciesDirectory) {
+    this.componentsDefaultDirectory = componentsDefaultDirectory || DEFAULT_COMPONENTES_DIR;
+    this.dependenciesDirectory = dependenciesDirectory || DEFAULT_DEPENDENCIES_DIR;
+    console.log('dsffds');
   }
 
   _getComponentStructurePart(componentStructure: string, componentPart: string): string {
@@ -27,11 +28,11 @@ export default class BitStructure {
   }
 
   get dependenciesDirStructure(): string {
-    return this.dependenciesDir;
+    return this.dependenciesDirectory;
   }
 
   get componentsDirStructure(): Object {
-    const dirStructure = this.structureStr;
+    const dirStructure = this.componentsDefaultDirectory;
     const staticParts = [];
     const dynamicParts = [];
     dirStructure.split('/').forEach((dir) => {