@compelem/compiler 0.30.0-beta.5 → 0.30.0-beta.6

package/dist/index.d.ts

@@ -113,6 +113,13 @@ interface StaticLiteralCodes {
   states?: string;
   /** `__ce_static__.computedGetters` 字面量值（@computed 前移，原 getter 体外提） */
   computedGetters?: string;
+  /**
+   * `__ce_static__.resources` 字面量值（@resource 前移）。
+   *
+   * 只放纯数据选项（timeout/immediate/track + source 的布尔标记）；
+   * loader 与 source 函数搬成类上的 `__rl_<name>` / `__rs_<name>` 私有方法。
+   */
+  resources?: string;
   /** 类体访问器源码（prop/state/computed 的 get/set + `@tag` 类的 observedAttributes），
    *  接在 static 字面量之后注入。无 `@tag` 的类不带 observedAttributes —— 它们永不被
    *  `customElements.define`，浏览器不会读它们的表。 */

package/dist/index.js

@@ -1,3 +1,3 @@
-import { C as collectCompelemImports, S as analyzeFile, T as parse, _ as DEBUG_DIV, a as scanKnownTags, b as inlineTemplateMethods, c as offsetToLineCol, d as reportDiagnostics, f as compileFile, g as injectInto, h as buildStaticLiteral, i as TAG_RE, l as relativeToRoot, m as defaultInclude, o as collectDiagnostics, p as compileSource, r as DEFAULT_TAG_EXT, s as newlineIndex, t as compelemCompiler, u as reportConventionDiagnostics, v as StaticAnalysisError, w as isCompelemSource, x as analyzeRender, y as assertStaticAnalysis } from "./vite-CLK9td6W.js";
+import { C as collectCompelemImports, S as analyzeFile, T as parse, _ as DEBUG_DIV, a as scanKnownTags, b as inlineTemplateMethods, c as offsetToLineCol, d as reportDiagnostics, f as compileFile, g as injectInto, h as buildStaticLiteral, i as TAG_RE, l as relativeToRoot, m as defaultInclude, o as collectDiagnostics, p as compileSource, r as DEFAULT_TAG_EXT, s as newlineIndex, t as compelemCompiler, u as reportConventionDiagnostics, v as StaticAnalysisError, w as isCompelemSource, x as analyzeRender, y as assertStaticAnalysis } from "./vite-C95uwtJI.js";
 
 export { DEBUG_DIV, DEFAULT_TAG_EXT, StaticAnalysisError, TAG_RE, analyzeFile, analyzeRender, assertStaticAnalysis, buildStaticLiteral, collectCompelemImports, collectDiagnostics, compelemCompiler, compileFile, compileSource, defaultInclude, injectInto, inlineTemplateMethods, isCompelemSource, newlineIndex, offsetToLineCol, parse, relativeToRoot, reportConventionDiagnostics, reportDiagnostics, scanKnownTags };

package/dist/{vite-CLK9td6W.js → vite-C95uwtJI.js}

@@ -494,12 +494,21 @@ function extractClassInfo(node, resolve) {
 				const imported = resolve(d);
 				return imported === "query" || imported === "queryAll";
 			})) queryFields.add(name);
