@teambit/harmony.testing.load-aspect 0.0.15 → 0.0.17

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.
@@ -53,8 +53,7 @@ function loadAspect(targetAspect, cwd = process.cwd(), runtime = 'main') {
53
53
  const harmony = yield harmony_1.Harmony.load([cli_1.CLIAspect, node_1.NodeAspect, targetAspect], runtime, configMap);
54
54
  yield harmony.run((aspect, runtimeDef) => __awaiter(this, void 0, void 0, function* () {
55
55
  const id = component_1.ComponentID.fromString(aspect.id);
56
- const packageName = getPackageName(aspect, id);
57
- const mainFilePath = require.resolve(packageName);
56
+ const mainFilePath = getMainFilePath(aspect, id);
58
57
  const packagePath = (0, path_1.resolve)((0, path_1.join)(mainFilePath, '..'));
59
58
  const files = (0, fs_1.readdirSync)(packagePath);
60
59
  const runtimePath = files.find((path) => path.includes(`.${runtimeDef.name}.runtime.js`));
@@ -76,6 +75,18 @@ go to the aspect-main file and add a new line with "export default YourAspectMai
76
75
  });
77
76
  }
78
77
  exports.loadAspect = loadAspect;
78
+ function getMainFilePath(aspect, id) {
79
+ let packageName = getPackageName(aspect, id);
80
+ try {
81
+ // try core aspects
82
+ return require.resolve(packageName);
83
+ }
84
+ catch (err) {
85
+ // fallback to a naive way of converting componentId to pkg-name. (it won't work when the component has special pkg name settings)
86
+ packageName = `@${id.scope.replace('.', '/')}.${id.fullName.replaceAll('/', '.')}`;
87
+ return require.resolve(packageName);
88
+ }
89
+ }
79
90
  function getConfig(cwd = process.cwd()) {
80
91
  return __awaiter(this, void 0, void 0, function* () {
81
92
  const consumerInfo = yield (0, consumer_1.getConsumerInfo)(cwd);
@@ -1 +1 @@
1
- {"version":3,"file":"load-aspect.js","sourceRoot":"","sources":["../load-aspect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"load-aspect.js","sourceRoot":"","sources":["../load-aspect.ts"],"names":[],"mappings":"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"}
package/load-aspect.ts CHANGED
@@ -41,8 +41,7 @@ export async function loadAspect<T>(targetAspect: Aspect, cwd = process.cwd(), r
41
41
 
42
42
  await harmony.run(async (aspect, runtimeDef) => {
43
43
  const id = ComponentID.fromString(aspect.id);
44
- const packageName = getPackageName(aspect, id);
45
- const mainFilePath = require.resolve(packageName);
44
+ const mainFilePath = getMainFilePath(aspect, id);
46
45
  const packagePath = resolve(join(mainFilePath, '..'));
47
46
  const files = readdirSync(packagePath);
48
47
  const runtimePath = files.find((path) => path.includes(`.${runtimeDef.name}.runtime.js`));
@@ -63,6 +62,18 @@ go to the aspect-main file and add a new line with "export default YourAspectMai
63
62
  return harmony.get(targetAspect.id);
64
63
  }
65
64
 
65
+ function getMainFilePath(aspect: any, id: ComponentID) {
66
+ let packageName = getPackageName(aspect, id);
67
+ try {
68
+ // try core aspects
69
+ return require.resolve(packageName);
70
+ } catch (err) {
71
+ // fallback to a naive way of converting componentId to pkg-name. (it won't work when the component has special pkg name settings)
72
+ packageName = `@${id.scope.replace('.', '/')}.${id.fullName.replaceAll('/', '.')}`;
73
+ return require.resolve(packageName);
74
+ }
75
+ }
76
+
66
77
  export async function getConfig(cwd = process.cwd()) {
67
78
  const consumerInfo = await getConsumerInfo(cwd);
68
79
  const scopePath = propagateUntil(cwd);
package/package.json CHANGED
@@ -1,21 +1,21 @@
1
1
  {
2
2
  "name": "@teambit/harmony.testing.load-aspect",
3
- "version": "0.0.15",
3
+ "version": "0.0.17",
4
4
  "homepage": "https://bit.dev/teambit/harmony/testing/load-aspect",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.harmony",
8
8
  "name": "testing/load-aspect",
9
- "version": "0.0.15"
9
+ "version": "0.0.17"
10
10
  },
11
11
  "dependencies": {
12
- "@teambit/harmony": "0.3.3"
12
+ "@teambit/harmony": "0.4.6"
13
13
  },
14
14
  "devDependencies": {
15
15
  "@types/mocha": "9.1.0",
16
- "@babel/runtime": "7.20.0",
16
+ "@types/jest": "26.0.20",
17
17
  "@types/node": "12.20.4",
18
- "@types/jest": "26.0.20"
18
+ "@babel/runtime": "7.20.0"
19
19
  },
20
20
  "peerDependencies": {},
21
21
  "license": "Apache-2.0",