midsuit
/
prasi-bun
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix prop option + frontend recursive watch

This commit is contained in:
rizrmd 2024-06-03 11:38:50 +07:00
parent c12a14bd8a
commit 1a71697266
2 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/srv/ws/sync/code/parts/init/frontend.ts
View File

@ -108,22 +108,29 @@ export const initFrontEnd = async (
ctx: build_ctx,
timeout: null,
rebuilding: false,
watch: watch(dir.data(root), async (event, filename) => {
const fe = code.internal.frontend[id_site];
if (
fe &&
(filename?.endsWith(".tsx") ||
filename?.endsWith(".ts") ||
filename?.endsWith(".css") ||
filename?.endsWith(".html"))
) {
if (!fe.rebuilding) {
fe.rebuilding = true;
await fe.ctx.rebuild();
fe.rebuilding = false;
watch: watch(
dir.data(root),
{
recursive: true,
},
async (event, filename) => {
const fe = code.internal.frontend[id_site];
if (filename?.startsWith("node_modules")) return;
if (
fe &&
(filename?.endsWith(".tsx") ||
filename?.endsWith(".ts") ||
filename?.endsWith(".css") ||
filename?.endsWith(".html"))
) {
if (!fe.rebuilding) {
fe.rebuilding = true;
await fe.ctx.rebuild();
fe.rebuilding = false;
}
}
}
}),
),
};
const fe = code.internal.frontend[id_site];
fe.rebuilding = true;

48
app/web/src/nova/ed/panel/side/prop-instance/prop-option.tsx
View File

@ -41,6 +41,7 @@ export const EdPropInstanceOptions: FC<{
width: 0,
},
options: [] as MetaOption[],
optDeps: [] as any[],
});
const p = useGlobal(EDGlobal, "EDITOR");
@ -116,7 +117,14 @@ export const EdPropInstanceOptions: FC<{
const resOpt = ${src.endsWith(";") ? src : `${src};`}
if (typeof resOpt === 'function') local.metaFn = resOpt;
else local.options = resOpt;
else {
if (typeof resOpt === 'object' && Array.isArray(resOpt.deps) && typeof resOpt.fn === 'function') {
local.metaFn = resOpt.fn;
local.optDeps = resOpt.deps;
} else {
local.options = resOpt;
}
}
} catch(e) { console.error(e); }`;
fn = new Function(...Object.keys(arg), "local", final);
fn(...Object.values(arg), local);
@ -127,26 +135,30 @@ export const EdPropInstanceOptions: FC<{
} else {
local.options = local.loaded;
}
}
if (local.metaFn && !local.loaded && !local.loading) {
local.loading = true;
try {
const res = local.metaFn();
const callback = (e: any) => {
local.loading = false;
local.loaded = e;
local.render();
};
if (res instanceof Promise)
res.then(callback).catch((e) => {
console.error(e);
});
else callback(res);
} catch (e) {
console.error(e);
useEffect(() => {
if (local.metaFn) {
if (local.metaFn && !local.loaded && !local.loading) {
local.loading = true;
try {
const res = local.metaFn();
const callback = (e: any) => {
local.loading = false;
local.loaded = e;
local.render();
};
if (res instanceof Promise)
res.then(callback).catch((e) => {
console.error(e);
});
else callback(res);
} catch (e) {
console.error(e);
}
}
}
}
}, local.optDeps);
let evalue: any = null;
try {