querysub 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.7.0",
+    "version": "0.8.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

@@ -158,10 +158,29 @@ let moduleResolver = async (spec: FunctionSpec) => {
 };
 
 export function isDynamicModule(module: NodeJS.Module): boolean {
-    // Mostly a hack, but... it SHOULD be fine
-    let parts = module.filename.replaceAll("\\", "/").split("/");
+    return isDynamicModulePath(module.filename);
+}
+export function isDynamicModulePath(path: string): boolean {
+    let parts = path.replaceAll("\\", "/").split("/");
     return parts.includes("node_modules") || parts.includes("synced_repos");
 }
+/** Annoying, and slower than isDynamicModule, but... necessary. We can't expect the user to call isDynamicModule,
+ *      and our functions will all resolve to the root on purpose, so... we need to check the callstack!
+ */
+export function isCallerDynamicModule(): boolean {
+    return getCallstackFiles().some(isDynamicModulePath);
+}
+function getCallstackFiles(): string[] {
+    let stack = new Error().stack;
+    if (!stack) return [];
+    let lines = stack.split("\n");
+    let files = lines.map(line => {
+        let match = line.match(/\(([^)]+)\)/);
+        if (!match) return "";
+        return match[1];
+    });
+    return files;
+}
 
 async function getModuleFromSpecBase(
     spec: FunctionSpec

package/src/5-diagnostics/qreactDebug.tsx

@@ -16,7 +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 { isDynamicModule } from "../3-path-functions/pathFunctionLoader";
+import { isCallerDynamicModule, isDynamicModule } from "../3-path-functions/pathFunctionLoader";
 
 // Map, so hot reloading doesn't break things
 let componentButtons = new Map<string, { title: string, callback: (component: ExternalRenderClass) => void }>();
@@ -25,7 +25,7 @@ export function addComponentButton(config: {
     title: string;
     callback: (component: ExternalRenderClass) => void;
 }) {
-    if (isDynamicModule(module)) return;
+    if (isCallerDynamicModule(module)) return;
     if (!isHotReloading() && componentButtons.has(config.title)) {
         throw new Error(`Component button with title ${config.title} already exists`);
     }