@eggjs/utils 4.2.0 → 4.2.1

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.
Files changed (5) hide show
  1. package/dist/commonjs/import.js +41 -16
  2. package/dist/esm/import.js +41 -16
  3. package/dist/package.json +1 -1
  4. package/package.json +2 -2
  5. package/src/import.ts +42 -15
package/dist/commonjs/import.js CHANGED
@@ -137,32 +137,57 @@ function tryToResolveByDirname(dirname) {
137
137
  }
138
138
  return tryToResolveByDirnameFromPackage(dirname, pkg);
139
139
  }
140
+ function isRelativePath(filepath) {
141
+ return filepath.startsWith('./')
142
+ || filepath.startsWith('../')
143
+ || filepath.startsWith('.\\')
144
+ || filepath.startsWith('..\\');
145
+ }
146
+ function tryToResolveFromAbsoluteFile(filepath) {
147
+ let moduleFilePath;
148
+ const stat = node_fs_1.default.statSync(filepath, { throwIfNoEntry: false });
149
+ // try to resolve from directory
150
+ if (stat?.isDirectory()) {
151
+ moduleFilePath = tryToResolveByDirname(filepath);
152
+ if (moduleFilePath) {
153
+ return moduleFilePath;
154
+ }
155
+ }
156
+ else if (stat?.isFile()) {
157
+ return filepath;
158
+ }
159
+ // try to resolve from file
160
+ moduleFilePath = tryToResolveFromFile(filepath);
161
+ if (moduleFilePath) {
162
+ return moduleFilePath;
163
+ }
164
+ }
140
165
  function importResolve(filepath, options) {
166
+ // find *.json or CommonJS module by require.resolve
167
+ // e.g.: importResolve('egg/package.json', { paths })
168
+ const cwd = process.cwd();
169
+ const paths = options?.paths ?? [cwd];
141
170
  let moduleFilePath;
142
171
  const isAbsolute = node_path_1.default.isAbsolute(filepath);
143
172
  if (isAbsolute) {
144
- const stat = node_fs_1.default.statSync(filepath, { throwIfNoEntry: false });
145
- // try to resolve from directory
146
- if (stat?.isDirectory()) {
147
- moduleFilePath = tryToResolveByDirname(filepath);
173
+ moduleFilePath = tryToResolveFromAbsoluteFile(filepath);
174
+ if (moduleFilePath) {
175
+ debug('[importResolve:isAbsolute] %o => %o', filepath, moduleFilePath);
176
+ return moduleFilePath;
177
+ }
178
+ }
179
+ else if (isRelativePath(filepath)) {
180
+ for (const p of paths) {
181
+ const resolvedPath = node_path_1.default.resolve(p, filepath);
182
+ moduleFilePath = tryToResolveFromAbsoluteFile(resolvedPath);
148
183
  if (moduleFilePath) {
149
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
184
+ debug('[importResolve:isRelativePath] %o => %o => %o', filepath, resolvedPath, moduleFilePath);
150
185
  return moduleFilePath;
151
186
  }
152
187
  }
153
- // try to resolve from file
154
- moduleFilePath = tryToResolveFromFile(filepath);
155
- if (moduleFilePath) {
156
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
157
- return moduleFilePath;
158
- }
159
188
  }
160
189
  const extname = node_path_1.default.extname(filepath);
161
190
  if ((!isAbsolute && extname === '.json') || !isESM) {
162
- // find *.json or CommonJS module by require.resolve
163
- // e.g.: importResolve('egg/package.json', { paths })
164
- const cwd = process.cwd();
165
- const paths = options?.paths ?? [cwd];
166
191
  moduleFilePath = getRequire().resolve(filepath, {
167
192
  paths,
168
193
  });
@@ -255,4 +280,4 @@ async function importModule(filepath, options) {
255
280
  }
256
281
  return obj;
257
282
  }
258
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
283
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
package/dist/esm/import.js CHANGED
@@ -130,32 +130,57 @@ function tryToResolveByDirname(dirname) {
130
130
  }
131
131
  return tryToResolveByDirnameFromPackage(dirname, pkg);
132
132
  }
133
+ function isRelativePath(filepath) {
134
+ return filepath.startsWith('./')
135
+ || filepath.startsWith('../')
136
+ || filepath.startsWith('.\\')
137
+ || filepath.startsWith('..\\');
138
+ }
139
+ function tryToResolveFromAbsoluteFile(filepath) {
140
+ let moduleFilePath;
141
+ const stat = fs.statSync(filepath, { throwIfNoEntry: false });
142
+ // try to resolve from directory
143
+ if (stat?.isDirectory()) {
144
+ moduleFilePath = tryToResolveByDirname(filepath);
145
+ if (moduleFilePath) {
146
+ return moduleFilePath;
147
+ }
148
+ }
149
+ else if (stat?.isFile()) {
150
+ return filepath;
151
+ }
152
+ // try to resolve from file
153
+ moduleFilePath = tryToResolveFromFile(filepath);
154
+ if (moduleFilePath) {
155
+ return moduleFilePath;
156
+ }
157
+ }
133
158
  export function importResolve(filepath, options) {
159
+ // find *.json or CommonJS module by require.resolve
160
+ // e.g.: importResolve('egg/package.json', { paths })
161
+ const cwd = process.cwd();
162
+ const paths = options?.paths ?? [cwd];
134
163
  let moduleFilePath;
135
164
  const isAbsolute = path.isAbsolute(filepath);
136
165
  if (isAbsolute) {
137
- const stat = fs.statSync(filepath, { throwIfNoEntry: false });
138
- // try to resolve from directory
139
- if (stat?.isDirectory()) {
140
- moduleFilePath = tryToResolveByDirname(filepath);
166
+ moduleFilePath = tryToResolveFromAbsoluteFile(filepath);
167
+ if (moduleFilePath) {
168
+ debug('[importResolve:isAbsolute] %o => %o', filepath, moduleFilePath);
169
+ return moduleFilePath;
170
+ }
171
+ }
172
+ else if (isRelativePath(filepath)) {
173
+ for (const p of paths) {
174
+ const resolvedPath = path.resolve(p, filepath);
175
+ moduleFilePath = tryToResolveFromAbsoluteFile(resolvedPath);
141
176
  if (moduleFilePath) {
142
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
177
+ debug('[importResolve:isRelativePath] %o => %o => %o', filepath, resolvedPath, moduleFilePath);
143
178
  return moduleFilePath;
144
179
  }
145
180
  }
146
- // try to resolve from file
147
- moduleFilePath = tryToResolveFromFile(filepath);
148
- if (moduleFilePath) {
149
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
150
- return moduleFilePath;
151
- }
152
181
  }
153
182
  const extname = path.extname(filepath);
154
183
  if ((!isAbsolute && extname === '.json') || !isESM) {
155
- // find *.json or CommonJS module by require.resolve
156
- // e.g.: importResolve('egg/package.json', { paths })
157
- const cwd = process.cwd();
158
- const paths = options?.paths ?? [cwd];
159
184
  moduleFilePath = getRequire().resolve(filepath, {
160
185
  paths,
161
186
  });
@@ -248,4 +273,4 @@ export async function importModule(filepath, options) {
248
273
  }
249
274
  return obj;
250
275
  }
251
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
276
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
package/dist/package.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "name": "@eggjs/utils",
3
- "version": "4.2.0"
3
+ "version": "4.2.1"
4
4
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eggjs/utils",
3
- "version": "4.2.0",
3
+ "version": "4.2.1",
4
4
  "engine": {
5
5
  "node": ">=18.19.0"
6
6
  },
@@ -11,7 +11,7 @@
11
11
  "scripts": {
12
12
  "lint": "eslint src test --ext ts",
13
13
  "pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
14
- "test": "npm run test-local",
14
+ "test": "egg-bin test",
15
15
  "posttest": "npm run clean",
16
16
  "test-local": "egg-bin test",
17
17
  "preci": "npm run clean && npm run lint && npm run prepublishOnly",
package/src/import.ts CHANGED
@@ -150,33 +150,60 @@ function tryToResolveByDirname(dirname: string): string | undefined {
150
150
  return tryToResolveByDirnameFromPackage(dirname, pkg);
151
151
  }
152
152
 
153
+ function isRelativePath(filepath: string): boolean {
154
+ return filepath.startsWith('./')
155
+ || filepath.startsWith('../')
156
+ || filepath.startsWith('.\\')
157
+ || filepath.startsWith('..\\');
158
+ }
159
+
160
+ function tryToResolveFromAbsoluteFile(filepath: string): string | undefined {
161
+ let moduleFilePath: string | undefined;
162
+ const stat = fs.statSync(filepath, { throwIfNoEntry: false });
163
+ // try to resolve from directory
164
+ if (stat?.isDirectory()) {
165
+ moduleFilePath = tryToResolveByDirname(filepath);
166
+ if (moduleFilePath) {
167
+ return moduleFilePath;
168
+ }
169
+ } else if (stat?.isFile()) {
170
+ return filepath;
171
+ }
172
+ // try to resolve from file
173
+ moduleFilePath = tryToResolveFromFile(filepath);
174
+ if (moduleFilePath) {
175
+ return moduleFilePath;
176
+ }
177
+ }
178
+
153
179
  export function importResolve(filepath: string, options?: ImportResolveOptions) {
180
+ // find *.json or CommonJS module by require.resolve
181
+ // e.g.: importResolve('egg/package.json', { paths })
182
+ const cwd = process.cwd();
183
+ const paths = options?.paths ?? [ cwd ];
184
+
154
185
  let moduleFilePath: string | undefined;
155
186
  const isAbsolute = path.isAbsolute(filepath);
156
187
  if (isAbsolute) {
157
- const stat = fs.statSync(filepath, { throwIfNoEntry: false });
158
- // try to resolve from directory
159
- if (stat?.isDirectory()) {
160
- moduleFilePath = tryToResolveByDirname(filepath);
188
+ moduleFilePath = tryToResolveFromAbsoluteFile(filepath);
189
+ if (moduleFilePath) {
190
+ debug('[importResolve:isAbsolute] %o => %o', filepath, moduleFilePath);
191
+ return moduleFilePath;
192
+ }
193
+ } else if (isRelativePath(filepath)) {
194
+ for (const p of paths) {
195
+ const resolvedPath = path.resolve(p, filepath);
196
+ moduleFilePath = tryToResolveFromAbsoluteFile(resolvedPath);
161
197
  if (moduleFilePath) {
162
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
198
+ debug('[importResolve:isRelativePath] %o => %o => %o',
199
+ filepath, resolvedPath, moduleFilePath);
163
200
  return moduleFilePath;
164
201
  }
165
202
  }
166
- // try to resolve from file
167
- moduleFilePath = tryToResolveFromFile(filepath);
168
- if (moduleFilePath) {
169
- debug('[importResolve] %o => %o', filepath, moduleFilePath);
170
- return moduleFilePath;
171
- }
172
203
  }
173
204
 
174
205
  const extname = path.extname(filepath);
175
206
  if ((!isAbsolute && extname === '.json') || !isESM) {
176
- // find *.json or CommonJS module by require.resolve
177
- // e.g.: importResolve('egg/package.json', { paths })
178
- const cwd = process.cwd();
179
- const paths = options?.paths ?? [ cwd ];
180
207
  moduleFilePath = getRequire().resolve(filepath, {
181
208
  paths,
182
209
  });