-			if (member.type === "MethodDefinition") {
-				if (member.kind === "get") getters.add(name);
-				else methods.add(name);
+			const resDeco = (member.decorators ?? []).find((d) => {
+				const n = decoratorName(d);
+				return n ? resolve(n) === "resource" : false;
+			});
+			if (member.type === "MethodDefinition") if (member.kind === "get") {
+				getters.add(name);
+				const fn = member.value;
+				if (fn?.body) bodies.set(name, fn.body);
+			} else {
+				methods.add(name);
 				const fn = member.value;
 				if (fn?.body) bodies.set(name, fn.body);
-			} else if (member.type === "PropertyDefinition") {
+			}
+			else if (member.type === "PropertyDefinition") if (resDeco) getters.add(name);
+			else {
 				const init = member.value;
 				if (init && (init.type === "ArrowFunctionExpression" || init.type === "FunctionExpression")) {
 					methods.add(name);
@@ -1804,6 +1813,7 @@ function buildStaticLiteral(opts, codes = {}) {
 	parts.push(mark("props", `props: ${emitFamily("props", codes.props)}`));
 	parts.push(mark("states", `states: ${emitFamily("states", codes.states)}`));
 	parts.push(mark("computedGetters", `computedGetters: ${emitFamily("computedGetters", codes.computedGetters)}`));
+	parts.push(mark("resources", `resources: ${emitFamily("resources", codes.resources)}`));
 	const watchCode = emitWatchEffects(codes.watchEffects, codes.inlinedWatchAncestors);
 	if (watchCode !== void 0) parts.push(mark("watchEffects", `watchEffects: ${watchCode}`));
 	if (codes.cssEffect) parts.push(mark("cssEffect", `cssEffect: ${codes.cssEffect}`));
@@ -2595,8 +2605,8 @@ function checkConventions(comp, ctx) {
 function record(ctx, path) {
 	addDepPath(ctx.deps, path);
 }
-/** TS 包装节点解包（`this as any` / `that!` 等）—— 统一实现在 utils/ast#unwrapExpr。
-*  本副本原先比别处多认 `TSInstantiationExpression`、少认 `TSTypeAssertion`，已归一。 */
+/** TS 包装节点解包（`this as any` / `that!` / `<T>x` 等）—— 统一实现在 utils/ast#unwrapExpr，
+*  认 TSInstantiationExpression 与 TSTypeAssertion。 */
 /** 置失败标记；DEPS_TRACE=1 时输出原因标签（见文件头）。 */
 function failAt(ctx, where) {
 	if (typeof process !== "undefined" && process.env?.DEPS_TRACE) console.error("[deps-fail]", where);
@@ -4399,6 +4409,234 @@ function extractFieldAccessors(comp, code, ctx, bindings = {}, inheritedAccessor
 	};
 }
 
+//#endregion
+//#region src/analyze/resource-extract.ts
+const CODE = "E-RESOURCE";
+/** 选项闭集，逐字对齐运行期 `ResourceDecoratorOptions` */
+const OPT_KEYS = new Set([
+	"timeout",
+	"immediate",
+	"track",
+	"source"
+]);
+/** 合法标识符：资源名要拼进 `get <name>()`，非法名会生成坏代码 */
+const IDENT = /^[A-Za-z_$][\w$]*$/;
+/**
+* 不能用作资源名的成员：`CompElem` 原型上的访问器、方法与生命周期回调，
+* 外加 `Object.prototype` 的成员。
+*
+* 运行期按 `__ce_static__.resources` 在原型上装 `get <name>()`，安装前会检查
+* 原型链上是否已有同名键，有则跳过 —— 撞名的结果是资源**静默不可用**。
+* 编译器无法读到运行期原型（`CompElem` 继承 `HTMLElement`，Node 侧无法加载），
+* 这份名单与 `src/CompElem.ts` 的成员表同步维护。
+*/
+const RESERVED_NAMES = new Set([
+	"cid",
+	"attrs",
+	"props",
+	"renderRoot",
+	"renderRoots",
+	"parentComponent",
+	"wrapperComponent",
+	"rootComponent",
+	"slots",
+	"slotHooks",
+	"cssSheets",
+	"cssVars",
+	"isMounted",
+	"isDestroyed",
+	"insertStyleSheet",
+	"setup",
+	"propsReady",
+	"render",
+	"beforeMount",
+	"mounted",
+	"beforeDestroyed",
+	"destroyed",
+	"destroy",
+	"slotChange",
+	"afterUpdate",
+	"updateProps",
+	"getSubViewNodes",
+	"emit",
+	"nextTick",
+	"defineSignalField",
+	"forceUpdate",
+	"connectedCallback",
+	"disconnectedCallback",
+	"attributeChangedCallback",
+	"constructor",
+	"toString",
+	"toLocaleString",
+	"valueOf",
+	"hasOwnProperty",
+	"isPrototypeOf",
+	"propertyIsEnumerable",
+	"__proto__"
+]);
+/** 编译期注入的私有方法前缀 */
+const LOADER_PREFIX = "__rl_";
+const SOURCE_PREFIX = "__rs_";
+/** 迁移提示：给出可直接照抄的写法 */
+const MIGRATE = "\n  正确形态（loader 是第一个参数，选项可选）：\n    @resource((self, signal) => …, { timeout: 3000 })\n    rows!: ResourceView<Row[]>\n  之后模板里写 this.rows.data / this.rows.busy / this.rows.load()。";
+function extractResources(comp, code, ctx) {
+	const result = {
+		accessors: "",
+		removals: [],
+		runtimeHelpers: [],
+		errors: []
+	};
+	const cls = comp.cls ?? ctx.localClasses.get(comp.className);
+	if (!cls) return result;
+	const isResourceDeco = (d) => comp.compelemImports.get(d) === "resource";
+	const members = cls.body?.body ?? [];
+	const targets = [];
+	for (const member of members) {
+		const dec = (member.decorators ?? []).find((d) => {
+			const n = decoratorName(d);
+			return n ? isResourceDeco(n) : false;
+		});
+		if (!dec) continue;
+		targets.push({
+			member,
+			dec,
+			rawName: keyName(member.key) ?? ""
+		});
+	}
+	if (!targets.length) return result;
+	const fail = (member, dec, message) => {
+		const dStart = dec?.start ?? member.start;
+		result.errors.push({
+			start: Math.min(member.start, dStart),
+			end: member.end,
+			message
+		});
+	};
+	/** 本族已提交的资源名，用于同类内重复检查（TS 也会报，但这里给更直白的 E 码） */
+	const emitted = /* @__PURE__ */ new Set();
+	const entries = [];
+	let accessors = "";
+	const removals = [];
+	for (const { member, dec, rawName } of targets) {
+		if (member.type !== "PropertyDefinition") {
+			fail(member, dec, `${CODE}: @resource 只能装饰字段声明。${MIGRATE}`);
+			continue;
+		}
+		if (!rawName) {
+			fail(member, dec, `${CODE}: 无法识别被装饰的字段名（计算属性键不支持）`);
+			continue;
+		}
+		if (rawName.startsWith("#")) {
+			fail(member, dec, `${CODE}: 不支持私有字段（'${rawName}'）——视图访问器要挂在原型上才能被模板读取`);
+			continue;
+		}
+		if (!IDENT.test(rawName)) {
+			fail(member, dec, `${CODE}: 资源名 '${rawName}' 不是合法标识符（要用作 get ${rawName}()）`);
+			continue;
+		}
+		if (RESERVED_NAMES.has(rawName)) {
+			fail(member, dec, `${CODE}: 资源名 '${rawName}' 与 CompElem 原型链上的成员同名——访问器不会安装，this.${rawName} 取不到资源视图。请改用其它字段名`);
+			continue;
+		}
+		if (member.static === true) {
+			fail(member, dec, `${CODE}: 不支持静态资源（'${rawName}'）——注入的是实例 getter，static 成员会被整段删掉`);
+			continue;
+		}
+		if (member.value != null) {
+			fail(member, dec, `${CODE}: 字段不能带初始值（'${rawName} = …'）——值只由 loader 提供，写在字段上的初始值会被删掉，且不会报错`);
+			continue;
+		}
+		if (emitted.has(rawName)) {
+			fail(member, dec, `${CODE}: '${rawName}' 已经有另一个 @resource，资源名必须唯一`);
+			continue;
+		}
+		const otherDecos = (member.decorators ?? []).map(decoratorName).filter((d) => d && !isResourceDeco(d));
+		if (otherDecos.length) {
+			fail(member, dec, `${CODE}: @resource 不能与其它装饰器同用（'${rawName}' 上还有 @${otherDecos.join(" / @")}）`);
+			continue;
+		}
+		const callArgs = dec.expression?.type === "CallExpression" ? dec.expression.arguments ?? [] : [];
+		if (callArgs.length < 1 || callArgs.length > 2) {
+			fail(member, dec, `${CODE}: @resource 需要 (loader, options?) 两个参数以内${MIGRATE}`);
+			continue;
+		}
+		const loaderNode = unwrapExpr(callArgs[0]);
+		if (loaderNode?.type !== "ArrowFunctionExpression") {
+			fail(member, dec, loaderNode?.type === "ObjectExpression" ? `${CODE}: 形态已改为 @resource(loader, options?)——loader 从选项对象移到第一个参数${MIGRATE}` : `${CODE}: 第一个参数须是内联箭头函数 (self, signal) => …——编译期要把这段表达式搬进实例方法，引用式写法拿不到组件实例`);
+			continue;
+		}
+		if ((loaderNode.params ?? []).length !== 2) {
+			fail(member, dec, `${CODE}: loader 必须声明两个形参 (self, signal) —— 装饰器实参里没有 this，组件实例要显式传进来`);
+			continue;
+		}
+		/** loader 表达式切片（搬进方法体后 `this` 才是实例） */
+		const loaderExpr = `(${code.slice(loaderNode.start, loaderNode.end)})`;
+		let sourceExpr;
+		const keep = [];
+		let optsBad = false;
+		let optsNode;
+		if (callArgs.length === 2) {
+			optsNode = unwrapExpr(callArgs[1]);
+			if (optsNode?.type !== "ObjectExpression") {
+				fail(member, dec, `${CODE}: 第二个参数须是内联对象字面量（变量/import 无法静态前移）`);
+				continue;
+			}
+		}
+		for (const p of optsNode?.properties ?? []) {
+			if (p.type === "SpreadElement" || p.type === "ExperimentalSpreadProperty") {
+				fail(member, dec, `${CODE}: 选项不支持展开（spread 无法静态前移），请逐项写出`);
+				optsBad = true;
+				break;
+			}
+			if (p.computed) {
+				fail(member, dec, `${CODE}: 选项键无法静态解析（计算属性键不支持）`);
+				optsBad = true;
+				break;
+			}
+			const k = keyName(p.key);
+			if (!k) {
+				fail(member, dec, `${CODE}: 选项键无法静态解析（计算属性键不支持）`);
+				optsBad = true;
+				break;
+			}
+			if (!OPT_KEYS.has(k)) {
+				fail(member, dec, `${CODE}: ${k === "loader" || k === "fetch" || k === "fetcher" ? `'${k}' 不是选项——loader 是第一个参数，写成 @resource((self, signal) => …)${MIGRATE}` : ""}未知选项 '${k}'——ResourceDecoratorOptions 仅支持 ${[...OPT_KEYS].join(" / ")}`);
+				optsBad = true;
+				break;
+			}
+			if (k === "source") {
+				const v = unwrapExpr(p.value);
+				if (v?.type !== "ArrowFunctionExpression") {
+					fail(member, dec, `${CODE}: source 须是内联箭头函数 (self) => …——编译期要把这段表达式搬进实例方法，引用式写法拿不到组件实例`);
+					optsBad = true;
+					break;
+				}
+				if ((v.params ?? []).length > 1) {
+					fail(member, dec, `${CODE}: source 最多接收一个形参 (self)`);
+					optsBad = true;
+					break;
+				}
+				sourceExpr = `(${code.slice(v.start, v.end)})`;
+				continue;
+			}
+			keep.push(code.slice(p.start, p.end));
+		}
+		if (optsBad) continue;
+		emitted.add(rawName);
+		const keyLit = JSON.stringify(rawName);
+		accessors += `${DEBUG_DIV} resource ${rawName}\n${LOADER_PREFIX}${rawName}(__signal) { return ${loaderExpr}(this, __signal) }\n` + (sourceExpr ? `${SOURCE_PREFIX}${rawName}() { return ${sourceExpr}(this) }\n` : "");
+		const parts = keep.slice();
+		if (sourceExpr) parts.push("source: true");
+		entries.push(`${keyLit}: { ${parts.join(", ")} }`);
+		removals.push(lineSpan(code, Math.min(member.start, dec.start ?? member.start), member.end));
+	}
+	if (!removals.length) return result;
+	result.accessors = accessors;
+	result.removals = removals;
+	result.resourcesCode = `{ ${entries.join(", ")} }`;
+	return result;
+}
+
 //#endregion
 //#region src/analyze/method-deco-extract.ts
 /** 本地变量前缀（避开用户标识符；`__` 前缀与框架其余注入一致）。 */
@@ -4712,8 +4950,7 @@ function staticHtmlFragmentOf(e, comp) {
 * 非 this 起始 / 含 computed 访问时返回 null。
 *
 * 统一实现在 utils/ast#thisChain（属性名走 keyName，`#private` 带 `#` 前缀，
-* 与 render-body 侧对齐 —— 本副本原先手写分支漏了前缀，会把 `this.#x` 与
-* `this.x` 混成同一个依赖键）。
+* 否则 `this.#x` 与 `this.x` 会混成同一个依赖键）。
 */
 /**
 * 提取 TAG 指令实参中的 this 链全前缀路径。
@@ -7944,16 +8181,21 @@ function compileFile(code, id, options = {}) {
 		const mdRes = extractMethodDecos(comp, code, convCtx);
 		conventionErrors.push(...mdRes.errors);
 		const mdHelpers = mdRes.runtimeHelpers.map((n) => helperBindings[n] ?? n);
+		const resRes = extractResources(comp, code, convCtx);
+		conventionErrors.push(...resRes.errors);
+		const resHelpers = resRes.runtimeHelpers.map((n) => helperBindings[n] ?? n);
 		const allRemovals = [
 			...watchRemovals,
 			...fieldRes.removals,
-			...mdRes.removals
+			...mdRes.removals,
+			...resRes.removals
 		];
 		const fieldCodes = {
 			props: fieldRes.propsCode,
 			states: fieldRes.statesCode,
 			computedGetters: fieldRes.computedCode,
-			accessors: fieldRes.accessors || void 0
+			resources: resRes.resourcesCode,
+			accessors: fieldRes.accessors + resRes.accessors || void 0
 		};
 		const ctorPlan = fieldRes.fieldInits.length > 0 || !!mdRes.ctorStmts ? planCtorInsert(comp, comp.cls ?? convCtx.localClasses.get(comp.className), code) : void 0;
 		if (ctorPlan?.warn) conventionErrors.push({
@@ -7969,7 +8211,11 @@ function compileFile(code, id, options = {}) {
 			methodDecoCtor: mdRes.ctorStmts || void 0,
 			methodDecoDestroy: mdRes.destroyStmts || void 0,
 			get helpers() {
-				const all = [...fieldHelpers, ...writers];
+				const all = [
+					...fieldHelpers,
+					...resHelpers,
+					...writers
+				];
 				return all.length ? [...new Set(all)] : void 0;
 			},
 			myfxHelpers: mdHelpers.length ? [...mdHelpers] : void 0
@@ -8014,19 +8260,20 @@ function compileFile(code, id, options = {}) {
 			continue;
 		}
 		if (comp.skipInjection) {
-			if (!!fieldRes.accessors || fieldRes.propsCode !== void 0 || fieldRes.statesCode !== void 0 || fieldRes.computedCode !== void 0 || !!cssEffectCode || watchEffectsCode) {
+			if (!!fieldRes.accessors || !!resRes.accessors || fieldRes.propsCode !== void 0 || fieldRes.statesCode !== void 0 || fieldRes.computedCode !== void 0 || resRes.resourcesCode !== void 0 || !!cssEffectCode || watchEffectsCode) {
 				const mk = (label, body) => `${DEBUG_DIV} ${label}\n${body}`;
 				const parts = [
 					mk("inherits", `...Reflect.getPrototypeOf(this).__ce_static__`),
 					mk("props", `props: ${emitFamily("props", fieldRes.propsCode)}`),
 					mk("states", `states: ${emitFamily("states", fieldRes.statesCode)}`),
-					mk("computedGetters", `computedGetters: ${emitFamily("computedGetters", fieldRes.computedCode)}`)
+					mk("computedGetters", `computedGetters: ${emitFamily("computedGetters", fieldRes.computedCode)}`),
+					mk("resources", `resources: ${emitFamily("resources", resRes.resourcesCode)}`)
 				];
 				if (watchEffectsCode) parts.push(mk("watchEffects", `watchEffects: ${emitWatchEffects(watchEffectsCode, watchRes.inlinedAncestors)}`));
 				if (cssEffectCode) parts.push(mk("cssEffect", `cssEffect: ${cssEffectCode}`));
 				edits.push({
 					comp,
-					literal: `static __ce_static__ = {\n${parts.join(",\n")}\n};\n` + (fieldRes.accessors || ""),
+					literal: `static __ce_static__ = {\n${parts.join(",\n")}\n};\n` + (fieldRes.accessors + resRes.accessors || ""),
 					removals: allRemovals,
 					...fieldExtras
 				});
@@ -8725,4 +8972,4 @@ var vite_default = compelemCompiler;
 
 //#endregion
 export { collectCompelemImports as C, analyzeFile as S, parse$1 as T, DEBUG_DIV as _, scanKnownTags as a, inlineTemplateMethods as b, offsetToLineCol as c, reportDiagnostics as d, compileFile as f, injectInto as g, buildStaticLiteral as h, TAG_RE as i, relativeToRoot as l, defaultInclude as m, vite_default as n, collectDiagnostics as o, compileSource as p, DEFAULT_TAG_EXT as r, newlineIndex as s, compelemCompiler as t, reportConventionDiagnostics as u, StaticAnalysisError as v, isCompelemSource as w, analyzeRender as x, assertStaticAnalysis as y };
-//# sourceMappingURL=vite-CLK9td6W.js.map
+//# sourceMappingURL=vite-C95uwtJI.js.map