then should be called explicitly

neurospeech · Aug 23, 2024 · 7786a8f · 7786a8f
1 parent 07fdbab
commit 7786a8f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/src/ci/certs/ParsePkcs12.ts b/src/ci/certs/ParsePkcs12.ts
@@ -14,6 +14,5 @@ export async function ParsePkcs12 ({
     const p12 = forge.pkcs12.pkcs12FromAsn1(p12Asn1, certPass);
     const bag = p12.safeContents.find((x) => x.encrypted).safeBags[0].attributes;
     const friendlyName = bag.friendlyName[0];
-
-    return { friendlyName, p12 };
+    await then?.({ friendlyName, p12 });
 }
diff --git a/src/ci/mac/Security.tsx b/src/ci/mac/Security.tsx
@@ -55,11 +55,6 @@ export const Security = {
         then = void 0 as ({ friendlyName, p12 } ) => any
     }) {
         return <Batch>
-            <ParsePkcs12
-                certPath={certPath}
-                certPass={certPass}
-                then={then}
-                />
             <Run
                 cmd="security"
                 args={["import", certPath,
@@ -87,6 +82,11 @@ export const Security = {
                     "-s", keychainPath
                 ]}
                 />
+            <ParsePkcs12
+                certPath={certPath}
+                certPass={certPass}
+                then={then}
+                />
         </Batch>
     }
 

diff --git a/src/core/XNode.ts b/src/core/XNode.ts
@@ -22,7 +22,7 @@ export default class XNode {
 
     async execute() {
         const a = this.attributes ?? {};
-        const { then, failed, throwOnFail = true} = a;
+        const { failed, throwOnFail = true} = a;
         let result;
         if (this.log) {
             console.log(`Executing ${this.name.name} at ${this.attributes?.location}`);
@@ -32,11 +32,10 @@ export default class XNode {
         }
         try {
             result = await this.___invoke(a);
-            await then?.(result);
         } catch (error) {
             failed?.(error);
             if (throwOnFail) {
-                throw new (Error as any)(`Failed on ${this.attributes?.location}`, { cause: error });
+                throw new (Error as any)(`Failed ${this.name.name} on ${this.attributes?.location}`, { cause: error });
             }
         }
         return result;
@@ -46,7 +45,6 @@ export default class XNode {
         const result = this.name(a, ... this.children);
         if (result?.[isXNode]) {
             const ra = (result.attributes ??= {});
-            ra.then ??= a.then;
             ra.failed ??= a.failed;
             ra.throwOnFail ??= a.throwOnFail;
             result.log = this.log;

diff --git a/src/utils/FileSystem.ts b/src/utils/FileSystem.ts
@@ -36,11 +36,12 @@ export const FileSystem = {
     },
 
     async ReadJson({
-        path        
+        path,
+        then
     }: ThenTaskArgs<IFileArg>) {
         path = FileSystem.expand(path);
         const text = await readFile(path, "utf8");
-        return JSON.parse(text);
+        await then?.(JSON.parse(text));
     },
 
     async WriteJson({
@@ -54,7 +55,8 @@ export const FileSystem = {
 
     async MergeJson({
         path,
-        json     
+        json,
+        then
     }: TaskArgs<{ path: string; json: any; }>) {
         path = FileSystem.expand(path);
         let existing = {};
@@ -68,7 +70,7 @@ export const FileSystem = {
             existing = mergeJson(existing, json);
         }
         await writeFile(path, JSON.stringify(existing, void 0, 2));
-        return existing;
+        await then?.(existing);
     }
 
 };