From 9442ff9e41fc3f1f49cff3911988e5b4f2c7761b Mon Sep 17 00:00:00 2001 From: Rizky Date: Tue, 6 Feb 2024 08:59:49 +0700 Subject: [PATCH] rename db,api -> _db, _api --- app/srv/api/site-export.ts | 14 ++++---- app/srv/util/build-npm.ts | 10 +++--- app/srv/ws/edit/action/diff-local.ts | 6 ++-- app/srv/ws/edit/action/get-comp.ts | 2 +- app/srv/ws/edit/edit-handler.ts | 2 +- app/srv/ws/edit/tools/load-page.ts | 2 +- app/srv/ws/edit/tools/load-site.ts | 6 ++-- app/srv/ws/sync/actions/code_edit.ts | 10 +++--- app/srv/ws/sync/actions/comp_group.ts | 8 ++--- app/srv/ws/sync/actions/comp_new.ts | 4 +-- app/srv/ws/sync/actions/page_cache.ts | 4 +-- app/srv/ws/sync/actions/page_load.ts | 4 +-- app/srv/ws/sync/actions/site_group.ts | 2 +- app/srv/ws/sync/actions/site_load.ts | 4 +-- app/srv/ws/sync/actions/site_update.ts | 2 +- app/srv/ws/sync/actions/yjs_diff_local.ts | 4 +-- app/srv/ws/sync/editor/load-component.ts | 2 +- app/srv/ws/sync/editor/load-default.ts | 4 +-- app/srv/ws/sync/editor/load-sitepage.ts | 6 ++-- app/srv/ws/sync/editor/prep-page.ts | 2 +- app/srv/ws/sync/sync-handler.ts | 2 +- app/web/src/base/page/auth/login.tsx | 4 +-- app/web/src/base/page/auth/logout.tsx | 2 +- app/web/src/base/page/auth/register.tsx | 4 +-- app/web/src/base/page/editor.tsx | 10 +++--- app/web/src/index.tsx | 5 ++- app/web/src/nova/ed/logic/ed-sync.tsx | 10 +++--- app/web/src/nova/ed/panel/popup/code/code.tsx | 8 ++--- .../nova/ed/panel/popup/code/name-list.tsx | 4 +-- .../nova/ed/panel/popup/comp/comp-popup.tsx | 2 +- .../nova/ed/panel/popup/comp/comp-preview.tsx | 8 ++--- .../nova/ed/panel/popup/comp/comp-reload.ts | 4 +-- .../nova/ed/panel/popup/comp/comp-tree.tsx | 6 ++-- .../nova/ed/panel/popup/npm/npm-import.tsx | 16 +++++----- .../src/nova/ed/panel/popup/npm/npm-items.tsx | 16 +++++----- .../nova/ed/panel/popup/page/page-form.tsx | 6 ++-- .../nova/ed/panel/popup/page/page-popup.tsx | 4 +-- .../nova/ed/panel/popup/page/page-reload.ts | 4 +-- .../nova/ed/panel/popup/page/page-tree.tsx | 14 ++++---- .../nova/ed/panel/popup/site/site-form.tsx | 6 ++-- .../nova/ed/panel/popup/site/site-head.tsx | 2 +- .../nova/ed/panel/popup/site/site-tree.tsx | 12 +++---- .../nova/ed/panel/popup/site/site-user.tsx | 2 +- .../src/nova/ed/panel/tree/node/item/name.tsx | 2 +- app/web/src/nova/vi/load/load-legacy.tsx | 2 +- app/web/src/render/editor/logic/init.ts | 2 +- app/web/src/render/editor/logic/route.ts | 2 +- app/web/src/render/editor/logic/ws.ts | 2 +- .../editor/panel/manager/comp/comp-mgr.tsx | 30 ++++++++--------- .../panel/manager/page/page-mgr-form.tsx | 6 ++-- .../editor/panel/manager/page/page-mgr.tsx | 20 ++++++------ .../editor/panel/manager/site/site-form.tsx | 6 ++-- .../editor/panel/manager/site/site-mgr.tsx | 4 +-- .../editor/panel/toolbar/center/NPMImport.tsx | 32 +++++++++---------- .../panel/toolbar/center/ToolbarCenter.tsx | 2 +- .../panel/toolbar/center/api/External.tsx | 2 +- .../panel/toolbar/center/api/Internal.tsx | 12 +++---- .../panel/toolbar/center/mobile/config.tsx | 20 ++++++------ .../editor/panel/toolbar/left/ToolbarLeft.tsx | 2 +- .../editor/panel/tree/item/right-click.tsx | 6 ++-- app/web/src/render/live/dev-loader.tsx | 8 ++--- app/web/src/utils/types/general.ts | 4 +-- pkgs/core/api/_dbs.ts | 5 +-- pkgs/core/api/_prasi.ts | 2 +- pkgs/core/index.ts | 6 ++-- pkgs/core/server/api/api-scan.ts | 2 +- pkgs/core/server/api/prep-api-ts.ts | 2 +- pkgs/core/server/serve-api.ts | 2 +- pkgs/core/utils/global.ts | 4 +-- pkgs/core/utils/prisma.ts | 2 +- pkgs/web-utils/src/global.ts | 4 +-- 71 files changed, 221 insertions(+), 221 deletions(-) diff --git a/app/srv/api/site-export.ts b/app/srv/api/site-export.ts index 0734adee..233abd52 100644 --- a/app/srv/api/site-export.ts +++ b/app/srv/api/site-export.ts @@ -12,10 +12,10 @@ export const _ = { url: "/site-export/:site_id", async api(site_id: string) { const { req, res } = apiContext(this); - const site = (await db.site.findFirst({ + const site = (await _db.site.findFirst({ where: { id: site_id }, })) as any; - const pages = await db.page.findMany({ + const pages = await _db.page.findMany({ where: { id_site: site_id, is_deleted: false, @@ -24,7 +24,7 @@ export const _ = { }); if (site) { - const layout = await db.page.findFirst({ + const layout = await _db.page.findFirst({ where: { id_site: site.id, name: { startsWith: "layout:" }, @@ -34,7 +34,7 @@ export const _ = { select: { content_tree: true, id: true }, }); - const cgroups = await db.site_use_comp.findMany({ + const cgroups = await _db.site_use_comp.findMany({ where: { id_site: site.id }, }); @@ -54,7 +54,7 @@ export const _ = { } } - const comps = await db.component.findMany({ + const comps = await _db.component.findMany({ where: { component_group: { component_site: { @@ -69,11 +69,11 @@ export const _ = { site: {} as Record, pages: {} as Record>, }; - const page_ids = await db.page.findMany({ + const page_ids = await _db.page.findMany({ where: { id_site: site_id, is_deleted: false }, select: { id: true }, }); - const npm_page = await db.npm_page.findMany({ + const npm_page = await _db.npm_page.findMany({ where: { id_page: { in: page_ids.map((e) => e.id) } }, }); diff --git a/app/srv/util/build-npm.ts b/app/srv/util/build-npm.ts index 91edbd98..b5ddee2f 100644 --- a/app/srv/util/build-npm.ts +++ b/app/srv/util/build-npm.ts @@ -31,9 +31,9 @@ export const buildNpm = async ({ let items = _items; if (!items) { if (mode === "site") { - items = await db.npm_site.findMany({ where: { id_site: id } }); + items = await _db.npm_site.findMany({ where: { id_site: id } }); } else { - items = await db.npm_page.findMany({ where: { id_page: id } }); + items = await _db.npm_page.findMany({ where: { id_page: id } }); } } const packages: Record = {}; @@ -157,7 +157,7 @@ packages: if (mode === "page") { delete glb.npm.page[id]; - await db.npm_page.updateMany({ + await _db.npm_page.updateMany({ where: { id_page: id, }, @@ -165,7 +165,7 @@ packages: }); const p = eg.edit.page[id]; if (p) { - await db.page.update({ + await _db.page.update({ where: { id, }, @@ -178,7 +178,7 @@ packages: } else if (mode === "site") { delete glb.npm.site[id]; - await db.npm_site.updateMany({ + await _db.npm_site.updateMany({ where: { id_site: id, }, diff --git a/app/srv/ws/edit/action/diff-local.ts b/app/srv/ws/edit/action/diff-local.ts index dc4118db..4d0d0d91 100644 --- a/app/srv/ws/edit/action/diff-local.ts +++ b/app/srv/ws/edit/action/diff-local.ts @@ -31,7 +31,7 @@ export const diffLocal = (ws: any, msg: any) => { if (msg.id) { const page = eg.edit.page[msg.id].doc.getMap("map").toJSON(); try { - await db.page.update({ + await _db.page.update({ where: { id: page.id }, data: { content_tree: page.content_tree, @@ -52,7 +52,7 @@ export const diffLocal = (ws: any, msg: any) => { clearTimeout(eg.edit.comp[msg.id].saveTimeout); eg.edit.comp[msg.id].saveTimeout = setTimeout(async () => { const comp = eg.edit.comp[msg.id].doc.getMap("map").toJSON(); - await db.component.update({ + await _db.component.update({ where: { id: msg.id, }, @@ -68,7 +68,7 @@ export const diffLocal = (ws: any, msg: any) => { eg.edit.site[msg.id].saveTimeout = setTimeout(async () => { const site = eg.edit.site[msg.id].doc.getMap("site").toJSON(); delete site.page; - await db.site.update({ + await _db.site.update({ where: { id: msg.id, }, diff --git a/app/srv/ws/edit/action/get-comp.ts b/app/srv/ws/edit/action/get-comp.ts index d83103ed..94f931f3 100644 --- a/app/srv/ws/edit/action/get-comp.ts +++ b/app/srv/ws/edit/action/get-comp.ts @@ -17,7 +17,7 @@ export const getComp = async ( if (!validate(comp_id)) return; if (!eg.edit.comp[comp_id]) { - const rawComp = await db.component.findFirst({ + const rawComp = await _db.component.findFirst({ where: { id: comp_id, }, diff --git a/app/srv/ws/edit/edit-handler.ts b/app/srv/ws/edit/edit-handler.ts index a2968fdd..b468a133 100644 --- a/app/srv/ws/edit/edit-handler.ts +++ b/app/srv/ws/edit/edit-handler.ts @@ -36,7 +36,7 @@ export const editHandler: WebSocketHandler = { clearTimeout(site.saveTimeout); site.saveTimeout = setTimeout(async () => { const js = JSON.parse(msg.src); - await db.site.update({ + await _db.site.update({ where: { id: msg.id_site, }, diff --git a/app/srv/ws/edit/tools/load-page.ts b/app/srv/ws/edit/tools/load-page.ts index 37ed01ee..6db86279 100644 --- a/app/srv/ws/edit/tools/load-page.ts +++ b/app/srv/ws/edit/tools/load-page.ts @@ -3,7 +3,7 @@ import { Page } from "../../../../web/src/utils/types/general"; export const loadPage = async (page_id: string) => { if (page_id && validate(page_id)) { - let page = (await db.page.findFirst({ + let page = (await _db.page.findFirst({ where: { id: page_id }, select: { id: true, diff --git a/app/srv/ws/edit/tools/load-site.ts b/app/srv/ws/edit/tools/load-site.ts index 2cd5db05..13b42209 100644 --- a/app/srv/ws/edit/tools/load-site.ts +++ b/app/srv/ws/edit/tools/load-site.ts @@ -16,7 +16,7 @@ export const loadSite = async (idOrDomain: string) => { rname = "prasi.app"; } - const res = await db.site.findFirst({ + const res = await _db.site.findFirst({ where: isValidUUID(rname) ? { id: rname, @@ -73,11 +73,11 @@ export const loadSite = async (idOrDomain: string) => { const createPage = async ( site: site & { page: page[] }, page: WithOptional< - Parameters[0]["data"], + Parameters[0]["data"], "content_tree" > ) => { - const raw = await db.page.create({ + const raw = await _db.page.create({ data: { ...(page as any), content_tree: page.content_tree ? page.content_tree : blank, diff --git a/app/srv/ws/sync/actions/code_edit.ts b/app/srv/ws/sync/actions/code_edit.ts index 5abf056b..37b89604 100644 --- a/app/srv/ws/sync/actions/code_edit.ts +++ b/app/srv/ws/sync/actions/code_edit.ts @@ -91,14 +91,14 @@ export const code_edit: SAction["code"]["edit"] = async function ( }); if (save_to === "comp" && comp_id) { - db.component.update({ + _db.component.update({ where: { id: comp_id }, data: { content_tree: root.toJSON(), }, }); } else if (page_id && validate(page_id)) { - db.page.update({ + _db.page.update({ where: { id: page_id }, data: { content_tree: root.toJSON(), @@ -128,14 +128,14 @@ export const code_edit: SAction["code"]["edit"] = async function ( }); if (save_to === "comp" && comp_id) { - db.component.update({ + _db.component.update({ where: { id: comp_id }, data: { content_tree: root.toJSON(), }, }); } else if (page_id && validate(page_id)) { - db.page.update({ + _db.page.update({ where: { id: page_id }, data: { content_tree: root.toJSON(), @@ -189,7 +189,7 @@ export const code_edit: SAction["code"]["edit"] = async function ( } } }); - await db.component.update({ + await _db.component.update({ where: { id: comp_id }, data: { content_tree: root.toJSON(), diff --git a/app/srv/ws/sync/actions/comp_group.ts b/app/srv/ws/sync/actions/comp_group.ts index 1191d660..25bb6fb3 100644 --- a/app/srv/ws/sync/actions/comp_group.ts +++ b/app/srv/ws/sync/actions/comp_group.ts @@ -6,7 +6,7 @@ export const comp_group: SAction["comp"]["group"] = async function ( id_site ) { const result: Awaited> = {}; - let groups = await db.component_group.findMany({ + let groups = await _db.component_group.findMany({ where: { component_site: { some: { @@ -21,7 +21,7 @@ export const comp_group: SAction["comp"]["group"] = async function ( }); if (groups.length === 0) { - await db.component_group.create({ + await _db.component_group.create({ data: { name: "All", component_site: { @@ -33,7 +33,7 @@ export const comp_group: SAction["comp"]["group"] = async function ( }, }); - await db.component_group.create({ + await _db.component_group.create({ data: { name: "__TRASH__", component_site: { @@ -45,7 +45,7 @@ export const comp_group: SAction["comp"]["group"] = async function ( }, }); - groups = await db.component_group.findMany({ + groups = await _db.component_group.findMany({ where: { component_site: { some: { diff --git a/app/srv/ws/sync/actions/comp_new.ts b/app/srv/ws/sync/actions/comp_new.ts index df271dee..f1ce48a8 100644 --- a/app/srv/ws/sync/actions/comp_new.ts +++ b/app/srv/ws/sync/actions/comp_new.ts @@ -115,7 +115,7 @@ export const comp_new: SAction["comp"]["new"] = async function ( }; const createComp = async (item: any, group_id: string) => { - const comp = await db.component.create({ + const comp = await _db.component.create({ data: { name: item.name, content_tree: {}, @@ -133,7 +133,7 @@ const createComp = async (item: any, group_id: string) => { props: {}, ref_ids: {}, }; - await db.component.update({ + await _db.component.update({ where: { id: comp.id }, data: { content_tree: item }, }); diff --git a/app/srv/ws/sync/actions/page_cache.ts b/app/srv/ws/sync/actions/page_cache.ts index dac69a79..68f60dce 100644 --- a/app/srv/ws/sync/actions/page_cache.ts +++ b/app/srv/ws/sync/actions/page_cache.ts @@ -21,7 +21,7 @@ export const page_cache: SAction["page"]["cache"] = async function ( !cache[site_id] || (cache[site_id] && Date.now() - cache[site_id].ts > 5000) ) { - const pages = await db.page.findMany({ + const pages = await _db.page.findMany({ where: { id_site: site_id, is_deleted: false, @@ -45,7 +45,7 @@ export const page_cache: SAction["page"]["cache"] = async function ( for (const url of urls) { const found = router.lookup(url); if (found && !exclude_page_id.includes(found.id)) { - const row = await db.page.findFirst({ + const row = await _db.page.findFirst({ where: { id: found.id }, select: { content_tree: true, url: true }, }); diff --git a/app/srv/ws/sync/actions/page_load.ts b/app/srv/ws/sync/actions/page_load.ts index 0422e210..6b564781 100644 --- a/app/srv/ws/sync/actions/page_load.ts +++ b/app/srv/ws/sync/actions/page_load.ts @@ -65,13 +65,13 @@ export const page_load: SAction["page"]["load"] = async function ( user.active.delAll({ client_id: this.client_id }); if (!snap && !ydoc) { - const page = await db.page.findFirst({ where: { id } }); + const page = await _db.page.findFirst({ where: { id } }); if (page) { const doc = new Y.Doc(); let root = doc.getMap("map"); const proot = await prepContentTree(page.id, page.content_tree, this); if (validate(id) && id) { - await db.page.update({ where: { id }, data: { content_tree: proot } }); + await _db.page.update({ where: { id }, data: { content_tree: proot } }); } syncronize(root, { id, root: proot }); diff --git a/app/srv/ws/sync/actions/site_group.ts b/app/srv/ws/sync/actions/site_group.ts index 75094044..a9c0da65 100644 --- a/app/srv/ws/sync/actions/site_group.ts +++ b/app/srv/ws/sync/actions/site_group.ts @@ -1,7 +1,7 @@ import { SyncConnection } from "../type"; export const site_group = async function (this: SyncConnection) { - const res = db.org.findMany({ + const res = _db.org.findMany({ where: { org_user: { some: { id_user: this.user_id } }, }, diff --git a/app/srv/ws/sync/actions/site_load.ts b/app/srv/ws/sync/actions/site_load.ts index 871c7ace..43f1f199 100644 --- a/app/srv/ws/sync/actions/site_load.ts +++ b/app/srv/ws/sync/actions/site_load.ts @@ -10,7 +10,7 @@ export const site_load: SAction["site"]["load"] = async function ( site_id: string ) { if (validate(site_id)) { - const site = await db.site.findFirst({ where: { id: site_id } }); + const site = await _db.site.findFirst({ where: { id: site_id } }); if (site) { if (this.conf) this.conf.site_id = site.id; @@ -19,7 +19,7 @@ export const site_load: SAction["site"]["load"] = async function ( ? { api_url: (site.config as any).api_url || "" } : { api_url: "" }; - const layouts = await db.page.findMany({ + const layouts = await _db.page.findMany({ where: { id_site: site_id, name: { diff --git a/app/srv/ws/sync/actions/site_update.ts b/app/srv/ws/sync/actions/site_update.ts index 863d7ec1..c1bf9bab 100644 --- a/app/srv/ws/sync/actions/site_update.ts +++ b/app/srv/ws/sync/actions/site_update.ts @@ -22,7 +22,7 @@ export const site_update: SAction["site"]["update"] = async function ( } } - await db.site.update({ + await _db.site.update({ where: { id }, data: updated, }); diff --git a/app/srv/ws/sync/actions/yjs_diff_local.ts b/app/srv/ws/sync/actions/yjs_diff_local.ts index b9c86098..5ba046bd 100644 --- a/app/srv/ws/sync/actions/yjs_diff_local.ts +++ b/app/srv/ws/sync/actions/yjs_diff_local.ts @@ -25,7 +25,7 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function ( if (root) { if (mode === "page") { if (validate(id) && id) { - await db.page.update({ + await _db.page.update({ where: { id }, data: { content_tree: root.toJSON(), @@ -33,7 +33,7 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function ( }); } } else if (mode === "comp") { - await db.component.update({ + await _db.component.update({ where: { id }, data: { content_tree: root.toJSON(), diff --git a/app/srv/ws/sync/editor/load-component.ts b/app/srv/ws/sync/editor/load-component.ts index bf7a554c..de8c1e7e 100644 --- a/app/srv/ws/sync/editor/load-component.ts +++ b/app/srv/ws/sync/editor/load-component.ts @@ -53,7 +53,7 @@ export const loadComponent = async (comp_id: string, sync?: SyncConnection) => { }; if (!snap && !ydoc) { - const comp = await db.component.findFirst({ where: { id: comp_id } }); + const comp = await _db.component.findFirst({ where: { id: comp_id } }); if (comp) { const item = comp.content_tree as IItem; if (item && item.component?.id !== comp.id) { diff --git a/app/srv/ws/sync/editor/load-default.ts b/app/srv/ws/sync/editor/load-default.ts index 0b2761af..07a22528 100644 --- a/app/srv/ws/sync/editor/load-default.ts +++ b/app/srv/ws/sync/editor/load-default.ts @@ -4,7 +4,7 @@ export const loadDefaultSite = async (user_id: string) => { const conf = user.conf.get(user_id); if (conf) { if (!conf.site_id) { - const site = await db.site.findFirst({ + const site = await _db.site.findFirst({ where: { id_user: user_id, is_deleted: false, @@ -18,7 +18,7 @@ export const loadDefaultSite = async (user_id: string) => { } if (conf.site_id && !conf.page_id) { - const page = await db.page.findFirst({ + const page = await _db.page.findFirst({ select: { id: true }, where: { id_site: conf.site_id, diff --git a/app/srv/ws/sync/editor/load-sitepage.ts b/app/srv/ws/sync/editor/load-sitepage.ts index bfb881f6..d2f971d4 100644 --- a/app/srv/ws/sync/editor/load-sitepage.ts +++ b/app/srv/ws/sync/editor/load-sitepage.ts @@ -7,7 +7,7 @@ export const loadSitePage = async ( page_id?: string ) => { if (validate(site_id)) { - const site = await db.site.findFirst({ + const site = await _db.site.findFirst({ where: { id: site_id }, select: { id: true }, }); @@ -18,13 +18,13 @@ export const loadSitePage = async ( let page = null; if (validate(page_id || "")) { - page = await db.page.findFirst({ + page = await _db.page.findFirst({ where: { id: page_id, id_site: site_id, is_deleted: false }, select: { id: true }, }); } if (!page) { - page = await db.page.findFirst({ + page = await _db.page.findFirst({ where: { id_site: site_id, is_deleted: false }, select: { id: true }, }); diff --git a/app/srv/ws/sync/editor/prep-page.ts b/app/srv/ws/sync/editor/prep-page.ts index bb4d30e4..061d94e9 100644 --- a/app/srv/ws/sync/editor/prep-page.ts +++ b/app/srv/ws/sync/editor/prep-page.ts @@ -106,7 +106,7 @@ export const loadCompForPage = async (ctree: IRoot, sync: SyncConnection) => { if (Object.keys(should_save).length > 0) { for (const [comp_id, v] of Object.entries(should_save)) { - await db.component.update({ + await _db.component.update({ where: { id: comp_id }, data: { content_tree: v, diff --git a/app/srv/ws/sync/sync-handler.ts b/app/srv/ws/sync/sync-handler.ts index 217505b8..a1a68b56 100644 --- a/app/srv/ws/sync/sync-handler.ts +++ b/app/srv/ws/sync/sync-handler.ts @@ -47,7 +47,7 @@ export const syncHandler: WebSocketHandler = { const { user_id, page_id, site_id } = msg; conn.user_id = user_id; - conn.user = await db.user.findFirst({ where: { id: user_id } }); + conn.user = await _db.user.findFirst({ where: { id: user_id } }); let conf = await user.conf.getOrCreate(user_id); if (site_id) { const newconf = await loadSitePage(user_id, site_id, page_id); diff --git a/app/web/src/base/page/auth/login.tsx b/app/web/src/base/page/auth/login.tsx index 18dce60d..fdf3edb4 100644 --- a/app/web/src/base/page/auth/login.tsx +++ b/app/web/src/base/page/auth/login.tsx @@ -15,7 +15,7 @@ export default page({ init: false, }, async () => { - const s = await api.session(); + const s = await _api.session(); if (s && s.id) { const rto = (window as any).redirectTo; if (rto) { @@ -40,7 +40,7 @@ export default page({ e.preventDefault(); form.submitting = true; form.render(); - const s = await api.login(form.username, form.password); + const s = await _api.login(form.username, form.password); if (s.status === "failed") { form.submitting = false; diff --git a/app/web/src/base/page/auth/logout.tsx b/app/web/src/base/page/auth/logout.tsx index c6d67631..30f29ba7 100644 --- a/app/web/src/base/page/auth/logout.tsx +++ b/app/web/src/base/page/auth/logout.tsx @@ -4,7 +4,7 @@ import { Loading } from "../../../utils/ui/loading"; export default page({ url: "/logout", component: ({}) => { - api.logout().then(() => { + _api.logout().then(() => { location.href = "/login"; }); diff --git a/app/web/src/base/page/auth/register.tsx b/app/web/src/base/page/auth/register.tsx index 3e7c517d..759f5b1b 100644 --- a/app/web/src/base/page/auth/register.tsx +++ b/app/web/src/base/page/auth/register.tsx @@ -16,7 +16,7 @@ export default page({ init: false, }, async () => { - const s = await api.session(); + const s = await _api.session(); if (s && s.id) { navigate("/ed"); @@ -36,7 +36,7 @@ export default page({ e.preventDefault(); form.submitting = true; form.render(); - const s = await api.register({ + const s = await _api.register({ username: form.username, password: form.password, email: form.email, diff --git a/app/web/src/base/page/editor.tsx b/app/web/src/base/page/editor.tsx index bd03f58c..7785ed25 100644 --- a/app/web/src/base/page/editor.tsx +++ b/app/web/src/base/page/editor.tsx @@ -35,7 +35,7 @@ export default page({ if (!!ses) { done(); } - let e = await api.session(); + let e = await _api.session(); if (!e) { (window as any).redirectTo = location.pathname; navigate("/login"); @@ -56,7 +56,7 @@ export default page({ local.session = ses; if (!site_id) { - const res = await db.site.findFirst({ + const res = await _db.site.findFirst({ where: { is_deleted: false, org: { @@ -70,7 +70,7 @@ export default page({ }, }); if (res) { - const page = await db.page.findFirst({ + const page = await _db.page.findFirst({ where: { id_site: res.id, is_deleted: false, @@ -91,7 +91,7 @@ export default page({ return; } } else if (!page_id) { - let res = await db.page.findFirst({ + let res = await _db.page.findFirst({ where: { id_site: site_id, is_deleted: false, @@ -102,7 +102,7 @@ export default page({ }); if (!res) { - res = await db.page.create({ + res = await _db.page.create({ data: { content_tree: { childs: [], diff --git a/app/web/src/index.tsx b/app/web/src/index.tsx index d476197d..0a003a4d 100644 --- a/app/web/src/index.tsx +++ b/app/web/src/index.tsx @@ -17,12 +17,11 @@ const start = async () => { const cur = new URL(w.basehost || location.href); const base_url = `${cur.protocol}//${cur.host}`; - w.db = dbProxy(base_url); - + w._db = dbProxy(base_url); try { await loadApiProxyDef(base_url, false); - w.api = apiProxy(base_url); + w._api = apiProxy(base_url); } catch (e) { console.warn("Failed to load API:", base_url); } diff --git a/app/web/src/nova/ed/logic/ed-sync.tsx b/app/web/src/nova/ed/logic/ed-sync.tsx index f7f8832b..65f7b718 100644 --- a/app/web/src/nova/ed/logic/ed-sync.tsx +++ b/app/web/src/nova/ed/logic/ed-sync.tsx @@ -37,7 +37,7 @@ export const edInitSync = (p: PG) => { if (location.pathname.startsWith("/vi/")) { if (page.list.length === 0) { - db.page + _db.page .findMany({ where: { id_site: params.site_id, @@ -84,7 +84,7 @@ export const edInitSync = (p: PG) => { if (!params.page_id) { if (location.pathname.startsWith("/ed")) { if (!params.site_id) { - db.page + _db.page .findFirst({ where: { is_deleted: false, @@ -99,7 +99,7 @@ export const edInitSync = (p: PG) => { if (e) location.href = `/ed/${e.id_site}/${e.id}`; }); } else { - db.page + _db.page .findFirst({ where: { is_deleted: false, @@ -111,7 +111,7 @@ export const edInitSync = (p: PG) => { .then(async (e) => { if (e) location.href = `/ed/${params.site_id}/${e.id}`; else { - const res = await db.page.create({ + const res = await _db.page.create({ data: { content_tree: { childs: [], @@ -156,7 +156,7 @@ export const edInitSync = (p: PG) => { params.site_id && location.pathname.startsWith("/ed/") ) { - db.page + _db.page .findFirst({ where: { is_deleted: false, diff --git a/app/web/src/nova/ed/panel/popup/code/code.tsx b/app/web/src/nova/ed/panel/popup/code/code.tsx index d01d24e0..4120ea06 100644 --- a/app/web/src/nova/ed/panel/popup/code/code.tsx +++ b/app/web/src/nova/ed/panel/popup/code/code.tsx @@ -33,7 +33,7 @@ export const EdPopCode = () => { useEffect(() => { if (code.mode === "" && p.site.id) { - db.code.findFirst({ where: { id_site: p.site.id } }).then((e) => { + _db.code.findFirst({ where: { id_site: p.site.id } }).then((e) => { code.mode = e ? "new" : "old"; if (localStorage.vsc_opened === "yes") { @@ -90,7 +90,7 @@ export const EdPopCode = () => { ) ) { code.mode = "new"; - db.code.create({ + _db.code.create({ data: { id_site: p.site.id, name: "site" }, }); p.ui.popup.code.open = false; @@ -355,7 +355,7 @@ const CodeBody = () => { ) ) { localStorage.vsc_opened = "yes"; - await db.site.update({ + await _db.site.update({ where: { id: p.site.id }, data: { code_mode: "old" }, }); @@ -416,7 +416,7 @@ const CodeBody = () => { ) ) { localStorage.vsc_opened = "yes"; - await db.site.update({ + await _db.site.update({ where: { id: p.site.id }, data: { code_mode: "vsc" }, }); diff --git a/app/web/src/nova/ed/panel/popup/code/name-list.tsx b/app/web/src/nova/ed/panel/popup/code/name-list.tsx index c6aa7a05..dd1961fd 100644 --- a/app/web/src/nova/ed/panel/popup/code/name-list.tsx +++ b/app/web/src/nova/ed/panel/popup/code/name-list.tsx @@ -44,7 +44,7 @@ export const CodeNameList: FC<{ }, async () => { codeName.loading = true; - codeName.list = await api.code(p.site.id, "list"); + codeName.list = await _api.code(p.site.id, "list"); codeName.loading = false; local.render(); } @@ -94,7 +94,7 @@ export const CodeNameList: FC<{ local.newopen = false; local.render(); - const nc = await db.code.create({ + const nc = await _db.code.create({ data: { id_site: p.site.id, name: local.newname, diff --git a/app/web/src/nova/ed/panel/popup/comp/comp-popup.tsx b/app/web/src/nova/ed/panel/popup/comp/comp-popup.tsx index 8ab8952a..d1957899 100644 --- a/app/web/src/nova/ed/panel/popup/comp/comp-popup.tsx +++ b/app/web/src/nova/ed/panel/popup/comp/comp-popup.tsx @@ -169,7 +169,7 @@ export const EdPopComp = () => { typeof opt.dragSourceId === "string" && typeof opt.dropTargetId === "string" ) { - db.component.update({ + _db.component.update({ where: { id: opt.dragSourceId, }, diff --git a/app/web/src/nova/ed/panel/popup/comp/comp-preview.tsx b/app/web/src/nova/ed/panel/popup/comp/comp-preview.tsx index d2c1c41d..f7a10f7e 100644 --- a/app/web/src/nova/ed/panel/popup/comp/comp-preview.tsx +++ b/app/web/src/nova/ed/panel/popup/comp/comp-preview.tsx @@ -35,7 +35,7 @@ export const EdCompPreview = () => { if (root) { if (root.text !== found.text) { found.text = root.text; - db.component.update({ + _db.component.update({ where: { id: comp_id }, data: { name: found.text }, }); @@ -71,7 +71,7 @@ export const EdCompPreview = () => { p.ui.popup.comp_group = { mouse_event: e, async on_pick(group_id) { - await db.component.update({ + await _db.component.update({ where: { id: comp_id }, data: { id_component_group: group_id }, }); @@ -100,7 +100,7 @@ export const EdCompPreview = () => { e.stopPropagation(); if (isTrashed) { if (confirm("Permanently delete this component?")) { - await db.component.delete({ + await _db.component.delete({ where: { id: p.ui.popup.comp.preview_id }, }); const idx = @@ -117,7 +117,7 @@ export const EdCompPreview = () => { } } else { if (confirm("Move component to trash?")) { - await db.component.update({ + await _db.component.update({ where: { id: comp_id }, data: { id_component_group: compPicker.trash_id }, }); diff --git a/app/web/src/nova/ed/panel/popup/comp/comp-reload.ts b/app/web/src/nova/ed/panel/popup/comp/comp-reload.ts index db88bfe4..2f70a8f9 100644 --- a/app/web/src/nova/ed/panel/popup/comp/comp-reload.ts +++ b/app/web/src/nova/ed/panel/popup/comp/comp-reload.ts @@ -45,7 +45,7 @@ export const reloadCompPicker = async (p: PG) => { comp_ids.push(k); } - const comps = await db.component.findMany({ + const comps = await _db.component.findMany({ where: { id_component_group: { in: comp_ids } }, select: { id: true, id_component_group: true, name: true }, }); @@ -66,7 +66,7 @@ export const reloadCompPicker = async (p: PG) => { if (root) { if (root.data?.item.name && comp.name !== root.data?.item.name) { comp.name = root.data.item.name; - db.component.update({ + _db.component.update({ where: { id: comp.id }, data: { name: comp.name }, }); diff --git a/app/web/src/nova/ed/panel/popup/comp/comp-tree.tsx b/app/web/src/nova/ed/panel/popup/comp/comp-tree.tsx index 28091a68..4dd53de4 100644 --- a/app/web/src/nova/ed/panel/popup/comp/comp-tree.tsx +++ b/app/web/src/nova/ed/panel/popup/comp/comp-tree.tsx @@ -81,13 +81,13 @@ export const edPageTreeRender: NodeRender = ( item.name = local.rename_to; if (item.id === "") { if (item.name) { - db.page_folder.create({ + _db.page_folder.create({ data: { name: local.rename_to, id_site: p.site.id }, }); } await reloadCompPicker(p); } else { - db.page_folder.update({ + _db.page_folder.update({ where: { id: item.id }, data: { name: local.rename_to }, }); @@ -136,7 +136,7 @@ export const edPageTreeRender: NodeRender = ( p.ui.popup.comp_group = { mouse_event: e, async on_pick(group_id) { - await db.component.update({ + await _db.component.update({ where: { id: item.id }, data: { id_component_group: group_id }, }); diff --git a/app/web/src/nova/ed/panel/popup/npm/npm-import.tsx b/app/web/src/nova/ed/panel/popup/npm/npm-import.tsx index fc86ed2b..48fee957 100644 --- a/app/web/src/nova/ed/panel/popup/npm/npm-import.tsx +++ b/app/web/src/nova/ed/panel/popup/npm/npm-import.tsx @@ -27,16 +27,16 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => { const reload = async () => { if (mode === "page") { - local.list = await db.npm_page.findMany({ + local.list = await _db.npm_page.findMany({ where: { id_page: p.page.cur.id }, }); } else if (mode === "site") { - local.list = await db.npm_site.findMany({ + local.list = await _db.npm_site.findMany({ where: { id_site: p.site.id }, }); } - const size = await api.npm_size( + const size = await _api.npm_size( mode, mode === "site" ? p.site.id || "" : p.page.cur.id ); @@ -100,7 +100,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => { local.render(); if (mode === "page") { - await db.npm_page.create({ + await _db.npm_page.create({ data: { id_page: p.page.cur.id, module: name, @@ -108,7 +108,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => { }, }); } else { - await db.npm_site.create({ + await _db.npm_site.create({ data: { id_site: p.site.id, module: name, @@ -129,11 +129,11 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => { const [name, version] = e.value.split("-><-"); if (mode === "page") { - await db.npm_page.create({ + await _db.npm_page.create({ data: { id_page: p.page.cur.id, module: name, version }, }); } else { - await db.npm_site.create({ + await _db.npm_site.create({ data: { id_site: p.site.id, module: name, version }, }); } @@ -194,7 +194,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => { local.bundling = true; local.render(); - const res = (await api.npm_bundle( + const res = (await _api.npm_bundle( mode, mode === "site" ? p.site.id || "" diff --git a/app/web/src/nova/ed/panel/popup/npm/npm-items.tsx b/app/web/src/nova/ed/panel/popup/npm/npm-items.tsx index 8ff8654a..f5ac4672 100644 --- a/app/web/src/nova/ed/panel/popup/npm/npm-items.tsx +++ b/app/web/src/nova/ed/panel/popup/npm/npm-items.tsx @@ -34,11 +34,11 @@ export const EdNpmItems = ({ bundled={bundled} remove={async (e) => { if (mode === "site") { - await db.npm_site.delete({ + await _db.npm_site.delete({ where: { id: BigInt(e.id) }, }); } else { - await db.npm_page.delete({ + await _db.npm_page.delete({ where: { id: BigInt(e.id) }, }); } @@ -230,14 +230,14 @@ const MainImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, @@ -315,14 +315,14 @@ const CustomImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, @@ -396,14 +396,14 @@ const NamedImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, diff --git a/app/web/src/nova/ed/panel/popup/page/page-form.tsx b/app/web/src/nova/ed/panel/popup/page/page-form.tsx index 9faa5aff..0b79c0ed 100644 --- a/app/web/src/nova/ed/panel/popup/page/page-form.tsx +++ b/app/web/src/nova/ed/panel/popup/page/page-form.tsx @@ -62,7 +62,7 @@ export const EdFormPage: FC<{ let id_folder = form.id_folder; if (!id_folder || id_folder === "ROOT") id_folder = null; if (!form.id) { - const res = await db.page.create({ + const res = await _db.page.create({ data: { content_tree: { childs: [], @@ -77,7 +77,7 @@ export const EdFormPage: FC<{ }); onSave(res, true); } else { - const res = await db.page.update({ + const res = await _db.page.update({ data: { name: form.name, url: form.url || "", @@ -191,7 +191,7 @@ export const EdFormPage: FC<{ className="bg-red-600 w-[40px] flex justify-center items-center" onClick={async () => { if (confirm("Are you sure ?")) { - const res = await db.page.update({ + const res = await _db.page.update({ where: { id: page.id, }, diff --git a/app/web/src/nova/ed/panel/popup/page/page-popup.tsx b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx index dcc83179..bd7eb173 100644 --- a/app/web/src/nova/ed/panel/popup/page/page-popup.tsx +++ b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx @@ -157,7 +157,7 @@ export const EdPopPage = () => { p.render(); if (!opt.dragSource?.droppable) { - await db.page.update({ + await _db.page.update({ where: { id: opt.dragSourceId as string, }, @@ -170,7 +170,7 @@ export const EdPopPage = () => { select: { id: true }, }); } else { - await db.page_folder.update({ + await _db.page_folder.update({ where: { id: opt.dragSourceId as string, }, diff --git a/app/web/src/nova/ed/panel/popup/page/page-reload.ts b/app/web/src/nova/ed/panel/popup/page/page-reload.ts index 947b7d5d..7cf7ac48 100644 --- a/app/web/src/nova/ed/panel/popup/page/page-reload.ts +++ b/app/web/src/nova/ed/panel/popup/page/page-reload.ts @@ -24,7 +24,7 @@ export const pagePicker = { export const reloadPagePicker = async (p: PG) => { pagePicker.status = "loading"; - const pages = await db.page.findMany({ + const pages = await _db.page.findMany({ where: { id_site: p.site.id, is_deleted: false, @@ -39,7 +39,7 @@ export const reloadPagePicker = async (p: PG) => { }, }); - const folders = await db.page_folder.findMany({ + const folders = await _db.page_folder.findMany({ where: { id_site: p.site.id, is_deleted: false }, select: { id: true, name: true, parent_id: true }, }); diff --git a/app/web/src/nova/ed/panel/popup/page/page-tree.tsx b/app/web/src/nova/ed/panel/popup/page/page-tree.tsx index f2498c7d..b86f6654 100644 --- a/app/web/src/nova/ed/panel/popup/page/page-tree.tsx +++ b/app/web/src/nova/ed/panel/popup/page/page-tree.tsx @@ -72,7 +72,7 @@ export const edPageTreeRender: NodeRender = ( if (item.id === "NEW") { if (item.name) { - await db.page_folder.create({ + await _db.page_folder.create({ data: { name: local.rename_to, id_site: p.site.id, @@ -84,7 +84,7 @@ export const edPageTreeRender: NodeRender = ( pagePicker.new_parent_id = ""; } } else { - await db.page_folder.update({ + await _db.page_folder.update({ where: { id: item.id }, data: { name: local.rename_to }, }); @@ -160,7 +160,7 @@ export const edPageTreeRender: NodeRender = ( e.stopPropagation(); if (confirm("Clone page ?")) { local.render(); - const page = (await db.page.findFirst({ + const page = (await _db.page.findFirst({ where: { id: node.id as string, is_deleted: false, @@ -171,7 +171,7 @@ export const edPageTreeRender: NodeRender = ( delete page.id; page.name = `${page.name} [Cloned]`; page.url = `${page.url}-cloned`; - await db.page.create({ + await _db.page.create({ data: page, }); @@ -204,7 +204,7 @@ export const edPageTreeRender: NodeRender = ( e.stopPropagation(); if (confirm("Deletting cannot be undone. Are you sure ?")) { if (item.type === "folder") { - await db.page.updateMany({ + await _db.page.updateMany({ where: { id_folder: node.id as string }, data: { id_folder: @@ -213,14 +213,14 @@ export const edPageTreeRender: NodeRender = ( : (node.parent as string), }, }); - await db.page_folder.update({ + await _db.page_folder.update({ where: { id: node.id as string }, data: { is_deleted: true, }, }); } else { - await db.page.update({ + await _db.page.update({ where: { id: node.id as string }, data: { is_deleted: true, diff --git a/app/web/src/nova/ed/panel/popup/site/site-form.tsx b/app/web/src/nova/ed/panel/popup/site/site-form.tsx index efdb000f..6174d556 100644 --- a/app/web/src/nova/ed/panel/popup/site/site-form.tsx +++ b/app/web/src/nova/ed/panel/popup/site/site-form.tsx @@ -59,7 +59,7 @@ export const EdFormSite: FC<{ try { if (!form.id) { try { - await db.site.create({ + await _db.site.create({ data: { name: form.name, favicon: "", @@ -73,7 +73,7 @@ export const EdFormSite: FC<{ alert(e); } } else { - await db.site.update({ + await _db.site.update({ data: { name: form.name, domain: form.domain, @@ -160,7 +160,7 @@ export const EdFormSite: FC<{ "Please type 'yes' (without quote) to confirm deletion: " )?.toLowerCase() === "yes" ) { - await db.site.update({ + await _db.site.update({ where: { id: site.id, }, diff --git a/app/web/src/nova/ed/panel/popup/site/site-head.tsx b/app/web/src/nova/ed/panel/popup/site/site-head.tsx index 47c2a832..421c25aa 100644 --- a/app/web/src/nova/ed/panel/popup/site/site-head.tsx +++ b/app/web/src/nova/ed/panel/popup/site/site-head.tsx @@ -34,7 +34,7 @@ export const EdSiteHead = ({ onClick={async () => { const neworg = prompt("New Organization Name"); if (neworg) { - const res = await db.org.create({ + const res = await _db.org.create({ data: { name: neworg, org_user: { diff --git a/app/web/src/nova/ed/panel/popup/site/site-tree.tsx b/app/web/src/nova/ed/panel/popup/site/site-tree.tsx index b5e0f13d..edb8454f 100644 --- a/app/web/src/nova/ed/panel/popup/site/site-tree.tsx +++ b/app/web/src/nova/ed/panel/popup/site/site-tree.tsx @@ -98,7 +98,7 @@ export const EdSiteTree = ({ node.text = gitem.name; gitem.renaming = false; local.render(); - await db.org.update({ + await _db.org.update({ where: { id: gitem.id }, data: { name: gitem.name }, }); @@ -139,14 +139,14 @@ export const EdSiteTree = ({ { - await db.org_user.deleteMany({ + await _db.org_user.deleteMany({ where: { id_org: gitem.id, id_user: u.id }, }); gitem.users = gitem.users.filter((e) => e.id !== u.id); local.render(); }} onAdd={async (u) => { - await db.org_user.create({ + await _db.org_user.create({ data: { id_org: gitem.id, id_user: u.id }, }); gitem.users = [...gitem.users, u]; @@ -168,10 +168,10 @@ export const EdSiteTree = ({ className="text-[12px] bg-white border rounded px-2 hover:bg-red-100 text-red-600 cursor-pointer min-h-[20px] flex items-center" onClick={async () => { if (confirm("Remove this organization ?")) { - await db.org_user.deleteMany({ + await _db.org_user.deleteMany({ where: { id_org: gitem.id }, }); - await db.org.delete({ + await _db.org.delete({ where: { id: gitem.id, }, @@ -336,7 +336,7 @@ export const EdSiteTree = ({ const from = dragSource?.data; if (target && from) { if (target.type === "group") { - await db.site.update({ + await _db.site.update({ where: { id: from.id, }, diff --git a/app/web/src/nova/ed/panel/popup/site/site-user.tsx b/app/web/src/nova/ed/panel/popup/site/site-user.tsx index 4ba30d0e..a269c32c 100644 --- a/app/web/src/nova/ed/panel/popup/site/site-user.tsx +++ b/app/web/src/nova/ed/panel/popup/site/site-user.tsx @@ -29,7 +29,7 @@ export const EdPopUser = ({ async () => { if (!user.loading) { user.loading = new Promise(async (done) => { - const res = await db.user.findMany({ + const res = await _db.user.findMany({ select: { id: true, username: true, diff --git a/app/web/src/nova/ed/panel/tree/node/item/name.tsx b/app/web/src/nova/ed/panel/tree/node/item/name.tsx index 03b76592..6feea8f3 100644 --- a/app/web/src/nova/ed/panel/tree/node/item/name.tsx +++ b/app/web/src/nova/ed/panel/tree/node/item/name.tsx @@ -68,7 +68,7 @@ export const EdTreeName = ({ } if (active.comp_id === item.component?.id) { - db.component.update({ + _db.component.update({ where: { id: active.comp_id, }, diff --git a/app/web/src/nova/vi/load/load-legacy.tsx b/app/web/src/nova/vi/load/load-legacy.tsx index a6b21aa1..13d5c66f 100644 --- a/app/web/src/nova/vi/load/load-legacy.tsx +++ b/app/web/src/nova/vi/load/load-legacy.tsx @@ -27,7 +27,7 @@ export const viLoadLegacy = async (vi: { w.exports = {}; } - const site = await db.site.findFirst({ + const site = await _db.site.findFirst({ where: { id: vi.site.id }, include: { component_site: true }, }); diff --git a/app/web/src/render/editor/logic/init.ts b/app/web/src/render/editor/logic/init.ts index 79274a6a..40f8c6fa 100644 --- a/app/web/src/render/editor/logic/init.ts +++ b/app/web/src/render/editor/logic/init.ts @@ -127,7 +127,7 @@ export const initEditor = async (p: PG, site_id: string) => { } w.apiurl = p.site.api_url; - api.site_dts(p.site.id).then((e: any) => { + _api.site_dts(p.site.id).then((e: any) => { p.site_dts = e || ""; p.render(); }); diff --git a/app/web/src/render/editor/logic/route.ts b/app/web/src/render/editor/logic/route.ts index a115752d..5ffaf324 100644 --- a/app/web/src/render/editor/logic/route.ts +++ b/app/web/src/render/editor/logic/route.ts @@ -23,7 +23,7 @@ export const routeEditor = (p: PG, page_id: string) => { p.status = "ready"; p.render(); }; - await api.page_reload(page_id); + await _api.page_reload(page_id); } else { p.status = "ready"; p.render(); diff --git a/app/web/src/render/editor/logic/ws.ts b/app/web/src/render/editor/logic/ws.ts index 060e10dd..21a8f354 100644 --- a/app/web/src/render/editor/logic/ws.ts +++ b/app/web/src/render/editor/logic/ws.ts @@ -41,7 +41,7 @@ export const editorWS = async (p: PG) => { p.wsRetry.localIP && ["localhost", "127.0.0.1"].includes(wsurl.hostname) ) { - const ips = await api.local_ip(); + const ips = await _api.local_ip(); wsurl.hostname = ips[0]; } diff --git a/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx b/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx index dad279ac..f2caaab7 100644 --- a/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx +++ b/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx @@ -92,7 +92,7 @@ export const CompManager: FC = () => { if (p.site.id) { local.loading = true; local.site_use = ( - await db.site_use_comp.findMany({ + await _db.site_use_comp.findMany({ where: { id_site: p.site.id, }, @@ -101,7 +101,7 @@ export const CompManager: FC = () => { }, }) ).map((e) => e.use_id_site); - const group = await db.component_group.findMany({ + const group = await _db.component_group.findMany({ where: { component_site: { some: { @@ -151,7 +151,7 @@ export const CompManager: FC = () => { const group_ids = Object.keys(local.group); if (group_ids.length > 0) { - const comps = await db.component.findMany({ + const comps = await _db.component.findMany({ where: { id_component_group: { in: group_ids, @@ -308,7 +308,7 @@ export const CompManager: FC = () => { }); if (totrash.length > 0) { if (!local.trash_id) { - const res = await db.component_group.create({ + const res = await _db.component_group.create({ data: { name: "__TRASH__", component_site: { @@ -322,7 +322,7 @@ export const CompManager: FC = () => { } if (local.trash_id) { - await db.component.updateMany({ + await _db.component.updateMany({ where: { id: { in: totrash }, }, @@ -378,7 +378,7 @@ export const CompManager: FC = () => { onClick={async () => { local.site_use_loading = true; local.render(); - await db.site_use_comp.create({ + await _db.site_use_comp.create({ data: { id_site: p.site.id, use_id_site: "9e34f31f-4ebd-4630-b61d-597045171ebb", @@ -409,7 +409,7 @@ export const CompManager: FC = () => { if (p.site.id) { local.site_use_loading = true; local.render(); - await db.site_use_comp.delete({ + await _db.site_use_comp.delete({ where: { id_site_use_id_site: { id_site: p.site.id, @@ -482,7 +482,7 @@ export const CompManager: FC = () => { local.renaming.id = ""; local.render(); - db.component_group.update({ + _db.component_group.update({ where: { id: g.info.id, }, @@ -543,7 +543,7 @@ export const CompManager: FC = () => { onClick={async () => { g.shared = false; - db.component_group.update({ + _db.component_group.update({ where: { id: g.info.id, }, @@ -563,7 +563,7 @@ export const CompManager: FC = () => { onClick={async () => { g.shared = true; - db.component_group.update({ + _db.component_group.update({ where: { id: g.info.id, }, @@ -596,7 +596,7 @@ export const CompManager: FC = () => { const name = prompt(`New Group Name:`); if (name) { - const res = await db.component_group.create({ + const res = await _db.component_group.create({ data: { component_site: { create: { @@ -629,7 +629,7 @@ export const CompManager: FC = () => { if (confirm("Are you sure ?")) { delete local.group[g.info.id]; local.render(); - await db.component_site.delete({ + await _db.component_site.delete({ where: { id_component_group_id_site: { id_component_group: g.info.id, @@ -779,7 +779,7 @@ export const CompManager: FC = () => { g.comps.splice(idx, 1); local.render(); - db.component.update({ + _db.component.update({ where: { id: e.id, }, @@ -823,7 +823,7 @@ export const CompManager: FC = () => { onClick={async (ev) => { if (confirm("Are you sure ?")) { if (!local.trash_id) { - const res = await db.component_group.create({ + const res = await _db.component_group.create({ data: { name: "__TRASH__", component_site: { @@ -837,7 +837,7 @@ export const CompManager: FC = () => { } if (local.trash_id) { - await db.component.update({ + await _db.component.update({ where: { id: local.selected_id, }, diff --git a/app/web/src/render/editor/panel/manager/page/page-mgr-form.tsx b/app/web/src/render/editor/panel/manager/page/page-mgr-form.tsx index 30b69a61..b4116e26 100644 --- a/app/web/src/render/editor/panel/manager/page/page-mgr-form.tsx +++ b/app/web/src/render/editor/panel/manager/page/page-mgr-form.tsx @@ -62,7 +62,7 @@ export const PageForm: FC<{ let id_folder = form.id_folder; if (!id_folder || id_folder === "ROOT") id_folder = null; if (!form.id) { - const res = await db.page.create({ + const res = await _db.page.create({ data: { content_tree: { childs: [], @@ -77,7 +77,7 @@ export const PageForm: FC<{ }); onSave(res, true); } else { - const res = await db.page.update({ + const res = await _db.page.update({ data: { name: form.name, url: form.url || "", @@ -187,7 +187,7 @@ export const PageForm: FC<{ className="bg-red-600 w-[40px] flex justify-center items-center" onClick={async () => { if (confirm("Are you sure ?")) { - const res = await db.page.update({ + const res = await _db.page.update({ where: { id: page.id, }, diff --git a/app/web/src/render/editor/panel/manager/page/page-mgr.tsx b/app/web/src/render/editor/panel/manager/page/page-mgr.tsx index 65ccb9da..e72a4449 100644 --- a/app/web/src/render/editor/panel/manager/page/page-mgr.tsx +++ b/app/web/src/render/editor/panel/manager/page/page-mgr.tsx @@ -77,7 +77,7 @@ export const PageManager = () => { local.loading = true; local.render(); - const folders = await db.page_folder.findMany({ + const folders = await _db.page_folder.findMany({ where: { id_site: p.site.id, is_deleted: false, @@ -90,7 +90,7 @@ export const PageManager = () => { data.folder[f.id] = { ...f }; } - data.all = await db.page.findMany({ + data.all = await _db.page.findMany({ where: { id_site: p.site.id, is_deleted: false, @@ -256,7 +256,7 @@ export const PageManager = () => { opt.dropTargetId === "ROOT" || opt.dropTargetId === "root"; if (!opt.dragSource?.droppable) { - await db.page.update({ + await _db.page.update({ where: { id: opt.dragSourceId as string, }, @@ -268,7 +268,7 @@ export const PageManager = () => { select: { id: true }, }); } else { - await db.page_folder.update({ + await _db.page_folder.update({ where: { id: opt.dragSourceId as string, }, @@ -364,7 +364,7 @@ export const PageManager = () => { local.loading = true; local.render(); - await db.page_folder.create({ + await _db.page_folder.create({ data: { id_site: firstPage.id_site, name: local.newFolder.name, @@ -386,7 +386,7 @@ export const PageManager = () => { node.text = local.newFolder.name; local.loading = true; local.render(); - await db.page_folder.update({ + await _db.page_folder.update({ data: { name: local.newFolder.name, }, @@ -502,14 +502,14 @@ export const PageManager = () => { if (confirm("Clone page ?")) { local.loading = true; local.render(); - const page = (await db.page.findFirst({ + const page = (await _db.page.findFirst({ where: { id: node.id as string }, })) as any; delete page.id; page.name = `${page.name} [Cloned]`; page.url = `${page.url}-cloned`; - await db.page.create({ + await _db.page.create({ data: page, }); @@ -542,7 +542,7 @@ export const PageManager = () => { local.init = false; delete data.folder[node.id]; local.render(); - db.page_folder.update({ + _db.page_folder.update({ where: { id: node.id as string }, data: { is_deleted: true, @@ -551,7 +551,7 @@ export const PageManager = () => { } else { local.loading = true; local.render(); - await db.page.update({ + await _db.page.update({ where: { id: node.id as string }, data: { is_deleted: true, diff --git a/app/web/src/render/editor/panel/manager/site/site-form.tsx b/app/web/src/render/editor/panel/manager/site/site-form.tsx index 34d7e350..e10b5df0 100644 --- a/app/web/src/render/editor/panel/manager/site/site-form.tsx +++ b/app/web/src/render/editor/panel/manager/site/site-form.tsx @@ -58,7 +58,7 @@ export const SiteForm: FC<{ local.render(); if (!form.id) { try { - await db.site.create({ + await _db.site.create({ data: { name: form.name, favicon: "", @@ -72,7 +72,7 @@ export const SiteForm: FC<{ alert(e); } } else { - await db.site.update({ + await _db.site.update({ data: { name: form.name, domain: form.domain, @@ -156,7 +156,7 @@ export const SiteForm: FC<{ "Please type 'yes' (without quote) to confirm deletion: " )?.toLowerCase() === "yes" ) { - await db.site.update({ + await _db.site.update({ where: { id: site.id, }, diff --git a/app/web/src/render/editor/panel/manager/site/site-mgr.tsx b/app/web/src/render/editor/panel/manager/site/site-mgr.tsx index 4ad35cb6..b26755df 100644 --- a/app/web/src/render/editor/panel/manager/site/site-mgr.tsx +++ b/app/web/src/render/editor/panel/manager/site/site-mgr.tsx @@ -22,7 +22,7 @@ export const SiteManager = () => { }); const reloadSites = async () => { - const orgs = await db.org_user.findMany({ + const orgs = await _db.org_user.findMany({ where: { id_user: p.session.data.user.id, }, @@ -44,7 +44,7 @@ export const SiteManager = () => { for (const org of orgs) { local.orgs[org.org.id] = org.org; } - const sites = await db.site.findMany({ + const sites = await _db.site.findMany({ where: { id_org: { in: Object.keys(local.orgs), diff --git a/app/web/src/render/editor/panel/toolbar/center/NPMImport.tsx b/app/web/src/render/editor/panel/toolbar/center/NPMImport.tsx index e4b39e7c..2e0d9a94 100644 --- a/app/web/src/render/editor/panel/toolbar/center/NPMImport.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/NPMImport.tsx @@ -47,7 +47,7 @@ export const NPMImport = () => { if (!w.npmImport.init) { w.npmImport.init = true; w.npmImport.loading = Promise.all([ - db.npm_site + _db.npm_site .findMany({ where: { id_site: p.site.id, @@ -56,7 +56,7 @@ export const NPMImport = () => { .then((e) => { w.npmImport.site = e; }), - db.npm_page + _db.npm_page .findMany({ where: { id_page: p.page.id, @@ -92,7 +92,7 @@ export const NPMImport = () => { ); const j = await f.json(); const version = j.versions[0].version; - const res = await db.npm_site.create({ + const res = await _db.npm_site.create({ data: { id_site: p.site?.id || "", module: e.name, @@ -113,7 +113,7 @@ export const NPMImport = () => { mode="page" onChange={async (e) => { if (p.page) { - const res = await db.npm_page.create({ + const res = await _db.npm_page.create({ data: { id_page: p.page.id || "", module: e.name, @@ -148,7 +148,7 @@ const NPMModule: FC<{ if (!p.page) return <>; useEffect(() => { if (p.page) - api + _api .npm_size(mode, mode === "site" ? p.site.id || "" : p.page.id) .then((e: string) => { local.size = parseInt(e) || 0; @@ -168,7 +168,7 @@ const NPMModule: FC<{ list = w.npmImport.page[p.page.id]; } else { local.loading = true; - db.npm_page + _db.npm_page .findMany({ where: { id_page: p.page.id, @@ -243,7 +243,7 @@ const NPMModule: FC<{ local.bundling = true; local.bundleError = ""; local.render(); - const res = (await api.npm_bundle( + const res = (await _api.npm_bundle( mode, mode === "site" ? p.site.id || "" : p.page ? p.page.id : "" )) as any; @@ -377,7 +377,7 @@ const NPMModule: FC<{ ); const j = await f.json(); const version = j.versions[0].version; - const res = await db.npm_site.create({ + const res = await _db.npm_site.create({ data: { id_site: p.site?.id || "", module: val, @@ -406,7 +406,7 @@ const NPMModule: FC<{ mode={mode} remove={async (e) => { if (mode === "site") { - await db.npm_site.delete({ + await _db.npm_site.delete({ where: { id: BigInt(e.id) }, }); w.npmImport.site = w.npmImport.site.filter( @@ -414,7 +414,7 @@ const NPMModule: FC<{ ); } else { if (p.page) { - await db.npm_page.delete({ + await _db.npm_page.delete({ where: { id: BigInt(e.id) }, }); @@ -610,14 +610,14 @@ const MainImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, @@ -695,14 +695,14 @@ const CustomImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, @@ -776,14 +776,14 @@ const NamedImport: FC<{ useEffect(() => { if (!local.open) { if (mode === "site") { - db.npm_site.update({ + _db.npm_site.update({ where: { id: item.id }, data: { import_as, }, }); } else { - db.npm_page.update({ + _db.npm_page.update({ where: { id: item.id }, data: { import_as, diff --git a/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx b/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx index 854da2a9..c8a5bb38 100644 --- a/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx @@ -157,7 +157,7 @@ export const ToolbarCenter = () => { (!p.site.api_prasi || (p.site.api_prasi && !p.site.api_prasi.port)) ) { - await db.site.update({ + await _db.site.update({ data: { config: { api_url: p.site.api_url, diff --git a/app/web/src/render/editor/panel/toolbar/center/api/External.tsx b/app/web/src/render/editor/panel/toolbar/center/api/External.tsx index 633ee1a6..7a43c713 100644 --- a/app/web/src/render/editor/panel/toolbar/center/api/External.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/api/External.tsx @@ -48,7 +48,7 @@ export const ExternalAPI = ({ } }} onBlur={async () => { - await db.site.update({ + await _db.site.update({ where: { id: p.site.id }, data: { config: { diff --git a/app/web/src/render/editor/panel/toolbar/center/api/Internal.tsx b/app/web/src/render/editor/panel/toolbar/center/api/Internal.tsx index 18cd3108..73113840 100644 --- a/app/web/src/render/editor/panel/toolbar/center/api/Internal.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/api/Internal.tsx @@ -21,7 +21,7 @@ export const InternalAPI: FC<{ const reloadStatus = () => { if (p.site) { - const s = api.srvapi_check.bind({ apiUrl: "https://api.prasi.app" }); + const s = _api.srvapi_check.bind({ apiUrl: "https://api.prasi.app" }); s(p.site.id).then((e: any) => { local.status = e; checkApi(e === "started"); @@ -83,7 +83,7 @@ export const InternalAPI: FC<{ className="border border-slate-500 hover:bg-red-100 hover:border-red-500 px-2 rounded cursor-pointer" onClick={async () => { if (p.site) { - const s = api.srvapi_op.bind({ + const s = _api.srvapi_op.bind({ apiUrl: "https://api.prasi.app", }); @@ -99,7 +99,7 @@ export const InternalAPI: FC<{ className="border border-slate-500 hover:bg-purple-100 hover:border-purple-500 px-2 rounded cursor-pointer" onClick={async () => { if (p.site) { - const s = api.srvapi_op.bind({ + const s = _api.srvapi_op.bind({ apiUrl: "https://api.prasi.app", }); @@ -124,7 +124,7 @@ export const InternalAPI: FC<{ className="border border-slate-500 hover:bg-green-100 hover:border-green-500 px-2 rounded cursor-pointer" onClick={async () => { if (p.site) { - const s = api.srvapi_op.bind({ + const s = _api.srvapi_op.bind({ apiUrl: "https://api.prasi.app", }); @@ -164,7 +164,7 @@ export const InternalAPI: FC<{ w.prasiApiDbPull = true; local.render(); - await api.srvapi_dbpull( + await _api.srvapi_dbpull( p.site.id, p.site.api_prasi.db || "" ); @@ -205,7 +205,7 @@ export const InternalAPI: FC<{ if (confirm("Are you sure ?")) { local.loading = true; local.render(); - await api.srvapi_destroy(p.site.id); + await _api.srvapi_destroy(p.site.id); p.site.api_url = ""; p.site.api_prasi.db = ""; p.site.api_prasi.port = ""; diff --git a/app/web/src/render/editor/panel/toolbar/center/mobile/config.tsx b/app/web/src/render/editor/panel/toolbar/center/mobile/config.tsx index cde0cc30..ded25252 100644 --- a/app/web/src/render/editor/panel/toolbar/center/mobile/config.tsx +++ b/app/web/src/render/editor/panel/toolbar/center/mobile/config.tsx @@ -27,7 +27,7 @@ export const ExportMobileSetting: FC<{ }> = () => { const p = useGlobal(EditorGlobal, "EDITOR"); const local = useLocal({}, async () => { - setting.config = await api.export_mobile(p.site.id, "config"); + setting.config = await _api.export_mobile(p.site.id, "config"); local.render(); }); @@ -48,7 +48,7 @@ export const ExportMobileSetting: FC<{ if (setting.config?.android && confirm("Remove Android?")) { setting.status = "building-android"; local.render(); - setting.config = await api.export_mobile( + setting.config = await _api.export_mobile( p.site.id, "remove-android" ); @@ -66,7 +66,7 @@ export const ExportMobileSetting: FC<{ onClick={async () => { setting.status = "building-android"; local.render(); - setting.config = await api.export_mobile( + setting.config = await _api.export_mobile( p.site.id, "build-android" ); @@ -90,7 +90,7 @@ export const ExportMobileSetting: FC<{ if (setting.config?.ios && confirm("Remove IOS?")) { setting.status = "building-ios"; local.render(); - setting.config = await api.export_mobile( + setting.config = await _api.export_mobile( p.site.id, "remove-ios" ); @@ -108,7 +108,7 @@ export const ExportMobileSetting: FC<{ onClick={async () => { setting.status = "building-ios"; local.render(); - setting.config = await api.export_mobile( + setting.config = await _api.export_mobile( p.site.id, "build-ios" ); @@ -169,7 +169,7 @@ export const ExportMobileSetting: FC<{ onClick={async () => { setting.status = "saving"; local.render(); - await api.export_mobile( + await _api.export_mobile( p.site.id, "set-config", setting.config @@ -178,13 +178,13 @@ export const ExportMobileSetting: FC<{ if (setting.config?.android) { setting.status = "building-android"; local.render(); - await api.export_mobile(p.site.id, "build-android"); + await _api.export_mobile(p.site.id, "build-android"); } if (setting.config?.ios) { setting.status = "building-ios"; local.render(); - await api.export_mobile(p.site.id, "build-ios"); + await _api.export_mobile(p.site.id, "build-ios"); } setting.status = "ready"; @@ -280,11 +280,11 @@ const Img = (opt: { type="file" onChange={async (e) => { if (e.currentTarget.files) { - const res = await api._upload(e.currentTarget.files[0]); + const res = await _api._upload(e.currentTarget.files[0]); (setting.config as any)[opt.name] = res; setting.status = "saving"; opt.render(); - await api.export_mobile( + await _api.export_mobile( opt.site_id, "set-config", setting.config diff --git a/app/web/src/render/editor/panel/toolbar/left/ToolbarLeft.tsx b/app/web/src/render/editor/panel/toolbar/left/ToolbarLeft.tsx index edcadd03..9f8deefb 100644 --- a/app/web/src/render/editor/panel/toolbar/left/ToolbarLeft.tsx +++ b/app/web/src/render/editor/panel/toolbar/left/ToolbarLeft.tsx @@ -21,7 +21,7 @@ export const ToolbarLeft = () => { { label: "Logout", onClick: () => { - api.logout().then(() => { + _api.logout().then(() => { location.href = "/login"; }); }, diff --git a/app/web/src/render/editor/panel/tree/item/right-click.tsx b/app/web/src/render/editor/panel/tree/item/right-click.tsx index 2dbc729c..fc4db89b 100644 --- a/app/web/src/render/editor/panel/tree/item/right-click.tsx +++ b/app/web/src/render/editor/panel/tree/item/right-click.tsx @@ -39,13 +39,13 @@ export const ETreeRightClick: FC<{ const isActiveComponent = rootComp && rootComp.id === item?.id && rootComp.id; if (local.compGroups.list && local.compGroups.list.length === 0) { - db.component_group + _db.component_group .findMany({ where: { component_site: { some: { id_site: p.site.id } } }, }) .then(async (comps) => { if (comps && comps.length === 0) { - const res = await db.component_group.create({ + const res = await _db.component_group.create({ data: { component_site: { create: { @@ -336,7 +336,7 @@ export const ETreeRightClick: FC<{ local.compGroups.choose = (group_id) => { p.compLoading[item.id] = true; p.render(); - api + _api .comp_create({ item_id: item.originalId || item.id, site_id: p.site.id || "", diff --git a/app/web/src/render/live/dev-loader.tsx b/app/web/src/render/live/dev-loader.tsx index 4c8a6e0c..18be26e3 100644 --- a/app/web/src/render/live/dev-loader.tsx +++ b/app/web/src/render/live/dev-loader.tsx @@ -6,7 +6,7 @@ const config = { serverurl: "" }; export const devLoader: Loader = { async site(p, where) { config.serverurl = serverurl; - const site = (await db.site.findFirst({ + const site = (await _db.site.findFirst({ where: where.type === "siteid" ? { id: where.id } : { domain: where.domain }, select: { @@ -24,7 +24,7 @@ export const devLoader: Loader = { return null; } - const cgroups = await db.site_use_comp.findMany({ + const cgroups = await _db.site_use_comp.findMany({ where: { id_site: site.id }, select: { use_id_site: true }, }); @@ -36,7 +36,7 @@ export const devLoader: Loader = { } } - const layout = await db.page.findFirst({ + const layout = await _db.page.findFirst({ where: { id_site: site.id, name: { startsWith: "layout:" }, @@ -83,7 +83,7 @@ export const devLoader: Loader = { } const loadPages = async () => { - return await db.page.findMany({ + return await _db.page.findMany({ where: { id_site: cache.site.id, is_deleted: false, diff --git a/app/web/src/utils/types/general.ts b/app/web/src/utils/types/general.ts index 4dd285ee..cb585ab5 100644 --- a/app/web/src/utils/types/general.ts +++ b/app/web/src/utils/types/general.ts @@ -36,8 +36,8 @@ export const w = window as unknown as { ts: number; serverurl: string; apiurl: string; - api: any; - db: any; + _api: any; + _db: any; offline: boolean; debug: { on: any; diff --git a/pkgs/core/api/_dbs.ts b/pkgs/core/api/_dbs.ts index 54841e74..e85788a9 100644 --- a/pkgs/core/api/_dbs.ts +++ b/pkgs/core/api/_dbs.ts @@ -1,5 +1,6 @@ +import { g } from "utils/global"; import { apiContext } from "../server/api/api-ctx"; -import { DBArg, execQuery } from "../utils/query"; +import { execQuery } from "../utils/query"; export const _ = { url: "/_dbs/:action", @@ -7,7 +8,7 @@ export const _ = { const { req, res } = apiContext(this); try { - const result = await execQuery(req.params, db); + const result = await execQuery(req.params, g._db); res.send(result); } catch (e: any) { res.sendStatus(500); diff --git a/pkgs/core/api/_prasi.ts b/pkgs/core/api/_prasi.ts index 06a2cb29..c9c5f52f 100644 --- a/pkgs/core/api/_prasi.ts +++ b/pkgs/core/api/_prasi.ts @@ -84,7 +84,7 @@ export const _ = { export const getApiEntry = () => { const res: any = {}; - for (const [k, v] of Object.entries(g.api)) { + for (const [k, v] of Object.entries(g._api)) { const name = k.substring(0, k.length - 3).replace(/\W/gi, "_"); res[name] = { ...v, name, path: `app/srv/api/${v.path}` }; } diff --git a/pkgs/core/index.ts b/pkgs/core/index.ts index d6f98a15..b84b8048 100644 --- a/pkgs/core/index.ts +++ b/pkgs/core/index.ts @@ -27,7 +27,7 @@ if (!g.Y) { g.syncronize = (await import("y-pojo")).syncronize; await createLogger(); - g.api = {}; + g._api = {}; g.mode = process.argv.includes("dev") ? "dev" : "prod"; g.datadir = g.mode == "prod" ? "../data" : "data"; g.port = parseInt(process.env.PORT || "4550"); @@ -42,11 +42,11 @@ if (!g.Y) { snapshot.init(); } -const db = g.db; +const db = g._db; if (!db) { await preparePrisma(); await ensureNotRunning(); - const db = g.db; + const db = g._db; if (db) { db.$connect() .catch((e: any) => { diff --git a/pkgs/core/server/api/api-scan.ts b/pkgs/core/server/api/api-scan.ts index f4893d12..96df890b 100644 --- a/pkgs/core/server/api/api-scan.ts +++ b/pkgs/core/server/api/api-scan.ts @@ -21,7 +21,7 @@ export const prepareApiRoutes = async () => { fn: api._.api, path: importPath.substring((root || path).length + 1), }; - g.api[filename] = route; + g._api[filename] = route; } catch (e) { g.log.warn( `Failed to import app/srv/api${importPath.substring( diff --git a/pkgs/core/server/api/prep-api-ts.ts b/pkgs/core/server/api/prep-api-ts.ts index 5996c188..7986ddfe 100644 --- a/pkgs/core/server/api/prep-api-ts.ts +++ b/pkgs/core/server/api/prep-api-ts.ts @@ -5,7 +5,7 @@ import { g } from "../../utils/global"; export const prepareAPITypes = async () => { const out: string[] = []; - for (const [k, v] of Object.entries(g.api)) { + for (const [k, v] of Object.entries(g._api)) { const name = k.substring(0, k.length - 3).replace(/\W/gi, "_"); let p = { diff --git a/pkgs/core/server/serve-api.ts b/pkgs/core/server/serve-api.ts index b517e711..f139327c 100644 --- a/pkgs/core/server/serve-api.ts +++ b/pkgs/core/server/serve-api.ts @@ -10,7 +10,7 @@ export const CORS_HEADERS = { export const serveAPI = { init: async () => { g.router = createRouter({ strictTrailingSlash: false }); - for (const route of Object.values(g.api)) { + for (const route of Object.values(g._api)) { g.router.insert(route.url.replace(/\*/gi, "**"), route); } }, diff --git a/pkgs/core/utils/global.ts b/pkgs/core/utils/global.ts index c8b42116..53985f5c 100644 --- a/pkgs/core/utils/global.ts +++ b/pkgs/core/utils/global.ts @@ -15,12 +15,12 @@ type SingleRoute = { export const g = global as unknown as { status: "init" | "ready"; datadir: string; - db: PrismaClient; + _db: PrismaClient; dburl: string; mode: "dev" | "prod"; server: Server; log: Logger; - api: Record; + _api: Record; domains: null | Record; router: RadixRouter; port: number; diff --git a/pkgs/core/utils/prisma.ts b/pkgs/core/utils/prisma.ts index 0da6327a..7060f835 100644 --- a/pkgs/core/utils/prisma.ts +++ b/pkgs/core/utils/prisma.ts @@ -15,7 +15,7 @@ export const preparePrisma = async () => { } const { PrismaClient } = await import("../../../app/db/db"); - g.db = new PrismaClient(); + g._db = new PrismaClient(); } g.dburl = process.env.DATABASE_URL || ""; diff --git a/pkgs/web-utils/src/global.ts b/pkgs/web-utils/src/global.ts index 7a17483e..8c31fad1 100644 --- a/pkgs/web-utils/src/global.ts +++ b/pkgs/web-utils/src/global.ts @@ -6,8 +6,8 @@ declare global { const params: any; const css: typeof goober.css; const cx: (...arg: any[]) => string; - const api: any; - const db: PrismaClient; + const _api: any; + const _db: PrismaClient; const prasiContext: any; const serverurl: string; }