@teambit/mover 1.0.107 → 1.0.108

package/dist/move-cmd.d.ts

@@ -13,7 +13,7 @@ export declare class MoveCmd implements Command {
     extendedDescription: string;
     alias: string;
     loader: boolean;
-    options: never[];
+    options: any[];
     constructor(mover: MoverMain);
     report([from, to]: [string, string]): Promise<string>;
 }

package/dist/mover.main.runtime.d.ts

@@ -11,7 +11,7 @@ export declare class MoverMain {
         to: PathOsBasedRelative;
     }): Promise<PathChangeResult[]>;
     moveExistingComponent(component: Component, oldPath: PathOsBasedAbsolute, newPath: PathOsBasedAbsolute): void;
-    static slots: never[];
+    static slots: any[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static provider([cli, workspace]: [CLIMain, Workspace]): Promise<MoverMain>;

package/index.ts

@@ -0,0 +1,5 @@
+import { MoverAspect } from './mover.aspect';
+
+export type { MoverMain } from './mover.main.runtime';
+export default MoverAspect;
+export { MoverAspect };

package/move-cmd.ts

@@ -0,0 +1,40 @@
+import chalk from 'chalk';
+import { Command } from '@teambit/cli';
+import { PathChangeResult } from '@teambit/legacy/dist/consumer/bit-map/bit-map';
+import { MoverMain } from './mover.main.runtime';
+
+export class MoveCmd implements Command {
+  name = 'move <current-component-dir> <new-component-dir>';
+  description =
+    "move a component to a different filesystem path (note: this does NOT affect the component's name or scope, just its location in the workspace)";
+  helpUrl = 'reference/workspace/moving-components';
+  arguments = [
+    {
+      name: 'current-component-dir',
+      description: "the component's current directory (relative to the workspace root)",
+    },
+    {
+      name: 'new-component-dir',
+      description: "the new directory (relative to the workspace root) to create and move the component's files to",
+    },
+  ];
+  group = 'development';
+  extendedDescription = `move files or directories of component(s)\n`;
+  alias = 'mv';
+  loader = true;
+  options = [];
+
+  constructor(private mover: MoverMain) {}
+
+  async report([from, to]: [string, string]) {
+    const componentsChanged: PathChangeResult[] = await this.mover.movePaths({ from, to });
+    const output = componentsChanged.map((component) => {
+      const title = chalk.green(`moved component ${component.id.toString()}:\n`);
+      const files = component.changes
+        .map((file) => `from ${chalk.bold(file.from)} to ${chalk.bold(file.to)}`)
+        .join('\n');
+      return title + files;
+    });
+    return output.join('\n');
+  }
+}

package/mover.aspect.ts

@@ -0,0 +1,5 @@
+import { Aspect } from '@teambit/harmony';
+
+export const MoverAspect = Aspect.create({
+  id: 'teambit.component/mover',
+});

package/mover.main.runtime.ts

@@ -0,0 +1,85 @@
+import fs from 'fs-extra';
+import { BitError } from '@teambit/bit-error';
+import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';
+import WorkspaceAspect, { Workspace } from '@teambit/workspace';
+import R from 'ramda';
+import GeneralError from '@teambit/legacy/dist/error/general-error';
+import { isDir } from '@teambit/legacy/dist/utils';
+import moveSync from '@teambit/legacy/dist/utils/fs/move-sync';
+import { PathOsBasedAbsolute, PathOsBasedRelative } from '@teambit/legacy/dist/utils/path';
+import { linkToNodeModulesByIds } from '@teambit/workspace.modules.node-modules-linker';
+import { PathChangeResult } from '@teambit/legacy/dist/consumer/bit-map/bit-map';
+import Component from '@teambit/legacy/dist/consumer/component/consumer-component';
+import RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';
+import { MoverAspect } from './mover.aspect';
+import { MoveCmd } from './move-cmd';
+
+export class MoverMain {
+  constructor(private workspace: Workspace) {}
+
+  async movePaths({ from, to }: { from: PathOsBasedRelative; to: PathOsBasedRelative }): Promise<PathChangeResult[]> {
+    const consumer = await this.workspace.consumer;
+    const fromExists = fs.existsSync(from);
+    const toExists = fs.existsSync(to);
+    if (fromExists && toExists) {
+      throw new BitError(`unable to move because both paths from (${from}) and to (${to}) already exist`);
+    }
+    if (!fromExists && !toExists) throw new GeneralError(`both paths from (${from}) and to (${to}) do not exist`);
+    if (!consumer.isLegacy && fromExists && !isDir(from)) {
+      throw new BitError(`bit move supports moving directories only, not files.
+  files withing a component dir are automatically tracked, no action is needed.
+  to change the main-file, use "bit add <component-dir> --main <new-main-file>"`);
+    }
+    const fromRelative = consumer.getPathRelativeToConsumer(from);
+    const toRelative = consumer.getPathRelativeToConsumer(to);
+    const fromAbsolute = consumer.toAbsolutePath(fromRelative);
+    const toAbsolute = consumer.toAbsolutePath(toRelative);
+    const existingPath = fromExists ? fromAbsolute : toAbsolute;
+    const changes = consumer.bitMap.updatePathLocation(fromRelative, toRelative, existingPath);
+    if (fromExists && !toExists) {
+      // user would like to physically move the file. Otherwise (!fromExists and toExists), user would like to only update bit.map
+      moveSync(fromAbsolute, toAbsolute);
+    }
+    if (!R.isEmpty(changes)) {
+      const componentsIds = changes.map((c) => c.id);
+      await linkToNodeModulesByIds(this.workspace, componentsIds);
+    }
+    await this.workspace.bitMap.write('move');
+    return changes;
+  }
+
+  moveExistingComponent(component: Component, oldPath: PathOsBasedAbsolute, newPath: PathOsBasedAbsolute) {
+    const consumer = this.workspace.consumer;
+    if (fs.existsSync(newPath)) {
+      throw new GeneralError(
+        `could not move the component ${component.id.toString()} from ${oldPath} to ${newPath} as the destination path already exists`
+      );
+    }
+    const componentMap = consumer.bitMap.getComponent(component.id);
+    const oldPathRelative = consumer.getPathRelativeToConsumer(oldPath);
+    const newPathRelative = consumer.getPathRelativeToConsumer(newPath);
+    componentMap.updateDirLocation(oldPathRelative, newPathRelative);
+    consumer.bitMap.markAsChanged();
+    component.dataToPersist.files.forEach((file) => {
+      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
+      const newRelative = file.relative.replace(oldPathRelative, newPathRelative);
+      file.updatePaths({ newRelative, newBase: newPathRelative });
+    });
+    component.dataToPersist.removePath(new RemovePath(oldPathRelative));
+    component.writtenPath = newPathRelative;
+  }
+
+  static slots = [];
+  static dependencies = [CLIAspect, WorkspaceAspect];
+  static runtime = MainRuntime;
+
+  static async provider([cli, workspace]: [CLIMain, Workspace]) {
+    const moverMain = new MoverMain(workspace);
+    cli.register(new MoveCmd(moverMain));
+    return moverMain;
+  }
+}
+
+MoverAspect.addRuntime(MoverMain);
+
+export default MoverMain;

package/package.json

@@ -1,38 +1,32 @@
 {
   "name": "@teambit/mover",
-  "version": "1.0.107",
+  "version": "1.0.108",
   "homepage": "https://bit.cloud/teambit/component/mover",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "mover",
-    "version": "1.0.107"
+    "version": "1.0.108"
   },
   "dependencies": {
     "chalk": "2.4.2",
     "fs-extra": "10.0.0",
     "ramda": "0.27.1",
-    "core-js": "^3.0.0",
-    "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.839",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.157",
-    "@teambit/workspace": "1.0.107"
+    "@teambit/cli": "0.0.840",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.158",
+    "@teambit/workspace": "1.0.108"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/mocha": "9.1.0",
-    "@types/node": "12.20.4",
-    "@types/react": "^17.0.8",
-    "@types/react-dom": "^17.0.5",
-    "@types/jest": "^26.0.0",
-    "@types/testing-library__jest-dom": "5.9.5"
+    "@types/jest": "^29.2.2",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.13"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.624",
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "@teambit/legacy": "1.0.624"
   },
   "license": "Apache-2.0",
   "optionalDependencies": {},
@@ -46,7 +40,7 @@
   },
   "private": false,
   "engines": {
-    "node": ">=12.22.0"
+    "node": ">=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -55,12 +49,9 @@
   "keywords": [
     "bit",
     "bit-aspect",
+    "bit-core-aspect",
     "components",
     "collaboration",
-    "web",
-    "react",
-    "react-components",
-    "angular",
-    "angular-components"
+    "web"
   ]
 }

