feat(web): SSR nav brand/client embed and form markdown labels
Replace author theme.js with framework chrome (nav brand, theme boot, client mount) plus bridge scroll/observe helpers; add form submit copy and type=markdown textareas so sites can drop business JS. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
aeac4d6d20
commit
98018fc63b
19 files changed
+777
-84
No files matched your search
Generated
+2
@@ -410,8 +410,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
"libc",
|
||||
"wasi",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -52,6 +52,7 @@ libc = { version = "0.2", optional = true }
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
# No `wasmbind`: keeps cdylib free of wasm-bindgen imports (raw mq_* ABI).
|
||||
chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
|
||||
getrandom = { version = "=0.2.17", default-features = false, features = ["js"] }
|
||||
|
||||
[workspace]
|
||||
members = [
|
||||
|
||||
@@ -197,6 +197,20 @@ export function eventArgsFromDom(ev, valueFromSel) {
|
||||
args.fields = fields;
|
||||
}
|
||||
}
|
||||
if (ev && (ev.type === "scroll" || ev.type === "resize")) {
|
||||
try {
|
||||
const doc = typeof document !== "undefined" ? document.documentElement : null;
|
||||
const body = typeof document !== "undefined" ? document.body : null;
|
||||
const scrollTop = (doc && (doc.scrollTop || 0)) || (body && body.scrollTop) || 0;
|
||||
const height = doc ? (doc.scrollHeight - doc.clientHeight) || 1 : 1;
|
||||
const ratio = Math.max(0, Math.min(1, scrollTop / height));
|
||||
args.scroll_top = scrollTop;
|
||||
args.scroll_max = height;
|
||||
args.scroll_ratio = ratio;
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
@@ -721,75 +735,88 @@ function runObserveEffect(exports, spec, onError) {
|
||||
const kind = String(spec.kind || spec.type || "intersect").toLowerCase();
|
||||
const sel = String(spec.sel || "");
|
||||
const thenFn = spec.then;
|
||||
const id = String(spec.id || `obs${++observeSeq}`);
|
||||
const el = qsOne(sel);
|
||||
if (!el || !thenFn) return;
|
||||
const baseId = String(spec.id || `obs${++observeSeq}`);
|
||||
const nodes = qsAll(sel);
|
||||
if (!nodes.length || (!thenFn && !spec.add_class)) return;
|
||||
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
nodes.forEach((el, idx) => {
|
||||
const id = nodes.length === 1 ? baseId : `${baseId}_${idx}`;
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "resize",
|
||||
id,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
kind: "resize",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const opts = { threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 };
|
||||
if (spec.rootMargin != null) opts.rootMargin = String(spec.rootMargin);
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
if (en.isIntersecting && spec.add_class) {
|
||||
for (const c of String(spec.add_class).split(/\s+/).filter(Boolean)) {
|
||||
el.classList.add(c);
|
||||
}
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
{ threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 },
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
if (thenFn) {
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
target_id: el.id || "",
|
||||
});
|
||||
}
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
opts,
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function buildFetchInit(spec) {
|
||||
|
||||
@@ -370,6 +370,28 @@ re-renders the same branded page on failure. No author JS.
|
||||
|
||||
*> web_compose_auth_form page=`self` action=`action` submit=`submit` form_id=`form_id` err_id=`err_id` target=`target` next=`next` kind=`kind`*
|
||||
|
||||
## compose_nav_brand
|
||||
+ `title`=""
|
||||
+ `href`="/"
|
||||
+ `logo`=""
|
||||
+ `logo_light`=""
|
||||
+ `theme_key`="mq-theme"
|
||||
|
||||
SSR topnav brand (logo + title), theme toggle, and drawer button. Interactive
|
||||
behavior stays in `client.mq.md` via `compose_client` / `client_embed`.
|
||||
|
||||
*> web_compose_nav_brand page=`self` title=`title` href=`href` logo=`logo` logo_light=`logo_light` theme_key=`theme_key`*
|
||||
|
||||
## compose_client
|
||||
+ `source`
|
||||
+ `bridge`="/static/marqdo-bridge.js"
|
||||
+ `wasm`="/static/marqdo_wasm.wasm"
|
||||
|
||||
Stamp `page.client` so render injects official bridge auto-mount (`data-mq-wasm` /
|
||||
`data-mq-source-url`). Build with `marqdo wasm build -o static` first.
|
||||
|
||||
*> web_compose_client page=`self` source=`source` bridge=`bridge` wasm=`wasm`*
|
||||
|
||||
## render
|
||||
+ `db`=None
|
||||
|
||||
@@ -635,6 +657,15 @@ Field table + rules table; submit writes through `# db`.
|
||||
|
||||
*> web_form_rules form=`self` rules=`rules`*
|
||||
|
||||
## labels
|
||||
+ `submit`="Submit"
|
||||
+ `cancel`="cancel"
|
||||
+ `cancel_href`=""
|
||||
|
||||
Localized submit / cancel copy for rendered forms.
|
||||
|
||||
*> web_form_labels form=`self` submit=`submit` cancel=`cancel` cancel_href=`cancel_href`*
|
||||
|
||||
## validate
|
||||
+ `rules`=None
|
||||
+ `data`
|
||||
|
||||
@@ -351,6 +351,27 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
|
||||
*> web_compose_auth_form page=`self` action=`动作` submit=`提交` form_id=`表单id` err_id=`错误id` target=`表单插槽` next=`回跳` kind=`种类`*
|
||||
|
||||
## 导航品牌
|
||||
+ `标题`=""
|
||||
+ `链接`="/"
|
||||
+ `标志`=""
|
||||
+ `浅色标志`=""
|
||||
+ `主题键`="mq-theme"
|
||||
|
||||
SSR 顶栏刊名 Logo、主题切换钮与目录抽屉钮。交互写在 `client.mq.md`,配合 `客户端`。
|
||||
|
||||
*> web_compose_nav_brand page=`self` title=`标题` href=`链接` logo=`标志` logo_light=`浅色标志` theme_key=`主题键`*
|
||||
|
||||
## 客户端
|
||||
+ `源`
|
||||
+ `桥`="/static/marqdo-bridge.js"
|
||||
+ `wasm`="/static/marqdo_wasm.wasm"
|
||||
|
||||
写入 `page.client`,渲染时注入官方 bridge 自启(`data-mq-wasm` / `data-mq-source-url`)。
|
||||
先 `marqdo wasm build -o public`(或站点 static 目录)。
|
||||
|
||||
*> web_compose_client page=`self` source=`源` bridge=`桥` wasm=`wasm`*
|
||||
|
||||
## 渲染
|
||||
+ `数据库`=None
|
||||
|
||||
@@ -609,6 +630,15 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
|
||||
*> web_form_rules form=`self` rules=`规则`*
|
||||
|
||||
## 文案
|
||||
+ `提交`="提交"
|
||||
+ `取消`="取消"
|
||||
+ `取消链接`=""
|
||||
|
||||
表单提交钮 / 取消链接文案(默认英文 Submit/cancel 由渲染层回退)。
|
||||
|
||||
*> web_form_labels form=`self` submit=`提交` cancel=`取消` cancel_href=`取消链接`*
|
||||
|
||||
## 校验
|
||||
+ `规则`=None
|
||||
+ `数据`
|
||||
|
||||
@@ -44,6 +44,42 @@ Build set_class effect map.
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="set_class" value=m*
|
||||
|
||||
## add_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build add_class effect map (classList.add; space-separated names OK).
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="add_class" value=m*
|
||||
|
||||
## remove_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build remove_class effect map.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="remove_class" value=m*
|
||||
|
||||
## toggle_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build toggle_class effect map.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="toggle_class" value=m*
|
||||
|
||||
## set_style
|
||||
+ `sel`
|
||||
+ `style`
|
||||
|
||||
Build set_style effect map; style is a map of CSS properties or a cssText string.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=style**
|
||||
*> table.put in=None at="set_style" value=m*
|
||||
|
||||
## set_attr
|
||||
+ `sel`
|
||||
+ `attrs`
|
||||
|
||||
@@ -43,6 +43,42 @@ import table:lib/table.mq.md
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="set_class" value=m*
|
||||
|
||||
## 加类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 add_class 效应(classList.add;可用空格分隔多个类名)。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="add_class" value=m*
|
||||
|
||||
## 去类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 remove_class 效应。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="remove_class" value=m*
|
||||
|
||||
## 切类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 toggle_class 效应。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="toggle_class" value=m*
|
||||
|
||||
## 设样式
|
||||
+ `选择器`
|
||||
+ `样式`
|
||||
|
||||
构造 set_style 效应;样式为属性表或 cssText 字符串。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=样式**
|
||||
*> table.put in=None at="set_style" value=m*
|
||||
|
||||
## 设属性
|
||||
+ `选择器`
|
||||
+ `属性`
|
||||
|
||||
@@ -174,6 +174,27 @@ func web_form_rules(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
return replyJSON(outJSON, errMsg, form.SetRules(formBag, args["rules"]), nil)
|
||||
}
|
||||
|
||||
//export web_form_labels
|
||||
func web_form_labels(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
submit, _ := argStr(args, "submit")
|
||||
if submit == "" {
|
||||
submit, _ = argStr(args, "提交")
|
||||
}
|
||||
cancel, _ := argStr(args, "cancel")
|
||||
if cancel == "" {
|
||||
cancel, _ = argStr(args, "取消")
|
||||
}
|
||||
cancelHref, _ := argStr(args, "cancel_href")
|
||||
if cancelHref == "" {
|
||||
cancelHref, _ = argStr(args, "取消链接")
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, form.SetLabels(asPageMap(args["form"]), submit, cancel, cancelHref), nil)
|
||||
}
|
||||
|
||||
//export web_form_validate
|
||||
func web_form_validate(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package compose
|
||||
|
||||
import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ComposeNavBrand stamps page.nav_brand for SSR topnav lockup (logo + title),
|
||||
// theme toggle, and drawer button chrome. Client WASM only wires behavior.
|
||||
func ComposeNavBrand(page any, title, href, logo, logoLight, themeKey string) (any, error) {
|
||||
obj := asObject(page)
|
||||
spec := map[string]any{}
|
||||
if s := strings.TrimSpace(title); s != "" {
|
||||
spec["title"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(href); s != "" {
|
||||
spec["href"] = s
|
||||
} else {
|
||||
spec["href"] = "/"
|
||||
}
|
||||
if s := strings.TrimSpace(logo); s != "" {
|
||||
spec["logo"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(logoLight); s != "" {
|
||||
spec["logo_light"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(themeKey); s != "" {
|
||||
spec["theme_key"] = s
|
||||
} else {
|
||||
spec["theme_key"] = "mq-theme"
|
||||
}
|
||||
obj["nav_brand"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// ComposeClient stamps page.client so render injects official bridge auto-mount
|
||||
// (data-mq-wasm / data-mq-source-url). Authors ship client.mq.md, not business JS.
|
||||
func ComposeClient(page any, bridge, wasm, source string) (any, error) {
|
||||
obj := asObject(page)
|
||||
spec := map[string]any{}
|
||||
if s := strings.TrimSpace(bridge); s != "" {
|
||||
spec["bridge"] = s
|
||||
} else {
|
||||
spec["bridge"] = "/static/marqdo-bridge.js"
|
||||
}
|
||||
if s := strings.TrimSpace(wasm); s != "" {
|
||||
spec["wasm"] = s
|
||||
} else {
|
||||
spec["wasm"] = "/static/marqdo_wasm.wasm"
|
||||
}
|
||||
if s := strings.TrimSpace(source); s != "" {
|
||||
spec["source"] = s
|
||||
}
|
||||
obj["client"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package compose_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/compose"
|
||||
)
|
||||
|
||||
func TestComposeNavBrandAndClient(t *testing.T) {
|
||||
page := map[string]any{"title": "t"}
|
||||
out, err := compose.ComposeNavBrand(page, "求道量子", "/", "/static/logo.png", "/static/logo-light.png", "mq-theme")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m := out.(map[string]any)
|
||||
b, ok := m["nav_brand"].(map[string]any)
|
||||
if !ok || b["title"] != "求道量子" || b["logo"] != "/static/logo.png" {
|
||||
t.Fatalf("nav_brand: %#v", m["nav_brand"])
|
||||
}
|
||||
out, err = compose.ComposeClient(m, "", "", "/static/client.mq.md")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m = out.(map[string]any)
|
||||
c, ok := m["client"].(map[string]any)
|
||||
if !ok || c["source"] != "/static/client.mq.md" {
|
||||
t.Fatalf("client: %#v", m["client"])
|
||||
}
|
||||
if c["bridge"] != "/static/marqdo-bridge.js" {
|
||||
t.Fatalf("bridge default: %#v", c)
|
||||
}
|
||||
}
|
||||
@@ -68,6 +68,21 @@ func SetRules(formBag map[string]any, rules any) map[string]any {
|
||||
return out
|
||||
}
|
||||
|
||||
// SetLabels stamps localized submit / cancel button copy (and optional cancel href).
|
||||
func SetLabels(formBag map[string]any, submit, cancel, cancelHref string) map[string]any {
|
||||
out := cloneMap(formBag)
|
||||
if s := strings.TrimSpace(submit); s != "" {
|
||||
out["submit"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(cancel); s != "" {
|
||||
out["cancel"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(cancelHref); s != "" {
|
||||
out["cancel_href"] = s
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func cloneMap(m map[string]any) map[string]any {
|
||||
out := map[string]any{}
|
||||
for k, v := range m {
|
||||
@@ -758,9 +773,15 @@ func RenderBodyCtx(formBag map[string]any, formID string, data, errors any, csrf
|
||||
}
|
||||
body.WriteString("<label>")
|
||||
body.WriteString(esc(label))
|
||||
if ty == "textarea" {
|
||||
fmt.Fprintf(&body, `<textarea name="%s" rows="5"%s>%s</textarea>`,
|
||||
esc(name), reqAttr, esc(value))
|
||||
if ty == "textarea" || ty == "markdown" {
|
||||
rows := "5"
|
||||
cls := ""
|
||||
if ty == "markdown" {
|
||||
rows = "18"
|
||||
cls = ` class="mq-markdown" data-mq-field="markdown"`
|
||||
}
|
||||
fmt.Fprintf(&body, `<textarea name="%s" rows="%s"%s%s>%s</textarea>`,
|
||||
esc(name), rows, cls, reqAttr, esc(value))
|
||||
} else {
|
||||
inputType := "text"
|
||||
switch ty {
|
||||
@@ -787,8 +808,28 @@ func RenderBodyCtx(formBag map[string]any, formID string, data, errors any, csrf
|
||||
}
|
||||
body.WriteString("</label>")
|
||||
}
|
||||
fmt.Fprintf(&body, `<div class="actions"><button type="submit">Submit</button><a href="%s">cancel</a></div>`,
|
||||
esc(cancel))
|
||||
submitLabel := strOf(formBag, "submit", "")
|
||||
if submitLabel == "" {
|
||||
submitLabel = strOf(formBag, "提交", "")
|
||||
}
|
||||
if submitLabel == "" {
|
||||
submitLabel = "Submit"
|
||||
}
|
||||
cancelLabel := strOf(formBag, "cancel", "")
|
||||
if cancelLabel == "" {
|
||||
cancelLabel = strOf(formBag, "取消", "")
|
||||
}
|
||||
if cancelLabel == "" {
|
||||
cancelLabel = "cancel"
|
||||
}
|
||||
cancelHref := cancel
|
||||
if c := strOf(formBag, "cancel_href", ""); c != "" {
|
||||
cancelHref = c
|
||||
} else if c := strOf(formBag, "取消链接", ""); c != "" {
|
||||
cancelHref = c
|
||||
}
|
||||
fmt.Fprintf(&body, `<div class="actions"><button type="submit">%s</button><a href="%s">%s</a></div>`,
|
||||
esc(submitLabel), esc(cancelHref), esc(cancelLabel))
|
||||
body.WriteString(`</form></div>`)
|
||||
return body.String()
|
||||
}
|
||||
|
||||
@@ -68,3 +68,23 @@ func TestRenderContainsInputFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderMarkdownAndLabels(t *testing.T) {
|
||||
f := form.New("posts", "insert", "")
|
||||
f = form.SetFields(f, []any{
|
||||
map[string]any{"字段": "content", "标签": "正文", "类型": "markdown", "必填": true},
|
||||
})
|
||||
f = form.SetLabels(f, "发布文章", "返回列表", "/desk/posts")
|
||||
html := form.Render(f, "post", nil, nil, "")
|
||||
for _, want := range []string{
|
||||
`data-mq-field="markdown"`,
|
||||
`class="mq-markdown"`,
|
||||
">发布文章</button>",
|
||||
`href="/desk/posts"`,
|
||||
">返回列表</a>",
|
||||
} {
|
||||
if !strings.Contains(html, want) {
|
||||
t.Fatalf("missing %q in:\n%s", want, html)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,222 @@
|
||||
package render
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"strings"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
// formatMetaDate shortens ISO timestamps to YYYY-MM-DD for card/article meta.
|
||||
func formatMetaDate(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
if len(s) >= 10 && s[4] == '-' && s[7] == '-' {
|
||||
if len(s) == 10 || s[10] == 'T' || s[10] == ' ' {
|
||||
return s[:10]
|
||||
}
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func navBrandSpec(page map[string]any) map[string]any {
|
||||
if page == nil {
|
||||
return nil
|
||||
}
|
||||
if b, ok := page["nav_brand"].(map[string]any); ok {
|
||||
return b
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func themeKeyOf(page map[string]any) string {
|
||||
if b := navBrandSpec(page); b != nil {
|
||||
if k := text(b["theme_key"]); k != "" {
|
||||
return k
|
||||
}
|
||||
if k := text(b["主题键"]); k != "" {
|
||||
return k
|
||||
}
|
||||
}
|
||||
return "mq-theme"
|
||||
}
|
||||
|
||||
func renderNavBrandHTML(page map[string]any) string {
|
||||
b := navBrandSpec(page)
|
||||
if b == nil {
|
||||
return ""
|
||||
}
|
||||
title := text(b["title"])
|
||||
if title == "" {
|
||||
title = text(b["标题"])
|
||||
}
|
||||
if title == "" {
|
||||
title = text(page["title"])
|
||||
}
|
||||
href := text(b["href"])
|
||||
if href == "" {
|
||||
href = text(b["链接"])
|
||||
}
|
||||
if href == "" {
|
||||
href = "/"
|
||||
}
|
||||
logo := text(b["logo"])
|
||||
if logo == "" {
|
||||
logo = text(b["标志"])
|
||||
}
|
||||
var s strings.Builder
|
||||
s.WriteString(`<a id="nav-brand" class="nav-brand" href="`)
|
||||
s.WriteString(esc(href))
|
||||
s.WriteString(`" aria-label="`)
|
||||
s.WriteString(esc(title))
|
||||
s.WriteString(`">`)
|
||||
if logo != "" {
|
||||
s.WriteString(`<img class="nav-brand-logo" src="`)
|
||||
s.WriteString(esc(logo))
|
||||
s.WriteString(`" alt="`)
|
||||
s.WriteString(esc(title))
|
||||
s.WriteString(`" width="36" height="36" decoding="async"/>`)
|
||||
}
|
||||
if title != "" {
|
||||
s.WriteString(`<span class="nav-brand-text">`)
|
||||
s.WriteString(esc(title))
|
||||
s.WriteString(`</span>`)
|
||||
}
|
||||
s.WriteString(`</a>`)
|
||||
s.WriteString(`<button type="button" id="nav-menu-toggle" class="nav-menu-toggle" aria-controls="site-side-drawer" aria-expanded="false" aria-label="打开目录">`)
|
||||
s.WriteString(`<span class="nav-menu-bars" aria-hidden="true"><i></i><i></i><i></i></span>`)
|
||||
s.WriteString(`<span class="nav-menu-label">目录</span></button>`)
|
||||
return s.String()
|
||||
}
|
||||
|
||||
func renderThemeToggleHTML(page map[string]any) string {
|
||||
if navBrandSpec(page) == nil {
|
||||
return ""
|
||||
}
|
||||
return `<button type="button" id="theme-toggle" class="theme-toggle on-dark" title="切换主题" aria-label="切换到浅色模式">浅色</button>`
|
||||
}
|
||||
|
||||
func renderNavInner(page map[string]any, linksHTML string) string {
|
||||
brand := renderNavBrandHTML(page)
|
||||
toggle := renderThemeToggleHTML(page)
|
||||
return brand + linksHTML + toggle
|
||||
}
|
||||
|
||||
func chromeExtrasHTML(page map[string]any) string {
|
||||
if navBrandSpec(page) == nil && pageClient(page) == nil {
|
||||
return ""
|
||||
}
|
||||
return `<div id="qd-progress" aria-hidden="true"></div>` +
|
||||
`<button type="button" id="nav-drawer-veil" class="nav-drawer-veil" aria-label="关闭目录" hidden></button>`
|
||||
}
|
||||
|
||||
func pageClient(page map[string]any) map[string]any {
|
||||
if page == nil {
|
||||
return nil
|
||||
}
|
||||
if c, ok := page["client"].(map[string]any); ok {
|
||||
return c
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func themeBootScript(page map[string]any) string {
|
||||
if navBrandSpec(page) == nil && pageClient(page) == nil {
|
||||
return ""
|
||||
}
|
||||
key := themeKeyOf(page)
|
||||
return `<script>(function(){try{var t=localStorage.getItem("` + key + `");` +
|
||||
`if(t==="light"||t==="dark")document.documentElement.setAttribute("data-theme",t);` +
|
||||
`else document.documentElement.setAttribute("data-theme","dark");` +
|
||||
`}catch(e){document.documentElement.setAttribute("data-theme","dark");}})();</script>`
|
||||
}
|
||||
|
||||
func clientEmbedScript(page map[string]any) string {
|
||||
c := pageClient(page)
|
||||
if c == nil {
|
||||
return ""
|
||||
}
|
||||
source := text(c["source"])
|
||||
if source == "" {
|
||||
source = text(c["源"])
|
||||
}
|
||||
if source == "" {
|
||||
return ""
|
||||
}
|
||||
bridge := text(c["bridge"])
|
||||
if bridge == "" {
|
||||
bridge = text(c["桥"])
|
||||
}
|
||||
if bridge == "" {
|
||||
bridge = "/static/marqdo-bridge.js"
|
||||
}
|
||||
wasm := text(c["wasm"])
|
||||
if wasm == "" {
|
||||
wasm = "/static/marqdo_wasm.wasm"
|
||||
}
|
||||
return `<script type="module" src="` + esc(bridge) + `" data-mq-wasm="` + esc(wasm) +
|
||||
`" data-mq-source-url="` + esc(source) + `"></script>`
|
||||
}
|
||||
|
||||
var firstPBlockRe = regexp.MustCompile(`(?is)^(\s*)(<p\b[^>]*>)(.*?)(</p>)`)
|
||||
|
||||
func shouldDropcap(plain string) bool {
|
||||
plain = strings.Join(strings.Fields(plain), "")
|
||||
if plain == "" {
|
||||
return false
|
||||
}
|
||||
if strings.HasPrefix(plain, "$$") {
|
||||
return false
|
||||
}
|
||||
r, _ := utf8.DecodeRuneInString(plain)
|
||||
if r == '$' || r == '\\' || r == '[' || r == '(' || unicode.IsDigit(r) {
|
||||
return false
|
||||
}
|
||||
if unicode.In(r, unicode.Han) {
|
||||
return true
|
||||
}
|
||||
return (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z')
|
||||
}
|
||||
|
||||
func stripTags(s string) string {
|
||||
var b strings.Builder
|
||||
in := false
|
||||
for _, r := range s {
|
||||
switch {
|
||||
case r == '<':
|
||||
in = true
|
||||
case r == '>':
|
||||
in = false
|
||||
case !in:
|
||||
b.WriteRune(r)
|
||||
}
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// tuneDropcapHTML adds has-dropcap to the first eligible paragraph in article markdown HTML.
|
||||
func tuneDropcapHTML(inner string) string {
|
||||
m := firstPBlockRe.FindStringSubmatch(inner)
|
||||
if m == nil {
|
||||
return inner
|
||||
}
|
||||
plain := stripTags(m[3])
|
||||
if !shouldDropcap(plain) {
|
||||
return inner
|
||||
}
|
||||
open := m[2]
|
||||
if strings.Contains(open, "has-dropcap") {
|
||||
return inner
|
||||
}
|
||||
if strings.Contains(open, `class="`) {
|
||||
open = strings.Replace(open, `class="`, `class="has-dropcap `, 1)
|
||||
} else if strings.Contains(open, `class='`) {
|
||||
open = strings.Replace(open, `class='`, `class='has-dropcap `, 1)
|
||||
} else {
|
||||
open = strings.TrimSuffix(open, ">") + ` class="has-dropcap">`
|
||||
}
|
||||
loc := firstPBlockRe.FindStringIndex(inner)
|
||||
if loc == nil {
|
||||
return inner
|
||||
}
|
||||
return inner[:loc[0]] + m[1] + open + m[3] + m[4] + inner[loc[1]:]
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package render
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFormatMetaDate(t *testing.T) {
|
||||
if got := formatMetaDate("2026-09-17T13:41:04Z"); got != "2026-09-17" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
if got := formatMetaDate("plain"); got != "plain" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTuneDropcapHTML(t *testing.T) {
|
||||
in := "<p>中文首段。</p><p>二段</p>"
|
||||
out := tuneDropcapHTML(in)
|
||||
if !strings.Contains(out, `class="has-dropcap"`) {
|
||||
t.Fatalf("expected dropcap: %s", out)
|
||||
}
|
||||
skip := "<p>$E=mc^2$</p>"
|
||||
if got := tuneDropcapHTML(skip); strings.Contains(got, "has-dropcap") {
|
||||
t.Fatalf("formula should skip: %s", got)
|
||||
}
|
||||
}
|
||||
@@ -34,5 +34,5 @@ func markdownToHTML(md string) string {
|
||||
if err := gm.Convert([]byte(md), &buf); err != nil {
|
||||
return `<div class="article-body"><p class="article-p">` + esc(md) + `</p></div>`
|
||||
}
|
||||
return `<div class="article-body md">` + buf.String() + `</div>`
|
||||
return `<div class="article-body md">` + tuneDropcapHTML(buf.String()) + `</div>`
|
||||
}
|
||||
@@ -842,6 +842,8 @@ func headHTML(page map[string]any, defaultTitle string) string {
|
||||
s.WriteString(katexBootScript())
|
||||
}
|
||||
}
|
||||
s.WriteString(themeBootScript(page))
|
||||
s.WriteString(clientEmbedScript(page))
|
||||
return s.String()
|
||||
}
|
||||
|
||||
@@ -933,7 +935,7 @@ func renderCard(page map[string]any, it map[string]any) string {
|
||||
card.WriteString(fmt.Sprintf(`<a class="card-link" href="%s">`, esc(href)))
|
||||
}
|
||||
if meta != "" {
|
||||
card.WriteString(fmt.Sprintf(`<div class="card-meta">%s</div>`, esc(meta)))
|
||||
card.WriteString(fmt.Sprintf(`<div class="card-meta">%s</div>`, esc(formatMetaDate(meta))))
|
||||
}
|
||||
card.WriteString(fmt.Sprintf("<h2%s>%s</h2>", tc, esc(title)))
|
||||
if tag != "" {
|
||||
@@ -957,7 +959,7 @@ func renderArticle(it map[string]any) string {
|
||||
var s strings.Builder
|
||||
s.WriteString(`<article class="article">`)
|
||||
if meta != "" {
|
||||
s.WriteString(fmt.Sprintf(`<div class="article-meta">%s</div>`, esc(meta)))
|
||||
s.WriteString(fmt.Sprintf(`<div class="article-meta">%s</div>`, esc(formatMetaDate(meta))))
|
||||
}
|
||||
s.WriteString(fmt.Sprintf(`<h1 class="article-title">%s</h1>`, esc(title)))
|
||||
if tag != "" {
|
||||
@@ -1169,12 +1171,12 @@ func renderFragment(page map[string]any, dbURL, slot string) string {
|
||||
links := resolveLinks(page["nav"], dbURL, page)
|
||||
return fmt.Sprintf(
|
||||
`<header class="topnav" data-slot="nav">%s</header>`,
|
||||
renderULWithMQ(links, "nav", nil),
|
||||
renderNavInner(page, renderULWithMQ(links, "nav", nil)),
|
||||
)
|
||||
case "sidebar":
|
||||
links := resolveLinks(page["sidebar"], dbURL, page)
|
||||
return fmt.Sprintf(
|
||||
`<aside class="side" data-slot="sidebar"><span class="side-label">侧栏</span>%s</aside>`,
|
||||
`<aside class="side" id="site-side-drawer" role="navigation" aria-label="站点目录" data-slot="sidebar"><span class="side-label">侧栏</span>%s</aside>`,
|
||||
renderULWithMQ(links, "side-nav", nil),
|
||||
)
|
||||
case "footer":
|
||||
@@ -1351,7 +1353,7 @@ func RenderPage(page map[string]any, dbURL string, partID string) string {
|
||||
sideHTML := ""
|
||||
if showChrome && hasSide {
|
||||
sideHTML = fmt.Sprintf(
|
||||
`<aside class="%s"%s><span class="side-label">侧栏</span>%s</aside>`,
|
||||
`<aside class="%s" id="site-side-drawer" role="navigation" aria-label="站点目录"%s><span class="side-label">侧栏</span>%s</aside>`,
|
||||
slotClass(page, "sidebar", "side"),
|
||||
slotAttrs("sidebar", parts, page),
|
||||
renderULWithMQ(side, "side-nav", mqPairs),
|
||||
@@ -1366,7 +1368,7 @@ func RenderPage(page map[string]any, dbURL string, partID string) string {
|
||||
`<header class="%s"%s>%s</header>`,
|
||||
slotClass(page, "nav", "topnav"),
|
||||
slotAttrs("nav", parts, page),
|
||||
renderULWithMQ(nav, "nav", mqPairs),
|
||||
renderNavInner(page, renderULWithMQ(nav, "nav", mqPairs)),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1409,6 +1411,7 @@ func RenderPage(page map[string]any, dbURL string, partID string) string {
|
||||
<body class="%s">
|
||||
%s
|
||||
%s
|
||||
%s
|
||||
<main class="%s"%s>%s</main>
|
||||
%s
|
||||
%s
|
||||
@@ -1416,6 +1419,7 @@ func RenderPage(page map[string]any, dbURL string, partID string) string {
|
||||
headHTML(page, title),
|
||||
styleBlock,
|
||||
bodyClass,
|
||||
chromeExtrasHTML(page),
|
||||
headerHTML,
|
||||
sideHTML,
|
||||
slotClass(page, "main", "main"),
|
||||
|
||||
@@ -257,3 +257,43 @@ func TestPartSlotSrcUsesResolvedRoute(t *testing.T) {
|
||||
t.Fatalf("missing resolved slot src: %s", html)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNavBrandClientChrome(t *testing.T) {
|
||||
page := map[string]any{
|
||||
"title": "求道量子",
|
||||
"nav": []any{
|
||||
map[string]any{"label": "文章", "href": "/"},
|
||||
},
|
||||
"nav_brand": map[string]any{
|
||||
"title": "求道量子",
|
||||
"href": "/",
|
||||
"logo": "/static/logo.png",
|
||||
"theme_key": "mq-theme",
|
||||
},
|
||||
"client": map[string]any{
|
||||
"source": "/static/client.mq.md",
|
||||
},
|
||||
}
|
||||
html := render.RenderPage(page, "", "")
|
||||
if !strings.Contains(html, `id="nav-brand"`) {
|
||||
t.Fatalf("missing nav-brand: %s", html[:500])
|
||||
}
|
||||
if !strings.Contains(html, `id="theme-toggle"`) {
|
||||
t.Fatalf("missing theme-toggle")
|
||||
}
|
||||
if !strings.Contains(html, `id="nav-menu-toggle"`) {
|
||||
t.Fatalf("missing menu toggle")
|
||||
}
|
||||
if !strings.Contains(html, `data-mq-source-url="/static/client.mq.md"`) {
|
||||
t.Fatalf("missing client embed")
|
||||
}
|
||||
if !strings.Contains(html, `localStorage.getItem("mq-theme")`) {
|
||||
t.Fatalf("missing theme boot")
|
||||
}
|
||||
if !strings.Contains(html, `id="qd-progress"`) {
|
||||
t.Fatalf("missing progress")
|
||||
}
|
||||
if !strings.Contains(html, `id="nav-drawer-veil"`) {
|
||||
t.Fatalf("missing drawer veil")
|
||||
}
|
||||
}
|
||||
+57
-2
@@ -73,7 +73,9 @@ extern int web_db_exec(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_new(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_fields(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_compose_form(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_compose_auth_form(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_compose_auth_form(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_compose_nav_brand(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_compose_client(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_new(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_route(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_db_update(char *args_json, char **out_json, char **err_msg);
|
||||
@@ -87,7 +89,8 @@ extern int web_db_migrate(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_db_fts_create(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_db_search(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_db_table_info(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_rules(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_rules(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_labels(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_validate(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_render(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_form_submit(char *args_json, char **out_json, char **err_msg);
|
||||
@@ -171,6 +174,8 @@ static int register_core(void) {
|
||||
if (host_register((char *)"web_intro", (char *)"table", web_intro) != 0) return 1;
|
||||
if (host_register((char *)"web_compose_form", (char *)"page,form,id,target", web_compose_form) != 0) return 1;
|
||||
if (host_register((char *)"web_compose_auth_form", (char *)"page,action,submit,form_id,err_id,target,next,kind", web_compose_auth_form) != 0) return 1;
|
||||
if (host_register((char *)"web_compose_nav_brand", (char *)"page,title,href,logo,logo_light,theme_key", web_compose_nav_brand) != 0) return 1;
|
||||
if (host_register((char *)"web_compose_client", (char *)"page,source,bridge,wasm", web_compose_client) != 0) return 1;
|
||||
if (host_register((char *)"web_render", (char *)"page", web_render) != 0) return 1;
|
||||
if (host_register((char *)"web_db_new", (char *)"url", web_db_new) != 0) return 1;
|
||||
if (host_register((char *)"web_db_init", (char *)"url,name,fields", web_db_init) != 0) return 1;
|
||||
@@ -192,6 +197,7 @@ static int register_core(void) {
|
||||
if (host_register((char *)"web_form_new", (char *)"table,action,id", web_form_new) != 0) return 1;
|
||||
if (host_register((char *)"web_form_fields", (char *)"form,fields", web_form_fields) != 0) return 1;
|
||||
if (host_register((char *)"web_form_rules", (char *)"form,rules", web_form_rules) != 0) return 1;
|
||||
if (host_register((char *)"web_form_labels", (char *)"form,submit,cancel,cancel_href", web_form_labels) != 0) return 1;
|
||||
if (host_register((char *)"web_form_validate", (char *)"form,rules,data", web_form_validate) != 0) return 1;
|
||||
if (host_register((char *)"web_form_render", (char *)"form,id", web_form_render) != 0) return 1;
|
||||
if (host_register((char *)"web_form_submit", (char *)"form,data,url", web_form_submit) != 0) return 1;
|
||||
@@ -859,6 +865,55 @@ func web_compose_auth_form(argsJSON *C.char, outJSON **C.char, errMsg **C.char)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_compose_nav_brand
|
||||
func web_compose_nav_brand(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
title, _ := argStr(args, "title")
|
||||
if title == "" {
|
||||
title, _ = argStr(args, "标题")
|
||||
}
|
||||
href, _ := argStr(args, "href")
|
||||
if href == "" {
|
||||
href, _ = argStr(args, "链接")
|
||||
}
|
||||
logo, _ := argStr(args, "logo")
|
||||
if logo == "" {
|
||||
logo, _ = argStr(args, "标志")
|
||||
}
|
||||
logoLight, _ := argStr(args, "logo_light")
|
||||
if logoLight == "" {
|
||||
logoLight, _ = argStr(args, "浅色标志")
|
||||
}
|
||||
themeKey, _ := argStr(args, "theme_key")
|
||||
if themeKey == "" {
|
||||
themeKey, _ = argStr(args, "主题键")
|
||||
}
|
||||
out, err := compose.ComposeNavBrand(args["page"], title, href, logo, logoLight, themeKey)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_compose_client
|
||||
func web_compose_client(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
source, _ := argStr(args, "source")
|
||||
if source == "" {
|
||||
source, _ = argStr(args, "源")
|
||||
}
|
||||
bridge, _ := argStr(args, "bridge")
|
||||
if bridge == "" {
|
||||
bridge, _ = argStr(args, "桥")
|
||||
}
|
||||
wasm, _ := argStr(args, "wasm")
|
||||
out, err := compose.ComposeClient(args["page"], bridge, wasm, source)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_app_new
|
||||
func web_app_new(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
|
||||
+25
-12
@@ -140,18 +140,28 @@ pub fn resolve_import(from_dir: &Path, rel: &str) -> Result<PathBuf> {
|
||||
"cannot resolve import `{rel}` from {}",
|
||||
from_dir.display()
|
||||
);
|
||||
let user_ext = crate::ext_cli::default_user_ext_dir();
|
||||
if env::var_os("MARQDO_EXT").is_none() && !user_ext.join("web").join("web.mq.md").is_file()
|
||||
#[cfg(feature = "cli")]
|
||||
{
|
||||
msg.push_str(&format!(
|
||||
"\nhint: run `marqdo ext add web` (installs under {}), or set MARQDO_EXT",
|
||||
user_ext.display()
|
||||
));
|
||||
} else if env::var_os("MARQDO_EXT").is_none() {
|
||||
msg.push_str(&format!(
|
||||
"\nhint: looked under {}; set MARQDO_EXT to override",
|
||||
user_ext.display()
|
||||
));
|
||||
let user_ext = crate::ext_cli::default_user_ext_dir();
|
||||
if env::var_os("MARQDO_EXT").is_none()
|
||||
&& !user_ext.join("web").join("web.mq.md").is_file()
|
||||
{
|
||||
msg.push_str(&format!(
|
||||
"\nhint: run `marqdo ext add web` (installs under {}), or set MARQDO_EXT",
|
||||
user_ext.display()
|
||||
));
|
||||
} else if env::var_os("MARQDO_EXT").is_none() {
|
||||
msg.push_str(&format!(
|
||||
"\nhint: looked under {}; set MARQDO_EXT to override",
|
||||
user_ext.display()
|
||||
));
|
||||
}
|
||||
}
|
||||
#[cfg(not(feature = "cli"))]
|
||||
{
|
||||
if env::var_os("MARQDO_EXT").is_none() {
|
||||
msg.push_str("\nhint: set MARQDO_EXT to your extension pack root");
|
||||
}
|
||||
}
|
||||
bail!("{msg}");
|
||||
}
|
||||
@@ -203,7 +213,10 @@ fn ext_search_roots() -> Vec<PathBuf> {
|
||||
roots.push(PathBuf::from(h));
|
||||
}
|
||||
// Default install root from `marqdo ext add` (~/.marqdo/ext)
|
||||
roots.push(crate::ext_cli::default_user_ext_dir());
|
||||
#[cfg(feature = "cli")]
|
||||
{
|
||||
roots.push(crate::ext_cli::default_user_ext_dir());
|
||||
}
|
||||
if let Ok(cwd) = env::current_dir() {
|
||||
roots.push(cwd.join("ext"));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user