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

wip fix

This commit is contained in:
Rizky 2024-03-25 19:34:09 +07:00
parent 2d7e953c82
commit 25a32dfae7
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/srv/core/main.js
View File

File diff suppressed because one or more lines are too long

2
app/web/src/nova/ed/panel/popup/script/monaco.tsx
View File

@ -147,7 +147,6 @@ export const EdScriptMonaco: FC<{}> = () => {
case "prop-instance": case "prop-instance":
{ {
types._raw = declareScope(p, meta, monaco); types._raw = declareScope(p, meta, monaco);
const nmodel = monaco.editor.createModel( const nmodel = monaco.editor.createModel(
trim(val), trim(val),
"typescript", "typescript",
@ -177,6 +176,7 @@ export const EdScriptMonaco: FC<{}> = () => {
} catch (e) {} } catch (e) {}
} }
} }
} }
break; break;
case "item": case "item":

34
app/web/src/nova/ed/panel/popup/script/scope/scope.tsx
View File

@ -28,8 +28,35 @@ export const declareScope = (p: PG, meta: IMeta, monaco: Monaco) => {
} }
} }
const vars: Record<string, { mode: "local" | "prop"; val: string }> = {}; const vars: Record<string, { mode: "local" | "prop" | "type"; val: string }> =
{};
let m_prev = null;
for (const m of cur_path) { for (const m of cur_path) {
if (m.mitem?.parent && (m.mitem?.parent as any).get("meta")) {
let prop_name = "";
m.mitem?.parent.parent.forEach((c, key) => {
if (c === m.mitem?.parent) {
prop_name = key;
}
});
if (prop_name && m_prev && m_prev.item.component) {
const prop_typings = m_prev.item.component.props[prop_name].typings;
try {
const typings_src = prop_typings.substring(`const typings = `.length);
const typings_fn = new Function(`return ${typings_src}`);
const typings = typings_fn();
if (typeof typings === "object") {
for (const [k, v] of Object.entries(typings)) {
if (typeof v === "string") {
vars[k] = { mode: "type", val: v };
}
}
}
} catch (e) {}
}
}
if (m.item.component?.id === active.comp_id) { if (m.item.component?.id === active.comp_id) {
for (const [name, prop] of Object.entries(m.item.component.props)) { for (const [name, prop] of Object.entries(m.item.component.props)) {
if (prop.meta?.type === "content-element") { if (prop.meta?.type === "content-element") {
@ -47,6 +74,7 @@ export const declareScope = (p: PG, meta: IMeta, monaco: Monaco) => {
} }
} }
} }
m_prev = m;
} }
const raw_types: string[] = []; const raw_types: string[] = [];
@ -60,6 +88,10 @@ const ${k} = null as unknown as (typeof \$\$_${k} & { render: ()=> void });
raw_types.push(`\ raw_types.push(`\
const \$\$_${k} = ${v.val}; const \$\$_${k} = ${v.val};
const ${k} = null as unknown as typeof \$\$_${k};`); const ${k} = null as unknown as typeof \$\$_${k};`);
} else if (v.mode === "type") {
raw_types.push(`
const ${k} = null as unknown as ${v.val};
`);
} }
} }