@eggjs/core 7.0.2-beta.25 → 7.0.2-beta.26

package/dist/egg.d.ts

@@ -4,12 +4,12 @@ import { Timing } from "./utils/timing.js";
 import { Lifecycle } from "./lifecycle.js";
 import { EggAppConfig } from "./types.js";
 import { EggLoader } from "./loader/egg_loader.js";
-import { LoaderFS } from "./loader/loader_fs.js";
 import { SingletonCreateMethod } from "./singleton.js";
 import { Application as KoaApplication, Context as KoaContext, MiddlewareFunc as KoaMiddlewareFunc, Next, Request as KoaRequest, Response as KoaResponse } from "@eggjs/koa";
 import { EggRouter as Router, RegisterOptions, ResourcesController } from "@eggjs/router";
 import { EggConsoleLogger, Logger } from "egg-logger";
 import { ReadyFunctionArg } from "get-ready";
+import { LoaderFS } from "@eggjs/loader-fs";
 
 //#region src/egg.d.ts
 declare const EGG_LOADER: symbol;

package/dist/index.d.ts

@@ -7,10 +7,9 @@ import { ManifestGenerateOptions, ManifestInvalidation, ManifestStore, StartupMa
 import { CaseStyle, CaseStyleFunction, EXPORTS, FULLPATH, FileLoader, FileLoaderFilter, FileLoaderInitializer, FileLoaderOptions, FileLoaderParseItem } from "./loader/file_loader.js";
 import { ClassLoader, ClassLoaderOptions, ContextLoader, ContextLoaderOptions } from "./loader/context_loader.js";
 import { EggDirInfo, EggDirInfoType, EggLoader, EggLoaderOptions } from "./loader/egg_loader.js";
-import { ManifestLoaderFS } from "./loader/loader_fs.js";
 import { Singleton, SingletonCreateMethod, SingletonOptions } from "./singleton.js";
 import { Context, EGG_LOADER, EggCore, EggCoreInitOptions, EggCoreOptions, KoaApplication, KoaContext, KoaMiddlewareFunc, KoaRequest, KoaResponse, MiddlewareFunc, Next, Request, Response, Router } from "./egg.js";
 import { SequencifyResult, SequencifyTask, sequencify } from "./utils/sequencify.js";
 import "@eggjs/typings/global";
 export * from "@eggjs/loader-fs";
-export { BaseContextClass, BootImplClass, CaseStyle, CaseStyleFunction, ClassLoader, ClassLoaderOptions, Context, ContextLoader, ContextLoaderOptions, CustomLoaderConfigItem, EGG_LOADER, EXPORTS, EggAppConfig, EggAppInfo, EggCore, EggCoreInitOptions, EggCoreOptions, EggDirInfo, EggDirInfoType, EggLoader, EggLoaderOptions, EggPluginInfo, FULLPATH, FileLoader, FileLoaderFilter, FileLoaderInitializer, FileLoaderOptions, FileLoaderParseItem, FunWithFullPath, ILifecycleBoot, KoaApplication, KoaContext, KoaMiddlewareFunc, KoaRequest, KoaResponse, Lifecycle, LifecycleOptions, ManifestGenerateOptions, ManifestInvalidation, ManifestLoaderFS, ManifestStore, MiddlewareFunc, Next, Request, Response, Router, SequencifyResult, SequencifyTask, Singleton, SingletonCreateMethod, SingletonOptions, StartupManifest, Timing, TimingItem, sequencify, utils };
+export { BaseContextClass, BootImplClass, CaseStyle, CaseStyleFunction, ClassLoader, ClassLoaderOptions, Context, ContextLoader, ContextLoaderOptions, CustomLoaderConfigItem, EGG_LOADER, EXPORTS, EggAppConfig, EggAppInfo, EggCore, EggCoreInitOptions, EggCoreOptions, EggDirInfo, EggDirInfoType, EggLoader, EggLoaderOptions, EggPluginInfo, FULLPATH, FileLoader, FileLoaderFilter, FileLoaderInitializer, FileLoaderOptions, FileLoaderParseItem, FunWithFullPath, ILifecycleBoot, KoaApplication, KoaContext, KoaMiddlewareFunc, KoaRequest, KoaResponse, Lifecycle, LifecycleOptions, ManifestGenerateOptions, ManifestInvalidation, ManifestStore, MiddlewareFunc, Next, Request, Response, Router, SequencifyResult, SequencifyTask, Singleton, SingletonCreateMethod, SingletonOptions, StartupManifest, Timing, TimingItem, sequencify, utils };

package/dist/index.js

@@ -9,9 +9,8 @@ import { ManifestStore } from "./loader/manifest.js";
 import { EggLoader } from "./loader/egg_loader.js";
 import { Singleton } from "./singleton.js";
 import { Context, EGG_LOADER, EggCore, KoaApplication, KoaContext, KoaRequest, KoaResponse, Request, Response, Router } from "./egg.js";
-import { ManifestLoaderFS } from "./loader/loader_fs.js";
 import "@eggjs/typings/global";
 
 export * from "@eggjs/loader-fs"
 
-export { BaseContextClass, CaseStyle, ClassLoader, Context, ContextLoader, EGG_LOADER, EXPORTS, EggCore, EggLoader, FULLPATH, FileLoader, KoaApplication, KoaContext, KoaRequest, KoaResponse, Lifecycle, ManifestLoaderFS, ManifestStore, Request, Response, Router, Singleton, Timing, sequencify, utils_default as utils };
+export { BaseContextClass, CaseStyle, ClassLoader, Context, ContextLoader, EGG_LOADER, EXPORTS, EggCore, EggLoader, FULLPATH, FileLoader, KoaApplication, KoaContext, KoaRequest, KoaResponse, Lifecycle, ManifestStore, Request, Response, Router, Singleton, Timing, sequencify, utils_default as utils };

package/dist/loader/egg_loader.d.ts

@@ -46,7 +46,7 @@ declare class EggLoader {
   dirs?: EggDirInfo[];
   /** Startup manifest — loaded from cache or collecting for generation */
   readonly manifest: ManifestStore;
-  readonly loaderFS: LoaderFS;
+  loaderFS: LoaderFS;
   /**
   * @class
   * @param {Object} options - options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/core",
-  "version": "7.0.2-beta.25",
+  "version": "7.0.2-beta.26",
   "description": "A core plugin framework based on @eggjs/koa",
   "keywords": [
     "egg",
@@ -39,18 +39,17 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@eggjs/extend2": "5.0.2-beta.25",
-    "@eggjs/koa": "3.1.2-beta.25",
-    "@eggjs/loader-fs": "1.0.0-beta.25",
-    "@eggjs/path-matching": "3.0.2-beta.25",
-    "@eggjs/router": "4.0.2-beta.25",
-    "@eggjs/typings": "4.1.2-beta.25",
-    "@eggjs/utils": "5.0.2-beta.25",
+    "@eggjs/extend2": "5.0.2-beta.26",
+    "@eggjs/koa": "3.1.2-beta.26",
+    "@eggjs/loader-fs": "1.0.0-beta.26",
+    "@eggjs/path-matching": "3.0.2-beta.26",
+    "@eggjs/router": "4.0.2-beta.26",
+    "@eggjs/typings": "4.1.2-beta.26",
+    "@eggjs/utils": "5.0.2-beta.26",
     "egg-logger": "^3.5.0",
     "get-ready": "^3.1.0",
     "globby": "^11.0.2",
     "is-type-of": "^2.2.0",
-    "multimatch": "^7.0.0",
     "node-homedir": "^2.0.0",
     "performance-ms": "^1.1.0",
     "ready-callback": "^4.0.0",
@@ -58,9 +57,9 @@
     "utility": "^2.5.0"
   },
   "devDependencies": {
-    "@eggjs/mock": "7.0.2-beta.25",
-    "@eggjs/supertest": "9.0.2-beta.25",
-    "@eggjs/tsconfig": "3.1.2-beta.25",
+    "@eggjs/mock": "7.0.2-beta.26",
+    "@eggjs/supertest": "9.0.2-beta.26",
+    "@eggjs/tsconfig": "3.1.2-beta.26",
     "@types/js-yaml": "^4.0.9",
     "await-event": "2",
     "coffee": "5",

package/dist/loader/loader_fs.d.ts

@@ -1,17 +0,0 @@
-import { ManifestStore } from "./manifest.js";
-import { Stats } from "node:fs";
-import { LoaderFS as LoaderFS$1, LoaderFSGlobOptions } from "@eggjs/loader-fs";
-
-//#region src/loader/loader_fs.d.ts
-declare class ManifestLoaderFS implements LoaderFS$1 {
-  #private;
-  constructor(manifest: ManifestStore, fallback?: LoaderFS$1);
-  exists(filepath: string): boolean;
-  stat(filepath: string): Stats;
-  realpath(filepath: string): string;
-  readJSON<T = unknown>(filepath: string): T;
-  glob(patterns: string | string[], options?: LoaderFSGlobOptions): string[];
-  loadFile(filepath: string): Promise<unknown>;
-}
-//#endregion
-export { type LoaderFS$1 as LoaderFS, ManifestLoaderFS };

package/dist/loader/loader_fs.js

@@ -1,271 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { RealLoaderFS as RealLoaderFS$1 } from "@eggjs/loader-fs";
-import multimatch from "multimatch";
-
-//#region src/loader/loader_fs.ts
-var ManifestLoaderFS = class {
-	#manifest;
-	#fallback;
-	#manifestFiles;
-	#manifestDirectories;
-	#resolveCacheTargets;
-	constructor(manifest, fallback = new RealLoaderFS$1()) {
-		this.#manifest = manifest;
-		this.#fallback = fallback;
-		this.#resolveCacheTargets = new Set(Object.values(manifest.data.resolveCache).filter((target) => typeof target === "string"));
-		const manifestFiles = /* @__PURE__ */ new Set();
-		const manifestDirectories = /* @__PURE__ */ new Set();
-		for (const [dir, files] of Object.entries(manifest.data.fileDiscovery)) {
-			addManifestDirectory(manifestDirectories, dir);
-			for (const file of files) {
-				const fullRel = path.posix.join(dir, file);
-				manifestFiles.add(fullRel);
-				addManifestDirectory(manifestDirectories, path.posix.dirname(fullRel));
-			}
-		}
-		for (const target of this.#resolveCacheTargets) {
-			manifestFiles.add(target);
-			addManifestDirectory(manifestDirectories, path.posix.dirname(target));
-		}
-		this.#manifestFiles = manifestFiles;
-		this.#manifestDirectories = manifestDirectories;
-	}
-	exists(filepath) {
-		const entry = this.#getManifestEntry(filepath);
-		if (entry) return entry.type !== "missing";
-		return this.#fallback.exists(filepath);
-	}
-	stat(filepath) {
-		const entry = this.#getManifestEntry(filepath);
-		if (entry?.type === "file" || entry?.type === "directory") return createVirtualStats(entry.type);
-		if (entry?.type === "missing") throw createNotFoundError("stat", filepath);
-		return this.#fallback.stat(filepath);
-	}
-	realpath(filepath) {
-		const entry = this.#getManifestEntry(filepath);
-		if (entry?.type === "file" || entry?.type === "directory") return this.#toAbsolute(entry.rel);
-		if (entry?.type === "missing") throw createNotFoundError("realpath", filepath);
-		return this.#fallback.realpath(filepath);
-	}
-	readJSON(filepath) {
-		const entry = this.#getManifestEntry(filepath);
-		if (entry?.type === "file") {
-			const bundled = this.#loadBundledModule(entry.rel);
-			if (bundled !== void 0) return unwrapDefaultExport(bundled);
-		}
-		if (entry?.type === "missing") throw createNotFoundError("open", filepath);
-		return this.#fallback.readJSON(filepath);
-	}
-	glob(patterns, options) {
-		const cwd = options?.cwd === void 0 ? process.cwd() : String(options.cwd);
-		const absoluteCwd = path.resolve(cwd);
-		const cwdRel = this.#toRelative(absoluteCwd);
-		const manifestFiles = this.#listManifestFilesUnder(cwdRel);
-		if (manifestFiles === void 0) return this.#fallback.glob(patterns, options);
-		const matched = filterManifestGlob(manifestFiles, patterns, options);
-		if (options?.absolute) return matched.map((file) => path.join(absoluteCwd, file));
-		return matched;
-	}
-	async loadFile(filepath) {
-		const entry = this.#getManifestEntry(filepath);
-		if (entry?.type === "file") {
-			const bundled = this.#loadBundledModule(entry.rel);
-			if (bundled !== void 0) return unwrapDefaultExport(bundled);
-		}
-		if (entry?.type === "missing") throw createNotFoundError("open", filepath);
-		return this.#fallback.loadFile(filepath);
-	}
-	#getManifestEntry(filepath) {
-		const rel = this.#toRelative(filepath);
-		const resolved = this.#resolveManifestFile(rel);
-		if (resolved?.type === "file") return {
-			type: "file",
-			rel: resolved.rel
-		};
-		if (resolved?.type === "missing") return {
-			type: "missing",
-			rel
-		};
-		if (this.#isManifestDirectory(rel)) return {
-			type: "directory",
-			rel
-		};
-	}
-	#resolveManifestFile(rel) {
-		const cache = this.#manifest.data.resolveCache;
-		if (Object.hasOwn(cache, rel)) {
-			const cached = cache[rel];
-			return cached === null ? { type: "missing" } : {
-				type: "file",
-				rel: cached
-			};
-		}
-		if (this.#isManifestFile(rel)) return {
-			type: "file",
-			rel
-		};
-		const discovered = this.#resolveFromFileDiscovery(rel);
-		if (discovered) return {
-			type: "file",
-			rel: discovered
-		};
-	}
-	#resolveFromFileDiscovery(rel) {
-		const matchedDir = this.#nearestManifestDiscoveryDir(rel);
-		if (matchedDir === void 0 || rel === matchedDir) return;
-		const request = matchedDir === "" ? rel : rel.slice(matchedDir.length + 1);
-		for (const file of this.#manifest.data.fileDiscovery[matchedDir]) {
-			if (file === request) return path.posix.join(matchedDir, file);
-			const ext = path.posix.extname(file);
-			if (!ext || ext === ".map") continue;
-			const extensionlessFile = file.slice(0, -ext.length);
-			if (extensionlessFile === request || extensionlessFile === `${request}/index`) return path.posix.join(matchedDir, file);
-		}
-	}
-	#nearestManifestDiscoveryDir(rel) {
-		let current = path.posix.dirname(rel);
-		while (true) {
-			const dir = current === "." ? "" : current;
-			if (Object.hasOwn(this.#manifest.data.fileDiscovery, dir)) return dir;
-			if (dir === "") return;
-			current = path.posix.dirname(dir);
-		}
-	}
-	#isManifestFile(rel) {
-		return this.#manifestFiles.has(rel);
-	}
-	#isManifestDirectory(rel) {
-		return this.#manifestDirectories.has(rel);
-	}
-	#listManifestFilesUnder(cwdRel) {
-		if (!this.#isManifestDirectory(cwdRel)) return;
-		const files = /* @__PURE__ */ new Set();
-		for (const [dir, entries] of Object.entries(this.#manifest.data.fileDiscovery)) {
-			const prefix = dir === cwdRel ? "" : relativePrefix(cwdRel, dir);
-			if (prefix === void 0) continue;
-			for (const entry of entries) files.add(path.posix.join(prefix, entry));
-		}
-		for (const target of Object.values(this.#manifest.data.resolveCache)) {
-			if (!target) continue;
-			const prefix = relativePrefix(cwdRel, path.posix.dirname(target));
-			if (prefix !== void 0) files.add(path.posix.join(prefix, path.posix.basename(target)));
-		}
-		return [...files].sort();
-	}
-	#loadBundledModule(rel) {
-		const loader = globalThis.__EGG_BUNDLE_MODULE_LOADER__;
-		if (!loader) return void 0;
-		for (const key of this.#bundleKeys(rel)) {
-			const loaded = loader(key);
-			if (loaded !== void 0) return loaded;
-		}
-	}
-	#bundleKeys(rel) {
-		const abs = this.#toAbsolute(rel);
-		return [...new Set([rel, normalizePath(abs)])];
-	}
-	#toRelative(filepath) {
-		return normalizePath(path.relative(this.#manifest.baseDir, path.resolve(filepath)));
-	}
-	#toAbsolute(rel) {
-		return path.isAbsolute(rel) ? rel : path.join(this.#manifest.baseDir, rel);
-	}
-};
-function normalizePath(filepath) {
-	return filepath.replaceAll(path.sep, "/");
-}
-function addManifestDirectory(directories, dir) {
-	let current = dir === "." ? "" : dir;
-	while (true) {
-		directories.add(current);
-		if (current === "") return;
-		const parent = path.posix.dirname(current);
-		current = parent === "." ? "" : parent;
-	}
-}
-function relativePrefix(cwdRel, dirRel) {
-	if (cwdRel === "") return dirRel;
-	if (dirRel === cwdRel) return "";
-	if (dirRel.startsWith(cwdRel + "/")) return dirRel.slice(cwdRel.length + 1);
-}
-function filterManifestGlob(files, patterns, options) {
-	const patternList = Array.isArray(patterns) ? patterns : [patterns];
-	if (!patternList.some((pattern) => !pattern.startsWith("!"))) return [];
-	const ignoreList = Array.isArray(options?.ignore) ? options.ignore.map(String) : options?.ignore ? [String(options.ignore)] : [];
-	return multimatch(files, patternList.map(normalizeAlternationGroups).concat(ignoreList.map((pattern) => `!${normalizeAlternationGroups(pattern)}`)), toMultimatchOptions(options));
-}
-function toMultimatchOptions(options) {
-	return {
-		...options?.dot !== void 0 ? { dot: options.dot } : {},
-		...options?.caseSensitiveMatch !== void 0 ? { nocase: !options.caseSensitiveMatch } : {},
-		...options?.braceExpansion !== void 0 ? { nobrace: !options.braceExpansion } : {},
-		...options?.extglob !== void 0 ? { noext: !options.extglob } : {},
-		...options?.globstar !== void 0 ? { noglobstar: !options.globstar } : {},
-		...options?.baseNameMatch !== void 0 ? { matchBase: options.baseNameMatch } : {}
-	};
-}
-function normalizeAlternationGroups(pattern) {
-	let normalized = "";
-	for (let index = 0; index < pattern.length; index++) {
-		const char = pattern[index];
-		if (char !== "(" || isExtglobPrefix(pattern[index - 1])) {
-			normalized += char;
-			continue;
-		}
-		const end = pattern.indexOf(")", index + 1);
-		if (end === -1) {
-			normalized += char;
-			continue;
-		}
-		const group = pattern.slice(index + 1, end);
-		if (group.includes("|")) {
-			normalized += `{${group.replaceAll("|", ",")}}`;
-			index = end;
-		} else normalized += char;
-	}
-	return normalized;
-}
-function isExtglobPrefix(char) {
-	return char === "@" || char === "!" || char === "?" || char === "+" || char === "*";
-}
-function unwrapDefaultExport(value) {
-	let unwrapped = value;
-	if (isRecord(unwrapped) && isRecord(unwrapped.default) && unwrapped.default.__esModule === true) unwrapped = unwrapped.default;
-	if (isRecord(unwrapped) && "default" in unwrapped) return unwrapped.default;
-	return unwrapped;
-}
-function isRecord(value) {
-	return value !== null && typeof value === "object";
-}
-function createVirtualStats(type) {
-	const stat = Object.create(fs.Stats.prototype);
-	const isFile = type === "file";
-	const timestamp = /* @__PURE__ */ new Date(0);
-	Object.defineProperties(stat, {
-		size: { value: 0 },
-		atimeMs: { value: 0 },
-		mtimeMs: { value: 0 },
-		ctimeMs: { value: 0 },
-		birthtimeMs: { value: 0 },
-		atime: { value: timestamp },
-		mtime: { value: timestamp },
-		ctime: { value: timestamp },
-		birthtime: { value: timestamp },
-		isFile: { value: () => isFile },
-		isDirectory: { value: () => !isFile },
-		isSymbolicLink: { value: () => false }
-	});
-	return stat;
-}
-function createNotFoundError(syscall, filepath) {
-	const err = /* @__PURE__ */ new Error(`ENOENT: no such file or directory, ${syscall} '${filepath}'`);
-	err.code = "ENOENT";
-	err.errno = -2;
-	err.syscall = syscall;
-	err.path = filepath;
-	return err;
-}
-
-//#endregion
-export { ManifestLoaderFS };