@teambit/config 0.0.526 → 0.0.529

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,6 @@
1
1
  import { ExtensionDataEntry, ExtensionDataList } from '@teambit/legacy/dist/consumer/config';
2
2
  import { PathOsBased, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
3
- import { CLIMain } from '@teambit/cli';
4
- import { SlotRegistry, GlobalConfig } from '@teambit/harmony';
3
+ import { GlobalConfig } from '@teambit/harmony';
5
4
  import { WorkspaceConfig, WorkspaceConfigFileProps } from './workspace-config';
6
5
  import { ConfigType, HostConfig } from './types';
7
6
  export declare type SetExtensionOptions = {
@@ -11,16 +10,10 @@ export declare type SetExtensionOptions = {
11
10
  };
12
11
  export declare type ConfigDeps = [];
13
12
  export declare type ConfigConfig = {};
14
- /**
15
- * pass the aspectIds entered by the user. returns the complete ids including versions.
16
- */
17
- export declare type PreAddingAspects = (aspectIds: string[]) => Promise<string[]>;
18
- export declare type PreAddingAspectsSlot = SlotRegistry<PreAddingAspects>;
19
13
  export declare class ConfigMain {
20
14
  workspaceConfig?: WorkspaceConfig | undefined;
21
15
  scopeConfig?: WorkspaceConfig | undefined;
22
- preAddingAspectsSlot?: PreAddingAspectsSlot | undefined;
23
- constructor(workspaceConfig?: WorkspaceConfig | undefined, scopeConfig?: WorkspaceConfig | undefined, preAddingAspectsSlot?: PreAddingAspectsSlot | undefined);
16
+ constructor(workspaceConfig?: WorkspaceConfig | undefined, scopeConfig?: WorkspaceConfig | undefined);
24
17
  get type(): ConfigType;
25
18
  get path(): PathOsBased | undefined;
26
19
  get config(): HostConfig | undefined;
@@ -39,10 +32,9 @@ export declare class ConfigMain {
39
32
  extension(extensionId: string, ignoreVersion: boolean): ExtensionDataEntry | undefined;
40
33
  setExtension(extensionId: string, config: Record<string, any>, options: SetExtensionOptions): void;
41
34
  getHarmonyConfigObject(): GlobalConfig;
42
- registerPreAddingAspectsSlot(func: PreAddingAspects): void;
43
35
  static runtime: import("@teambit/harmony").RuntimeDefinition;
44
- static slots: ((registerFn: () => string) => SlotRegistry<PreAddingAspects>)[];
36
+ static slots: never[];
45
37
  static dependencies: import("@teambit/harmony").Aspect[];
46
38
  static config: {};
47
- static provider([cli]: [CLIMain], config: any, [preAddingAspectsSlot]: [PreAddingAspectsSlot]): Promise<any>;
39
+ static provider(): Promise<any>;
48
40
  }
@@ -2,8 +2,6 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
4
 
5
- require("core-js/modules/es.array.iterator.js");
6
-
7
5
  require("core-js/modules/es.promise.js");
8
6
 
9
7
  Object.defineProperty(exports, "__esModule", {
@@ -51,16 +49,6 @@ function _cli() {
51
49
  return data;
52
50
  }
53
51
 
54
- function _harmony() {
55
- const data = require("@teambit/harmony");
56
-
57
- _harmony = function () {
58
- return data;
59
- };
60
-
61
- return data;
62
- }
63
-
64
52
  function _path() {
65
53
  const data = _interopRequireDefault(require("path"));
66
54
 
@@ -71,16 +59,6 @@ function _path() {
71
59
  return data;
72
60
  }
73
61
 
74
- function _use() {
75
- const data = require("./use.cmd");
76
-
77
- _use = function () {
78
- return data;
79
- };
80
-
81
- return data;
82
- }
83
-
84
62
  function _workspaceConfig2() {
85
63
  const data = require("./workspace-config");
86
64
 
@@ -102,10 +80,9 @@ function _config() {
102
80
  }
103
81
 
104
82
  class ConfigMain {
105
- constructor(workspaceConfig, scopeConfig, preAddingAspectsSlot) {
83
+ constructor(workspaceConfig, scopeConfig) {
106
84
  this.workspaceConfig = workspaceConfig;
107
85
  this.scopeConfig = scopeConfig;
108
- this.preAddingAspectsSlot = preAddingAspectsSlot;
109
86
  }
110
87
 
111
88
  get type() {
@@ -173,13 +150,7 @@ class ConfigMain {
173
150
  return config;
174
151
  }
175
152
 
176
- registerPreAddingAspectsSlot(func) {
177
- var _this$preAddingAspect;
178
-
179
- (_this$preAddingAspect = this.preAddingAspectsSlot) === null || _this$preAddingAspect === void 0 ? void 0 : _this$preAddingAspect.register(func);
180
- }
181
-
182
- static async provider([cli], config, [preAddingAspectsSlot]) {
153
+ static async provider() {
183
154
  _workspaceConfig().default.registerOnWorkspaceConfigIsExist(onLegacyWorkspaceConfigIsExist());
184
155
 
185
156
  _workspaceConfig().default.registerOnWorkspaceConfigEnsuring(onLegacyWorkspaceEnsure());
@@ -190,7 +161,7 @@ class ConfigMain {
190
161
  const workspaceConfig = await _workspaceConfig2().WorkspaceConfig.loadIfExist(configDirPath);
191
162
 
192
163
  if (workspaceConfig) {
193
- configMain = new ConfigMain(workspaceConfig, undefined, preAddingAspectsSlot);
164
+ configMain = new ConfigMain(workspaceConfig, undefined);
194
165
  } else {
195
166
  // TODO: try load scope config here
196
167
  configMain = {};
@@ -200,7 +171,6 @@ class ConfigMain {
200
171
 
201
172
  _workspaceConfig().default.registerOnWorkspaceConfigReset((dirPath, resetHard) => _workspaceConfig2().WorkspaceConfig.reset(dirPath, resetHard));
202
173
 
203
- cli.register(new (_use().UseCmd)(configMain));
204
174
  return configMain;
205
175
  }
206
176
 
@@ -208,7 +178,7 @@ class ConfigMain {
208
178
 
209
179
  exports.ConfigMain = ConfigMain;
210
180
  (0, _defineProperty2().default)(ConfigMain, "runtime", _cli().MainRuntime);
211
- (0, _defineProperty2().default)(ConfigMain, "slots", [_harmony().Slot.withType()]);
181
+ (0, _defineProperty2().default)(ConfigMain, "slots", []);
212
182
  (0, _defineProperty2().default)(ConfigMain, "dependencies", [_cli().CLIAspect]);
213
183
  (0, _defineProperty2().default)(ConfigMain, "config", {});
214
184
 
@@ -1 +1 @@
1
- {"version":3,"names":["ConfigMain","constructor","workspaceConfig","scopeConfig","preAddingAspectsSlot","type","path","config","ensureWorkspace","dirPath","workspaceConfigProps","WorkspaceConfig","ensure","extensions","extension","extensionId","ignoreVersion","setExtension","options","getHarmonyConfigObject","forEach","stringId","registerPreAddingAspectsSlot","func","register","provider","cli","LegacyWorkspaceConfig","registerOnWorkspaceConfigIsExist","onLegacyWorkspaceConfigIsExist","registerOnWorkspaceConfigEnsuring","onLegacyWorkspaceEnsure","consumerInfo","getConsumerInfo","process","cwd","configMain","configDirPath","loadIfExist","undefined","registerOnWorkspaceConfigLoading","onLegacyWorkspaceLoad","registerOnWorkspaceConfigReset","resetHard","reset","UseCmd","MainRuntime","Slot","withType","CLIAspect","ConfigAspect","addRuntime","isExist","normalize","dirname","toLegacy","newConfig","standAlone","legacyWorkspaceConfigProps","transformLegacyPropsToExtensions"],"sources":["config.main.runtime.ts"],"sourcesContent":["import { getConsumerInfo } from '@teambit/legacy/dist/consumer';\nimport {\n ExtensionDataEntry,\n ExtensionDataList,\n ILegacyWorkspaceConfig,\n LegacyWorkspaceConfigProps,\n} from '@teambit/legacy/dist/consumer/config';\nimport LegacyWorkspaceConfig, {\n WorkspaceConfigEnsureFunction,\n WorkspaceConfigIsExistFunction,\n WorkspaceConfigLoadFunction,\n} from '@teambit/legacy/dist/consumer/config/workspace-config';\nimport { PathOsBased, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';\nimport { CLIAspect, MainRuntime, CLIMain } from '@teambit/cli';\nimport { Slot, SlotRegistry, GlobalConfig } from '@teambit/harmony';\nimport path from 'path';\nimport { UseCmd } from './use.cmd';\nimport { transformLegacyPropsToExtensions, WorkspaceConfig, WorkspaceConfigFileProps } from './workspace-config';\nimport { ConfigType, HostConfig } from './types';\nimport { ConfigAspect } from './config.aspect';\n\nexport type SetExtensionOptions = {\n overrideExisting?: boolean;\n ignoreVersion: boolean;\n mergeIntoExisting?: boolean;\n};\n\nexport type ConfigDeps = [];\n\nexport type ConfigConfig = {};\n\n/**\n * pass the aspectIds entered by the user. returns the complete ids including versions.\n */\nexport type PreAddingAspects = (aspectIds: string[]) => Promise<string[]>;\nexport type PreAddingAspectsSlot = SlotRegistry<PreAddingAspects>;\n\nexport class ConfigMain {\n constructor(\n public workspaceConfig?: WorkspaceConfig,\n public scopeConfig?: WorkspaceConfig,\n public preAddingAspectsSlot?: PreAddingAspectsSlot\n ) {}\n\n get type(): ConfigType {\n if (this.workspaceConfig) {\n return 'workspace';\n }\n return 'scope';\n }\n\n get path(): PathOsBased | undefined {\n return this.config?.path;\n }\n\n get config(): HostConfig | undefined {\n if (this.workspaceConfig) {\n return this.workspaceConfig;\n }\n return this.scopeConfig;\n }\n\n /**\n * Ensure the given directory has a workspace config\n * Load if existing and create new if not\n *\n * @static\n * @param {PathOsBasedAbsolute} dirPath\n * @param {WorkspaceConfigFileProps} [workspaceConfigProps={} as any]\n * @returns {Promise<WorkspaceConfig>}\n * @memberof WorkspaceConfig\n */\n static async ensureWorkspace(\n dirPath: PathOsBasedAbsolute,\n workspaceConfigProps: WorkspaceConfigFileProps = {} as any\n ): Promise<ConfigMain> {\n const workspaceConfig = await WorkspaceConfig.ensure(dirPath, workspaceConfigProps);\n return new ConfigMain(workspaceConfig);\n }\n\n get extensions(): ExtensionDataList | undefined {\n return this.config?.extensions;\n }\n\n extension(extensionId: string, ignoreVersion: boolean): ExtensionDataEntry | undefined {\n return this.config?.extension(extensionId, ignoreVersion);\n }\n\n setExtension(extensionId: string, config: Record<string, any>, options: SetExtensionOptions) {\n this.config?.setExtension(extensionId, config, options);\n }\n\n getHarmonyConfigObject(): GlobalConfig {\n const config = {};\n if (!this.extensions) return config;\n this.extensions.forEach((extension) => {\n config[extension.stringId] = extension.config;\n });\n return config;\n }\n\n registerPreAddingAspectsSlot(func: PreAddingAspects) {\n this.preAddingAspectsSlot?.register(func);\n }\n\n static runtime = MainRuntime;\n static slots = [Slot.withType<PreAddingAspects>()];\n static dependencies = [CLIAspect];\n static config = {};\n static async provider([cli]: [CLIMain], config: any, [preAddingAspectsSlot]: [PreAddingAspectsSlot]) {\n LegacyWorkspaceConfig.registerOnWorkspaceConfigIsExist(onLegacyWorkspaceConfigIsExist());\n LegacyWorkspaceConfig.registerOnWorkspaceConfigEnsuring(onLegacyWorkspaceEnsure());\n const consumerInfo = await getConsumerInfo(process.cwd());\n\n let configMain: ConfigMain | any;\n const configDirPath = consumerInfo?.path || process.cwd();\n const workspaceConfig = await WorkspaceConfig.loadIfExist(configDirPath);\n if (workspaceConfig) {\n configMain = new ConfigMain(workspaceConfig, undefined, preAddingAspectsSlot);\n } else {\n // TODO: try load scope config here\n configMain = {};\n }\n LegacyWorkspaceConfig.registerOnWorkspaceConfigLoading(onLegacyWorkspaceLoad(configMain));\n LegacyWorkspaceConfig.registerOnWorkspaceConfigReset((dirPath, resetHard) =>\n WorkspaceConfig.reset(dirPath, resetHard)\n );\n cli.register(new UseCmd(configMain));\n return configMain;\n }\n}\n\nConfigAspect.addRuntime(ConfigMain);\n\nfunction onLegacyWorkspaceConfigIsExist(): WorkspaceConfigIsExistFunction {\n return async (dirPath: PathOsBased): Promise<boolean | undefined> => {\n return WorkspaceConfig.isExist(dirPath);\n };\n}\n\nfunction onLegacyWorkspaceLoad(config?: ConfigMain): WorkspaceConfigLoadFunction {\n return async (dirPath: PathOsBased): Promise<ILegacyWorkspaceConfig | undefined> => {\n if (config?.workspaceConfig && config.path && path.normalize(dirPath) === path.dirname(config.path)) {\n return (config.config as WorkspaceConfig).toLegacy();\n }\n const newConfig = await WorkspaceConfig.loadIfExist(dirPath);\n if (newConfig) {\n return newConfig.toLegacy();\n }\n return undefined;\n };\n}\n\nfunction onLegacyWorkspaceEnsure(): WorkspaceConfigEnsureFunction {\n const func: WorkspaceConfigEnsureFunction = async (\n dirPath: string,\n standAlone,\n legacyWorkspaceConfigProps?: LegacyWorkspaceConfigProps\n ) => {\n let workspaceConfigProps;\n if (legacyWorkspaceConfigProps) {\n workspaceConfigProps = transformLegacyPropsToExtensions(legacyWorkspaceConfigProps);\n }\n const config = await ConfigMain.ensureWorkspace(dirPath, workspaceConfigProps);\n const workspaceConfig = config.config;\n return (workspaceConfig as WorkspaceConfig).toLegacy();\n };\n return func;\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["ConfigMain","constructor","workspaceConfig","scopeConfig","type","path","config","ensureWorkspace","dirPath","workspaceConfigProps","WorkspaceConfig","ensure","extensions","extension","extensionId","ignoreVersion","setExtension","options","getHarmonyConfigObject","forEach","stringId","provider","LegacyWorkspaceConfig","registerOnWorkspaceConfigIsExist","onLegacyWorkspaceConfigIsExist","registerOnWorkspaceConfigEnsuring","onLegacyWorkspaceEnsure","consumerInfo","getConsumerInfo","process","cwd","configMain","configDirPath","loadIfExist","undefined","registerOnWorkspaceConfigLoading","onLegacyWorkspaceLoad","registerOnWorkspaceConfigReset","resetHard","reset","MainRuntime","CLIAspect","ConfigAspect","addRuntime","isExist","normalize","dirname","toLegacy","newConfig","func","standAlone","legacyWorkspaceConfigProps","transformLegacyPropsToExtensions"],"sources":["config.main.runtime.ts"],"sourcesContent":["import { getConsumerInfo } from '@teambit/legacy/dist/consumer';\nimport {\n ExtensionDataEntry,\n ExtensionDataList,\n ILegacyWorkspaceConfig,\n LegacyWorkspaceConfigProps,\n} from '@teambit/legacy/dist/consumer/config';\nimport LegacyWorkspaceConfig, {\n WorkspaceConfigEnsureFunction,\n WorkspaceConfigIsExistFunction,\n WorkspaceConfigLoadFunction,\n} from '@teambit/legacy/dist/consumer/config/workspace-config';\nimport { PathOsBased, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';\nimport { CLIAspect, MainRuntime } from '@teambit/cli';\nimport { GlobalConfig } from '@teambit/harmony';\nimport path from 'path';\nimport { transformLegacyPropsToExtensions, WorkspaceConfig, WorkspaceConfigFileProps } from './workspace-config';\nimport { ConfigType, HostConfig } from './types';\nimport { ConfigAspect } from './config.aspect';\n\nexport type SetExtensionOptions = {\n overrideExisting?: boolean;\n ignoreVersion: boolean;\n mergeIntoExisting?: boolean;\n};\n\nexport type ConfigDeps = [];\n\nexport type ConfigConfig = {};\n\nexport class ConfigMain {\n constructor(public workspaceConfig?: WorkspaceConfig, public scopeConfig?: WorkspaceConfig) {}\n\n get type(): ConfigType {\n if (this.workspaceConfig) {\n return 'workspace';\n }\n return 'scope';\n }\n\n get path(): PathOsBased | undefined {\n return this.config?.path;\n }\n\n get config(): HostConfig | undefined {\n if (this.workspaceConfig) {\n return this.workspaceConfig;\n }\n return this.scopeConfig;\n }\n\n /**\n * Ensure the given directory has a workspace config\n * Load if existing and create new if not\n *\n * @static\n * @param {PathOsBasedAbsolute} dirPath\n * @param {WorkspaceConfigFileProps} [workspaceConfigProps={} as any]\n * @returns {Promise<WorkspaceConfig>}\n * @memberof WorkspaceConfig\n */\n static async ensureWorkspace(\n dirPath: PathOsBasedAbsolute,\n workspaceConfigProps: WorkspaceConfigFileProps = {} as any\n ): Promise<ConfigMain> {\n const workspaceConfig = await WorkspaceConfig.ensure(dirPath, workspaceConfigProps);\n return new ConfigMain(workspaceConfig);\n }\n\n get extensions(): ExtensionDataList | undefined {\n return this.config?.extensions;\n }\n\n extension(extensionId: string, ignoreVersion: boolean): ExtensionDataEntry | undefined {\n return this.config?.extension(extensionId, ignoreVersion);\n }\n\n setExtension(extensionId: string, config: Record<string, any>, options: SetExtensionOptions) {\n this.config?.setExtension(extensionId, config, options);\n }\n\n getHarmonyConfigObject(): GlobalConfig {\n const config = {};\n if (!this.extensions) return config;\n this.extensions.forEach((extension) => {\n config[extension.stringId] = extension.config;\n });\n return config;\n }\n\n static runtime = MainRuntime;\n static slots = [];\n static dependencies = [CLIAspect];\n static config = {};\n static async provider() {\n LegacyWorkspaceConfig.registerOnWorkspaceConfigIsExist(onLegacyWorkspaceConfigIsExist());\n LegacyWorkspaceConfig.registerOnWorkspaceConfigEnsuring(onLegacyWorkspaceEnsure());\n const consumerInfo = await getConsumerInfo(process.cwd());\n\n let configMain: ConfigMain | any;\n const configDirPath = consumerInfo?.path || process.cwd();\n const workspaceConfig = await WorkspaceConfig.loadIfExist(configDirPath);\n if (workspaceConfig) {\n configMain = new ConfigMain(workspaceConfig, undefined);\n } else {\n // TODO: try load scope config here\n configMain = {};\n }\n LegacyWorkspaceConfig.registerOnWorkspaceConfigLoading(onLegacyWorkspaceLoad(configMain));\n LegacyWorkspaceConfig.registerOnWorkspaceConfigReset((dirPath, resetHard) =>\n WorkspaceConfig.reset(dirPath, resetHard)\n );\n return configMain;\n }\n}\n\nConfigAspect.addRuntime(ConfigMain);\n\nfunction onLegacyWorkspaceConfigIsExist(): WorkspaceConfigIsExistFunction {\n return async (dirPath: PathOsBased): Promise<boolean | undefined> => {\n return WorkspaceConfig.isExist(dirPath);\n };\n}\n\nfunction onLegacyWorkspaceLoad(config?: ConfigMain): WorkspaceConfigLoadFunction {\n return async (dirPath: PathOsBased): Promise<ILegacyWorkspaceConfig | undefined> => {\n if (config?.workspaceConfig && config.path && path.normalize(dirPath) === path.dirname(config.path)) {\n return (config.config as WorkspaceConfig).toLegacy();\n }\n const newConfig = await WorkspaceConfig.loadIfExist(dirPath);\n if (newConfig) {\n return newConfig.toLegacy();\n }\n return undefined;\n };\n}\n\nfunction onLegacyWorkspaceEnsure(): WorkspaceConfigEnsureFunction {\n const func: WorkspaceConfigEnsureFunction = async (\n dirPath: string,\n standAlone,\n legacyWorkspaceConfigProps?: LegacyWorkspaceConfigProps\n ) => {\n let workspaceConfigProps;\n if (legacyWorkspaceConfigProps) {\n workspaceConfigProps = transformLegacyPropsToExtensions(legacyWorkspaceConfigProps);\n }\n const config = await ConfigMain.ensureWorkspace(dirPath, workspaceConfigProps);\n const workspaceConfig = config.config;\n return (workspaceConfig as WorkspaceConfig).toLegacy();\n };\n return func;\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,22 +1,22 @@
1
1
  {
2
2
  "name": "@teambit/config",
3
- "version": "0.0.526",
3
+ "version": "0.0.529",
4
4
  "homepage": "https://bit.dev/teambit/harmony/config",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.harmony",
8
8
  "name": "config",
9
- "version": "0.0.526"
9
+ "version": "0.0.529"
10
10
  },
11
11
  "dependencies": {
12
- "chalk": "2.4.2",
13
12
  "comment-json": "3.0.3",
14
13
  "fs-extra": "10.0.0",
15
14
  "lodash": "4.17.21",
15
+ "chalk": "2.4.2",
16
16
  "@babel/runtime": "7.12.18",
17
17
  "core-js": "^3.0.0",
18
18
  "@teambit/harmony": "0.3.3",
19
- "@teambit/cli": "0.0.513",
19
+ "@teambit/cli": "0.0.516",
20
20
  "@teambit/bit-error": "0.0.394"
21
21
  },
22
22
  "devDependencies": {
@@ -30,7 +30,7 @@
30
30
  "@types/node": "12.20.4"
31
31
  },
32
32
  "peerDependencies": {
33
- "@teambit/legacy": "1.0.294",
33
+ "@teambit/legacy": "1.0.297",
34
34
  "react-dom": "^16.8.0 || ^17.0.0",
35
35
  "react": "^16.8.0 || ^17.0.0"
36
36
  },
@@ -58,7 +58,7 @@
58
58
  "react": "-"
59
59
  },
60
60
  "peerDependencies": {
61
- "@teambit/legacy": "1.0.294",
61
+ "@teambit/legacy": "1.0.297",
62
62
  "react-dom": "^16.8.0 || ^17.0.0",
63
63
  "react": "^16.8.0 || ^17.0.0"
64
64
  }
@@ -1,5 +1,5 @@
1
-
2
-
1
+ ;
2
+ ;
3
3
 
4
4
  export const compositions = [];
5
- export const overview = []
5
+ export const overview = [];
package/dist/use.cmd.d.ts DELETED
@@ -1,19 +0,0 @@
1
- import { Command, CommandOptions } from '@teambit/cli';
2
- import { ConfigMain } from '@teambit/config';
3
- export declare class UseCmd implements Command {
4
- private config;
5
- name: string;
6
- group: string;
7
- description: string;
8
- arguments: {
9
- name: string;
10
- description: string;
11
- }[];
12
- alias: string;
13
- options: CommandOptions;
14
- loader: boolean;
15
- migration: boolean;
16
- remoteOp: boolean;
17
- constructor(config: ConfigMain);
18
- report([ids]: [string[]]): Promise<any>;
19
- }
package/dist/use.cmd.js DELETED
@@ -1,94 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("core-js/modules/es.array.flat.js");
6
-
7
- require("core-js/modules/es.array.iterator.js");
8
-
9
- require("core-js/modules/es.array.unscopables.flat.js");
10
-
11
- require("core-js/modules/es.promise.js");
12
-
13
- Object.defineProperty(exports, "__esModule", {
14
- value: true
15
- });
16
- exports.UseCmd = void 0;
17
-
18
- function _defineProperty2() {
19
- const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
20
-
21
- _defineProperty2 = function () {
22
- return data;
23
- };
24
-
25
- return data;
26
- }
27
-
28
- function _path() {
29
- const data = _interopRequireDefault(require("path"));
30
-
31
- _path = function () {
32
- return data;
33
- };
34
-
35
- return data;
36
- }
37
-
38
- function _chalk() {
39
- const data = _interopRequireDefault(require("chalk"));
40
-
41
- _chalk = function () {
42
- return data;
43
- };
44
-
45
- return data;
46
- }
47
-
48
- class UseCmd {
49
- constructor(config) {
50
- this.config = config;
51
- (0, _defineProperty2().default)(this, "name", 'use [component-ids...]');
52
- (0, _defineProperty2().default)(this, "group", 'collaborate');
53
- (0, _defineProperty2().default)(this, "description", 'set aspects in the workspace/scope config to make them loadable by the workspace/scope');
54
- (0, _defineProperty2().default)(this, "arguments", [{
55
- name: 'component-ids...',
56
- description: 'the component IDs of the aspects'
57
- }]);
58
- (0, _defineProperty2().default)(this, "alias", '');
59
- (0, _defineProperty2().default)(this, "options", []);
60
- (0, _defineProperty2().default)(this, "loader", true);
61
- (0, _defineProperty2().default)(this, "migration", true);
62
- (0, _defineProperty2().default)(this, "remoteOp", true);
63
- }
64
-
65
- async report([ids = []]) {
66
- var _this$config$preAddin;
67
-
68
- const config = this.config.workspaceConfig || this.config.scopeConfig;
69
-
70
- if (!config) {
71
- throw new Error(`please run "bit use" from either a workspace or a scope`);
72
- }
73
-
74
- const preAddingAspectFunctions = (_this$config$preAddin = this.config.preAddingAspectsSlot) === null || _this$config$preAddin === void 0 ? void 0 : _this$config$preAddin.toArray();
75
- if (!preAddingAspectFunctions) throw new Error(`can't find any registration to the preAddingAspects slot`);
76
- const componentIds = (await Promise.all(preAddingAspectFunctions.map(([, func]) => func(ids)))).flat();
77
- componentIds.forEach(compId => {
78
- config.setExtension(compId, {}, {
79
- overrideExisting: false,
80
- ignoreVersion: false
81
- });
82
- });
83
- await config.write({
84
- dir: _path().default.dirname(config.path)
85
- });
86
- return _chalk().default.green(`the following aspect(s) were saved into ${this.config.workspaceConfig ? 'workspace.jsonc' : 'scopes.jsonc'} file:
87
- ${componentIds.join('\n')}`);
88
- }
89
-
90
- }
91
-
92
- exports.UseCmd = UseCmd;
93
-
94
- //# sourceMappingURL=use.cmd.js.map
@@ -1 +0,0 @@
1
- {"version":3,"names":["UseCmd","constructor","config","name","description","report","ids","workspaceConfig","scopeConfig","Error","preAddingAspectFunctions","preAddingAspectsSlot","toArray","componentIds","Promise","all","map","func","flat","forEach","compId","setExtension","overrideExisting","ignoreVersion","write","dir","path","dirname","chalk","green","join"],"sources":["use.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport path from 'path';\nimport chalk from 'chalk';\nimport { ConfigMain } from '@teambit/config';\n\nexport class UseCmd implements Command {\n name = 'use [component-ids...]';\n group = 'collaborate';\n description = 'set aspects in the workspace/scope config to make them loadable by the workspace/scope';\n arguments = [{ name: 'component-ids...', description: 'the component IDs of the aspects' }];\n alias = '';\n options = [] as CommandOptions;\n loader = true;\n migration = true;\n remoteOp = true;\n\n constructor(private config: ConfigMain) {}\n\n async report([ids = []]: [string[]]): Promise<any> {\n const config = this.config.workspaceConfig || this.config.scopeConfig;\n if (!config) {\n throw new Error(`please run \"bit use\" from either a workspace or a scope`);\n }\n const preAddingAspectFunctions = this.config.preAddingAspectsSlot?.toArray();\n if (!preAddingAspectFunctions) throw new Error(`can't find any registration to the preAddingAspects slot`);\n const componentIds = (await Promise.all(preAddingAspectFunctions.map(([, func]) => func(ids)))).flat();\n\n componentIds.forEach((compId) => {\n config.setExtension(\n compId,\n {},\n {\n overrideExisting: false,\n ignoreVersion: false,\n }\n );\n });\n await config.write({ dir: path.dirname(config.path) });\n\n return chalk.green(`the following aspect(s) were saved into ${\n this.config.workspaceConfig ? 'workspace.jsonc' : 'scopes.jsonc'\n } file:\n${componentIds.join('\\n')}`);\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGO,MAAMA,MAAN,CAAgC;EAWrCC,WAAW,CAASC,MAAT,EAA6B;IAAA,KAApBA,MAAoB,GAApBA,MAAoB;IAAA,8CAVjC,wBAUiC;IAAA,+CAThC,aASgC;IAAA,qDAR1B,wFAQ0B;IAAA,mDAP5B,CAAC;MAAEC,IAAI,EAAE,kBAAR;MAA4BC,WAAW,EAAE;IAAzC,CAAD,CAO4B;IAAA,+CANhC,EAMgC;IAAA,iDAL9B,EAK8B;IAAA,gDAJ/B,IAI+B;IAAA,mDAH5B,IAG4B;IAAA,kDAF7B,IAE6B;EAAE;;EAE9B,MAANC,MAAM,CAAC,CAACC,GAAG,GAAG,EAAP,CAAD,EAAuC;IAAA;;IACjD,MAAMJ,MAAM,GAAG,KAAKA,MAAL,CAAYK,eAAZ,IAA+B,KAAKL,MAAL,CAAYM,WAA1D;;IACA,IAAI,CAACN,MAAL,EAAa;MACX,MAAM,IAAIO,KAAJ,CAAW,yDAAX,CAAN;IACD;;IACD,MAAMC,wBAAwB,4BAAG,KAAKR,MAAL,CAAYS,oBAAf,0DAAG,sBAAkCC,OAAlC,EAAjC;IACA,IAAI,CAACF,wBAAL,EAA+B,MAAM,IAAID,KAAJ,CAAW,0DAAX,CAAN;IAC/B,MAAMI,YAAY,GAAG,CAAC,MAAMC,OAAO,CAACC,GAAR,CAAYL,wBAAwB,CAACM,GAAzB,CAA6B,CAAC,GAAGC,IAAH,CAAD,KAAcA,IAAI,CAACX,GAAD,CAA/C,CAAZ,CAAP,EAA2EY,IAA3E,EAArB;IAEAL,YAAY,CAACM,OAAb,CAAsBC,MAAD,IAAY;MAC/BlB,MAAM,CAACmB,YAAP,CACED,MADF,EAEE,EAFF,EAGE;QACEE,gBAAgB,EAAE,KADpB;QAEEC,aAAa,EAAE;MAFjB,CAHF;IAQD,CATD;IAUA,MAAMrB,MAAM,CAACsB,KAAP,CAAa;MAAEC,GAAG,EAAEC,eAAA,CAAKC,OAAL,CAAazB,MAAM,CAACwB,IAApB;IAAP,CAAb,CAAN;IAEA,OAAOE,gBAAA,CAAMC,KAAN,CAAa,2CAClB,KAAK3B,MAAL,CAAYK,eAAZ,GAA8B,iBAA9B,GAAkD,cACnD;AACL,EAAEM,YAAY,CAACiB,IAAb,CAAkB,IAAlB,CAAwB,EAHf,CAAP;EAID;;AAtCoC"}