refactor, move legacy bitmap and utils directories into new components

.circleci/config.yml

@@ -461,7 +461,7 @@ jobs:
       - restore_cache:
           key: bitsrc-registry10
       - restore_cache:
-          key: core-aspect-env-v0.0.39-v1
+          key: core-aspect-env-v0.0.42-v1
       - run: echo $BIT_FEATURES
       - run: node -v
       - run: npm -v
@@ -491,9 +491,9 @@ jobs:
           name: bbit install
           command: cd bit && bbit install
       - save_cache:
-          key: core-aspect-env-v0.0.39-v1
+          key: core-aspect-env-v0.0.42-v1
           paths:
-            - /home/circleci/Library/Caches/Bit/capsules/caec9a1075d4addee151dbe7e351b809aaa4b088
+            - /home/circleci/Library/Caches/Bit/capsules/caec9a107
       - run: cd bit && npm run link-bit-legacy
       # - run: cd bit && bbit compile
 
@@ -537,7 +537,7 @@ jobs:
       - restore_cache:
           key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
       - restore_cache:
-          key: core-aspect-env-v0.0.39-v1
+          key: core-aspect-env-v0.0.42-v1
       # - update_ssh_agent
       # temporary, check if we can remove it
       - run: cd bit && bit cc
@@ -574,7 +574,7 @@ jobs:
       - restore_cache:
           key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
       - restore_cache:
-          key: core-aspect-env-v0.0.39-v1
+          key: core-aspect-env-v0.0.42-v1
       - bit_config:
           env: "hub"
       - restore_cache:
@@ -887,7 +887,7 @@ jobs:
       - restore_cache:
           key: bitsrc-registry10
       - restore_cache:
-          key: core-aspect-env-v0.0.39-v1
+          key: core-aspect-env-v0.0.42-v1
       - run: npm view @teambit/bit version > ./version.txt
       - restore_cache:
           key: v3-linux-bvm-folder-{{ checksum "version.txt" }}

.gitignore

@@ -30,6 +30,7 @@ build/Release
 node_modules
 jspm_packages
 !fixtures/filing-cabinet/node_modules
+!scopes/dependencies/dependencies/files-dependency-builder/fixtures/filing-cabinet/node_modules
 
 # Optional npm cache directory
 .npm

components/crypto/sha1/index.ts

@@ -0,0 +1 @@
+export { sha1 } from './sha1';

src/utils/encryption/sha1.ts → components/crypto/sha1/sha1.ts

