querysub 0.5.0 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "main": "index.js",
     "license": "MIT",
     "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/3-path-functions/pathFunctionLoader.ts

@@ -157,6 +157,13 @@ let moduleResolver = async (spec: FunctionSpec) => {
     return repoPath;
 };
 
+let key = "isInNestedImport-302fec38-0443-44f7-b31f-1f514900437f";
+function setInNestedImport(value: boolean) {
+    (globalThis as any)[key] = value;
+}
+export function isInNestedImport(): boolean {
+    return !!(globalThis as any)[key];
+}
 
 async function getModuleFromSpecBase(
     spec: FunctionSpec
@@ -185,6 +192,7 @@ async function getModuleFromSpecBase(
     }
     console.log(blue(`require(${JSON.stringify(path)})`));
     try {
+        setInNestedImport(true);
         await SocketFunction.ignoreExposeCalls(async () => {
             // Import deploy, which should always exist, and provides a consistent
             //  import order, fixing a lot of cyclic / module level code logic issues.
@@ -195,8 +203,9 @@ async function getModuleFromSpecBase(
             await (require as any)(path, true);
         });
     } catch (e: any) {
-
         throw new Error(`Error when loading function for ${JSON.stringify(path)}:${spec.FunctionId}\n${e.stack}`);
+    } finally {
+        setInNestedImport(false);
     }
     let moduleId = require.resolve(path) || path;
     let module = require.cache[moduleId];

package/src/5-diagnostics/qreactDebug.tsx

@@ -16,6 +16,7 @@ import { PathValueProxyWatcher } from "../2-proxy/PathValueProxyWatcher";
 import { InputLabel, InputLabelURL } from "../library-components/InputLabel";
 import { URLParam } from "../library-components/URLParam";
 import { hotReloadingGuard, isHotReloading, onHotReload } from "socket-function/hot/HotReloadController";
+import { isInNestedImport } from "../3-path-functions/pathFunctionLoader";
 
 // Map, so hot reloading doesn't break things
 let componentButtons = new Map<string, { title: string, callback: (component: ExternalRenderClass) => void }>();
@@ -24,6 +25,7 @@ export function addComponentButton(config: {
     title: string;
     callback: (component: ExternalRenderClass) => void;
 }) {
+    if (isInNestedImport()) return;
     if (!isHotReloading() && componentButtons.has(config.title)) {
         throw new Error(`Component button with title ${config.title} already exists`);
     }