package/tsconfig.json

@@ -1,38 +1,33 @@
 {
   "compilerOptions": {
     "lib": [
-      "es2019",
-      "DOM",
-      "ES6",
-      "DOM.Iterable",
-      "ScriptHost"
+      "esnext",
+      "dom",
+      "dom.Iterable"
     ],
-    "target": "es2015",
-    "module": "CommonJS",
-    "jsx": "react",
-    "allowJs": true,
-    "composite": true,
+    "target": "es2020",
+    "module": "es2020",
+    "jsx": "react-jsx",
     "declaration": true,
     "sourceMap": true,
-    "skipLibCheck": true,
     "experimentalDecorators": true,
-    "outDir": "dist",
+    "skipLibCheck": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "rootDir": ".",
     "resolveJsonModule": true,
-    "emitDeclarationOnly": true,
-    "emitDecoratorMetadata": true,
-    "allowSyntheticDefaultImports": true,
-    "strictPropertyInitialization": false,
-    "strict": true,
-    "noImplicitAny": false,
-    "preserveConstEnums": true
+    "allowJs": true,
+    "outDir": "dist",
+    "emitDeclarationOnly": true
   },
   "exclude": [
+    "artifacts",
+    "public",
     "dist",
+    "node_modules",
+    "package.json",
     "esm.mjs",
-    "package.json"
+    "**/*.cjs",
+    "./dist"
   ],
   "include": [
     "**/*",

package/types/asset.d.ts

@@ -5,12 +5,12 @@ declare module '*.png' {
 declare module '*.svg' {
   import type { FunctionComponent, SVGProps } from 'react';
 
-  export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
+  export const ReactComponent: FunctionComponent<
+    SVGProps<SVGSVGElement> & { title?: string }
+  >;
   const src: string;
   export default src;
 }
-
-// @TODO Gilad
 declare module '*.jpg' {
   const value: any;
   export = value;
@@ -27,3 +27,15 @@ declare module '*.bmp' {
   const value: any;
   export = value;
 }
+declare module '*.otf' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff2' {
+  const value: any;
+  export = value;
+}