querysub 0.159.0 → 0.161.0

package/package.json

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

@@ -313,6 +313,11 @@ async function getModuleFromSpecBase(
                 }
                 // NOTE: The true tells require to not warn about the async loading
                 await (require as any)(path, true);
+
+                // Unfortunately... we have to wait for some delayed imports to finish.
+                //  This isn't great, but it is important to set LazyComponent imports
+                //  with the correct git hash.
+                await delay(0);
             });
         });
     } catch (e: any) {

package/src/4-deploy/deployMain.ts

@@ -15,7 +15,7 @@ import yargs from "yargs";
 import { isPublic } from "../config";
 import { deployBlock } from "./deployBlock";
 import { LOCAL_DOMAIN } from "../0-path-value-core/PathController";
-import { magenta } from "socket-function/src/formatting/logColors";
+import { blue, magenta, red } from "socket-function/src/formatting/logColors";
 import { getGitRef } from "./git";
 import { getGitURL } from "./git";
 import { setLiveDeployedHash } from "./deploySchema";
@@ -31,6 +31,7 @@ let yargObj = yargs(process.argv)
     .option("deployonlycode", { type: "boolean", desc: "Only deploy code, not ui" })
     .option("deployonlyui", { type: "boolean", desc: "Only deploy ui, not code" })
     .option("notifyrefreshdelay", { type: "number", default: timeInHour * 12, desc: "The time clients have to refresh their UI after a deploy." })
+    .option("dryrun", { type: "boolean", desc: "Dry run, don't actually deploy" })
     .argv
     ;
 
@@ -52,6 +53,9 @@ export async function deployMain() {
     const deployPath = path.resolve("./deploy.ts");
     require(deployPath);
 
+    // Wait for Promise.resolve imports to import
+    await delay(0);
+
     const srcRoot = path.resolve(__dirname + "/../").replaceAll("\\", "/");
 
     let currentFunctions: FunctionSpec[] = [];
@@ -118,6 +122,13 @@ export async function deployMain() {
             });
         }
     }
+    for (let fnc of currentFunctions) {
+        console.log(blue(`${fnc.DomainName}.${fnc.ModuleId}.${fnc.FunctionId}`));
+    }
+    if (yargObj.dryrun) {
+        console.log(red("Dry run, not actually deploying"));
+        return;
+    }
 
     console.log();
     console.log();

package/src/diagnostics/NodeViewer.tsx

@@ -169,15 +169,12 @@ export class NodeViewer extends qreact.Component {
 
         let tables: { [key: string]: NodeData[] } = {};
         tables["PathValueServer"] = [];
-        tables["querysub-function"] = [];
         tables["Querysub"] = [];
         for (let datum of nodeDatas) {
             if (datum.live_authorityPaths?.length) {
                 tables["PathValueServer"].push(datum);
             } else if (datum.live_exposedControllers?.includes("QuerysubController-6db5ef05-7563-4473-a440-2f64f03fe6ef")) {
                 tables["Querysub"].push(datum);
-            } else if (datum.live_entryPoint?.endsWith("function.js")) {
-                tables["querysub-function"].push(datum);
             } else {
                 let entryName = datum.live_entryPoint?.replaceAll("\\", "/").split("/").pop() || "Unknown";
                 tables[entryName] = tables[entryName] || [];