From 0442f3d5e9437dcf077e3dacc28e275784006cd0 Mon Sep 17 00:00:00 2001
From: omuretsu <84951833+Snarling@users.noreply.github.com>
Date: Tue, 7 Mar 2023 06:33:24 -0500
Subject: [PATCH] Rework roughlyIs internal function

Now named missingKey, is much faster (approx 4x faster based on testing), and provides better error info when it fails (which property was missing from the provided object).
---
 src/Netscript/NetscriptHelpers.ts | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 836f9e789..452d57fd0 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -551,7 +551,8 @@ function person(ctx: NetscriptContext, p: unknown): IPerson {
     mults: undefined,
     city: undefined,
   };
-  if (!roughlyIs(fakePerson, p)) throw makeRuntimeErrorMsg(ctx, `person should be a Person.`, "TYPE");
+  const error = missingKey(fakePerson, p);
+  if (error) throw makeRuntimeErrorMsg(ctx, `person should be a Person.\n${error}`, "TYPE");
   return p as IPerson;
 }
 
@@ -582,36 +583,36 @@ function server(ctx: NetscriptContext, s: unknown): Server {
     requiredHackingSkill: undefined,
     serverGrowth: undefined,
   };
-  if (!roughlyIs(fakeServer, s)) throw makeRuntimeErrorMsg(ctx, `server should be a Server.`, "TYPE");
+  const error = missingKey(fakeServer, s);
+  if (error) throw makeRuntimeErrorMsg(ctx, `server should be a hackable Server.\n${error}`, "TYPE");
   return s as Server;
 }
 
-function roughlyIs(expect: object, actual: unknown): boolean {
-  if (typeof actual !== "object" || actual == null) return false;
-
-  const expects = Object.keys(expect);
-  const actuals = Object.keys(actual);
-  for (const expect of expects)
-    if (!actuals.includes(expect)) {
-      return false;
-    }
-  return true;
+function missingKey(expect: object, actual: unknown): string | false {
+  if (typeof actual !== "object" || actual === null) {
+    return `Expected to be an object, was ${actual === null ? "null" : typeof actual}.`;
+  }
+  for (const key in expect) {
+    if (!(key in actual)) return `Property ${key} was expected but not present.`;
+  }
+  return false;
 }
 
 function gang(ctx: NetscriptContext, g: unknown): FormulaGang {
-  if (!roughlyIs({ respect: 0, territory: 0, wantedLevel: 0 }, g))
-    throw makeRuntimeErrorMsg(ctx, `gang should be a Gang.`, "TYPE");
+  const error = missingKey({ respect: 0, territory: 0, wantedLevel: 0 }, g);
+  if (error) throw makeRuntimeErrorMsg(ctx, `gang should be a Gang.\n${error}`, "TYPE");
   return g as FormulaGang;
 }
 
 function gangMember(ctx: NetscriptContext, m: unknown): GangMember {
-  if (!roughlyIs(new GangMember(), m)) throw makeRuntimeErrorMsg(ctx, `member should be a GangMember.`, "TYPE");
+  const error = missingKey(new GangMember(), m);
+  if (error) throw makeRuntimeErrorMsg(ctx, `member should be a GangMember.\n${error}`, "TYPE");
   return m as GangMember;
 }
 
 function gangTask(ctx: NetscriptContext, t: unknown): GangMemberTask {
-  if (!roughlyIs(new GangMemberTask("", "", false, false, { hackWeight: 100 }), t))
-    throw makeRuntimeErrorMsg(ctx, `task should be a GangMemberTask.`, "TYPE");
+  const error = missingKey(new GangMemberTask("", "", false, false, { hackWeight: 100 }), t);
+  if (error) throw makeRuntimeErrorMsg(ctx, `task should be a GangMemberTask.\n${error}`, "TYPE");
   return t as GangMemberTask;
 }