@@ -7,6 +7,7 @@ import * as crypto from 'crypto';
  *  sha1('foo bar') // => '3773dea65156909838fa6c22825cafe090ff8030'
  * ```
  */
-export default function sha1(data: string | Buffer, encoding: crypto.BinaryToTextEncoding = 'hex'): string {
+// @ts-ignore todo: fix after deleting teambit.legacy
+export function sha1(data: string | Buffer, encoding: crypto.BinaryToTextEncoding = 'hex'): string {
   return crypto.createHash('sha1').update(data).digest(encoding);
 }

src/consumer/bit-map/bit-map.spec.ts → components/legacy/bit-map/bit-map.spec.ts

@@ -2,8 +2,8 @@ import { expect } from 'chai';
 import * as path from 'path';
 import { ComponentID } from '@teambit/component-id';
 import { BitId } from '@teambit/legacy-bit-id';
-import logger from '../../logger/logger';
-import BitMap from './bit-map';
+import logger from '@teambit/legacy/dist/logger/logger';
+import { BitMap } from './bit-map';
 import { DuplicateRootDir } from './exceptions/duplicate-root-dir';
 
 const scope = {
@@ -30,7 +30,7 @@ describe('BitMap', function () {
   // @ts-ignore
   logger.info = () => {};
   // @ts-ignore
-  this.timeout(0);
+  // this.timeout(0);
   describe('toObject', () => {
     let bitMap: BitMap;
     let componentMap;

src/consumer/bit-map/bit-map.ts → components/legacy/bit-map/bit-map.ts

@@ -9,19 +9,27 @@ import { BitError } from '@teambit/bit-error';
 import { ComponentID, ComponentIdList } from '@teambit/component-id';
 import { BitId, BitIdStr } from '@teambit/legacy-bit-id';
 import { sortObjectByKeys } from '@teambit/toolbox.object.sorter';
-import type { Consumer } from '..';
+import type { Consumer } from '@teambit/legacy/dist/consumer';
 import {
   AUTO_GENERATED_MSG,
   AUTO_GENERATED_STAMP,
   BIT_MAP,
   OLD_BIT_MAP,
   VERSION_DELIMITER,
   BITMAP_PREFIX_MESSAGE,
-} from '../../constants';
-import logger from '../../logger/logger';
-import { pathJoinLinux, pathNormalizeToLinux } from '../../utils';
-import { PathLinux, PathLinuxRelative, PathOsBased, PathOsBasedAbsolute, PathOsBasedRelative } from '../../utils/path';
-import ComponentMap, {
+} from '@teambit/legacy/dist/constants';
+import logger from '@teambit/legacy/dist/logger/logger';
+import {
+  pathJoinLinux,
+  pathNormalizeToLinux,
+  PathLinux,
+  PathLinuxRelative,
+  PathOsBased,
+  PathOsBasedAbsolute,
+  PathOsBasedRelative,
+} from '@teambit/toolbox.path.path';
+import {
+  ComponentMap,
   ComponentMapFile,
   Config,
   PathChange,
@@ -49,7 +57,7 @@ export const LANE_KEY = '_bit_lane';
 export const CURRENT_BITMAP_SCHEMA = '17.0.0';
 export const SCHEMA_FIELD = '$schema-version';
 
-export default class BitMap {
+export class BitMap {
   components: ComponentMap[];
   hasChanged: boolean;
   paths: { [path: string]: ComponentID }; // path => componentId
@@ -63,7 +71,7 @@ export default class BitMap {
   _cacheIdsAllStrWithoutVersion: { [idStr: string]: ComponentID } | undefined;
   _cacheIdsAllStrWithoutScopeAndVersion: { [idStr: string]: ComponentID } | undefined;
   allTrackDirs: { [trackDir: string]: ComponentID } | null | undefined;
-  private updatedIds: { [oldIdStr: string]: ComponentMap } = {}; // needed for out-of-sync where the id is changed during the process
+  protected updatedIds: { [oldIdStr: string]: ComponentMap } = {}; // needed for out-of-sync where the id is changed during the process
   constructor(
     public projectRoot: string,
     public mapPath: PathOsBasedAbsolute,

src/consumer/bit-map/component-map.ts → components/legacy/bit-map/component-map.ts

@@ -3,17 +3,30 @@ import globby from 'globby';
 import ignore from 'ignore';
 import R from 'ramda';
 import { ComponentID } from '@teambit/component-id';
-import { BIT_MAP, Extensions, PACKAGE_JSON, IGNORE_ROOT_ONLY_LIST } from '../../constants';
-import ValidationError from '../../error/validation-error';
-import logger from '../../logger/logger';
-import { isValidPath, pathJoinLinux, pathNormalizeToLinux, pathRelativeLinux, retrieveIgnoreList } from '../../utils';
-import { PathLinux, PathLinuxRelative, PathOsBased, PathOsBasedRelative } from '../../utils/path';
-import { removeInternalConfigFields } from '../config/extension-data';
-import Consumer from '../consumer';
+import { BIT_MAP, Extensions, PACKAGE_JSON, IGNORE_ROOT_ONLY_LIST } from '@teambit/legacy/dist/constants';
+import ValidationError from '@teambit/legacy/dist/error/validation-error';
+import logger from '@teambit/legacy/dist/logger/logger';
+import { isValidPath } from '@teambit/legacy.utils';
+import {
+  retrieveIgnoreList,
+  BIT_IGNORE,
+  getBitIgnoreFile,
+  getGitIgnoreFile,
+} from '@teambit/git.modules.ignore-file-reader';
+import {
+  PathLinux,
+  PathLinuxRelative,
+  PathOsBased,
+  PathOsBasedRelative,
+  pathJoinLinux,
+  pathNormalizeToLinux,
+  pathRelativeLinux,
+} from '@teambit/toolbox.path.path';
+import { removeInternalConfigFields } from '@teambit/legacy/dist/consumer/config/extension-data';
+import Consumer from '@teambit/legacy/dist/consumer/consumer';
 import OutsideRootDir from './exceptions/outside-root-dir';
-import ComponentNotFoundInPath from '../component/exceptions/component-not-found-in-path';
-import { IgnoredDirectory } from '../component-ops/add-components/exceptions/ignored-directory';
-import { BIT_IGNORE, getBitIgnoreFile, getGitIgnoreFile } from '../../utils/ignore/ignore';
+import ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exceptions/component-not-found-in-path';
+import { IgnoredDirectory } from '@teambit/legacy/dist/consumer/component-ops/add-components/exceptions/ignored-directory';
 
 export type Config = { [aspectId: string]: Record<string, any> | '-' };
 
@@ -48,7 +61,7 @@ export type ComponentMapData = {
 
 export type PathChange = { from: PathLinux; to: PathLinux };
 
-export default class ComponentMap {
+export class ComponentMap {
   id: ComponentID;
   files: ComponentMapFile[];
   defaultScope?: string;
@@ -134,7 +147,7 @@ export default class ComponentMap {
     return res;
   }
 
-  private configToObject() {
+  configToObject() {
     if (!this.config) return undefined;
     const config = {};
     Object.keys(this.config).forEach((aspectId) => {
@@ -145,7 +158,7 @@ export default class ComponentMap {
 
   static getPathWithoutRootDir(rootDir: PathLinux, filePath: PathLinux): PathLinux {
     const newPath = pathRelativeLinux(rootDir, filePath);
-    if (newPath.startsWith('..')) {
+    if (newPath.startsWith('@teambit/legacy/dist/consumer')) {
       // this is forbidden for security reasons. Allowing files to be written outside the components directory may
       // result in overriding OS files.
       throw new OutsideRootDir(filePath, rootDir);

src/consumer/bit-map/exceptions/missing-main-file.ts → components/legacy/bit-map/exceptions/missing-main-file.ts

@@ -1,6 +1,6 @@
 import { BitError } from '@teambit/bit-error';
 import chalk from 'chalk';
-import { BASE_DOCS_DOMAIN } from '../../../constants';
+import { BASE_DOCS_DOMAIN } from '@teambit/legacy/dist/constants';
 
 export default class MissingMainFile extends BitError {
   componentId: string;

components/legacy/bit-map/index.ts

@@ -0,0 +1,17 @@
+export {
+  BitMap,
+  GetBitMapComponentOptions,
+  PathChangeResult,
+  CURRENT_BITMAP_SCHEMA,
+  SCHEMA_FIELD,
+  LANE_KEY,
+} from './bit-map';
+export { MissingBitMapComponent, MissingMainFile, InvalidBitMap } from './exceptions';
+export {
+  ComponentMapData,
+  ComponentMapFile,
+  ComponentMap,
+  Config,
+  getIgnoreListHarmony,
+  NextVersion,
+} from './component-map';

components/legacy/component-diff/components-diff.ts

@@ -2,8 +2,8 @@ import chalk from 'chalk';
 import tempy from 'tempy';
 import R from 'ramda';
 import { ComponentID } from '@teambit/component-id';
-import diffFiles from '@teambit/legacy/dist/utils/diff-files';
-import { PathOsBased } from '@teambit/legacy/dist/utils/path';
+import { diffFiles } from './diff-files';
+import { PathOsBased } from '@teambit/toolbox.path.path';
 import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
 
 export type DiffStatus = 'MODIFIED' | 'UNCHANGED' | 'NEW' | 'DELETED';

src/utils/diff-files.ts → components/legacy/component-diff/diff-files.ts

@@ -1,14 +1,13 @@
 import execa from 'execa';
 
-import logger from '../logger/logger';
-import { PathOsBased } from '../utils/path';
-import GitNotFound from './git/exceptions/git-not-found';
-import getGitExecutablePath from './git/git-executable';
+import logger from '@teambit/legacy/dist/logger/logger';
+import { PathOsBased } from '@teambit/toolbox.path.path';
+import { GitNotFound, getGitExecutablePath } from '@teambit/git.modules.git-executable';
 
 /**
  * get diff between files using git diff command
  */
-export default async function diffFiles(fileA: PathOsBased, fileB: PathOsBased, colors = true): Promise<string> {
+export async function diffFiles(fileA: PathOsBased, fileB: PathOsBased, colors = true): Promise<string> {
   const params = ['diff'];
   params.push('--no-index'); // ignores the working tree (in case the project is managed by git)
   if (colors) params.push('--color');

src/utils/bit/is-bit-id-match-by-wildcards.ts → components/legacy/utils/bit/is-bit-id-match-by-wildcards.ts

@@ -1,7 +1,7 @@
 import R from 'ramda';
 import { ComponentID } from '@teambit/component-id';
 
-export default function isBitIdMatchByWildcards(bitId: ComponentID, idsWithWildcard: string[] | string): boolean {
+export function isBitIdMatchByWildcards(bitId: ComponentID, idsWithWildcard: string[] | string): boolean {
   if (!Array.isArray(idsWithWildcard)) idsWithWildcard = [idsWithWildcard];
   const regexPatterns = idsWithWildcard.map((id) => getRegex(id));
   const isNameMatchByWildcard = (name: string): boolean => {

src/utils/index.ts → components/legacy/utils/index.ts

@@ -1,44 +1,29 @@
 // @TODO refactor this file to include only exports
-import sha1 from './encryption/sha1';
-import * as eol from './eol';
 import writeFile from './fs-write-file';
 import { checksum, checksumFile } from './checksum';
-import getWithoutExt from './fs/fs-no-ext';
-import getExt from './fs/get-ext';
-import isDirEmpty from './fs/is-dir-empty';
 import glob from './glob';
-import { retrieveIgnoreList } from './ignore/ignore';
 import immutableUnshift from './immutable-unshift';
 import isBitUrl from './is-bit-url';
 import isDir from './is-dir';
 import isDirEmptySync from './is-dir-empty-sync';
-import isAutoGeneratedFile from './is-file-auto-generated';
 import isRelativeImport from './is-relative-import';
 import isValidPath from './is-valid-path';
-import mapToObject from './map/to-object';
 import isNumeric from './number/is-numeric';
 import cleanObject from './object-clean';
 import objectToStringifiedTupleArray from './object-to-stringified-tuple-array';
-import resolveGroupId from './os-resolve-group-id';
 import resolveHomePath from './os-resolve-home-path';
-import { pathJoinLinux, pathNormalizeToLinux, pathRelativeLinux, pathResolveToLinux } from './path';
-import { pathIsInside } from './path-is-inside';
 import prependBang from './prepend-bang';
 import getLatestVersionNumber from './resolveLatestVersion';
 import fromBase64 from './string/from-base64';
 import getStringifyArgs from './string/get-stringify-args';
 import removeChalkCharacters from './string/remove-chalk-characters';
-import stripTrailingChar from './string/strip-trailing-char';
 import toBase64 from './string/to-base64';
 import toBase64ArrayBuffer from './string/to-base64-array-buffer';
 import deflate from './zlib-deflate';
 import inflate from './zlib-inflate';
 
 export {
-  sha1,
   objectToStringifiedTupleArray,
-  resolveGroupId,
-  mapToObject,
   removeChalkCharacters,
   getStringifyArgs,
   isNumeric,
@@ -56,21 +41,32 @@ export {
   isBitUrl,
   isDir,
   resolveHomePath,
-  isDirEmpty,
   isDirEmptySync,
   immutableUnshift,
-  stripTrailingChar,
   getLatestVersionNumber,
-  getWithoutExt,
-  getExt,
-  pathNormalizeToLinux,
-  pathJoinLinux,
-  pathRelativeLinux,
-  pathResolveToLinux,
-  retrieveIgnoreList,
-  pathIsInside,
   isValidPath,
-  isAutoGeneratedFile,
-  eol,
   isRelativeImport,
 };
+
+export { ChownOptions } from './fs-write-file';
+export { isBitIdMatchByWildcards } from './bit/is-bit-id-match-by-wildcards';
+export { resolvePackagePath, resolvePackageNameByPath } from './packages';
+export { replacePlaceHolderForPackageValue } from './bit/component-placeholders';
+export { parseScope } from './bit/parse-scope';
+export { replacePackageName } from './string/replace-package-name';
+export { hasWildcard } from './string/has-wildcard';
+export {
+  PathLinux,
+  PathLinuxRelative,
+  PathOsBased,
+  PathOsBasedRelative,
+  PathOsBasedAbsolute,
+  PathAbsolute,
+  PathLinuxAbsolute,
+  PathRelative,
+  removeFileExtension,
+  pathJoinLinux,
+  pathNormalizeToLinux,
+  pathRelativeLinux,
+  pathResolveToLinux,
+} from '@teambit/toolbox.path.path';

src/utils/packages/index.ts → components/legacy/utils/packages/index.ts

@@ -1,3 +1,2 @@
 export { resolvePackageNameByPath } from './resolve-pkg-name-by-path';
 export { resolvePackagePath } from './resolve-pkg-path';
-export { resolvePackageData, ResolvedPackageData } from './resolve-pkg-data';

src/utils/packages/resolve-pkg-path.ts → components/legacy/utils/packages/resolve-pkg-path.ts

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-import { PathOsBased } from '../path';
+import { PathOsBased } from '@teambit/toolbox.path.path';
 
 /**
  * Recursively search for node package inside node_modules dir

src/utils/string/has-wildcard.spec.ts → components/legacy/utils/string/has-wildcard.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import hasWildcard from './has-wildcard';
+import { hasWildcard } from './has-wildcard';
 
 describe('hasWildcard', () => {
   describe('using string', () => {

src/utils/string/has-wildcard.ts → components/legacy/utils/string/has-wildcard.ts

@@ -1,4 +1,4 @@
-export default function hasWildcard(ids: string | null | undefined | string[]): boolean {
+export function hasWildcard(ids: string | null | undefined | string[]): boolean {
   if (!ids) return false;
   if (Array.isArray(ids)) {
     return ids.some((id) => idHasWildcard(id));

src/utils/string/replace-package-name.spec.ts → components/legacy/utils/string/replace-package-name.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import replacePackageName from './replace-package-name';
+import { replacePackageName } from './replace-package-name';
 
 describe('replacePackageName', () => {
   it('should replace package surrounded with single quotes', () => {