Merge pull request #5380 from systeminit/clover/fix-sub-sub-assets

fix(clover): Build sub sub assets
systeminit · Jan 29, 2025 · 2d886ea · 2d886ea
2 parents 2eb1f88 + 6e59c3f
commit 2d886ea
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/bin/clover/src/cfDb.ts b/bin/clover/src/cfDb.ts
@@ -272,9 +272,9 @@ export async function loadCfDatabase(
       const typeName: string = data.typeName;
 
       if (
-        false &&
+        // false &&
         ![
-          "AWS::QBusiness::DataSource",
+          "AWS::ECS::TaskDefinition",
         ].includes(typeName)
       ) continue;
 

diff --git a/bin/clover/src/pipeline-steps/createInputSocketsAcrossAssets.ts b/bin/clover/src/pipeline-steps/createInputSocketsAcrossAssets.ts
@@ -64,9 +64,15 @@ export function createInputSocketsBasedOnOutputSockets(
 
     for (const prop of domain.entries) {
       if (foundOutputSockets.has(prop.name)) {
-        schemaVariant.sockets.push(
-          createInputSocketFromProp(prop as ExpandedPropSpec),
-        );
+        let found = false;
+        for (const socket of schemaVariant.sockets) {
+          if (socket.name == prop.name) found = true;
+        }
+        if (!found) {
+          schemaVariant.sockets.push(
+            createInputSocketFromProp(prop as ExpandedPropSpec),
+          );
+        }
       }
     }
 

diff --git a/bin/clover/src/pipeline-steps/generateSubAssets.ts b/bin/clover/src/pipeline-steps/generateSubAssets.ts
@@ -56,9 +56,7 @@ export function generateSubAssets(incomingSpecs: PkgSpec[]): PkgSpec[] {
 
     for (const prop of domain.entries) {
       if (prop.kind === "array" && prop.typeProp.kind === "object") {
-        const objName = prop.name.endsWith("s")
-          ? prop.name.slice(0, -1)
-          : prop.name;
+        const objName = prop.name;
 
         logger.debug(`Generating subasset ${objName} for ${spec.name}`);
 
@@ -169,12 +167,13 @@ export function generateSubAssets(incomingSpecs: PkgSpec[]): PkgSpec[] {
     for (const name of names) {
       const nameTokens = name.split("::");
       // TODO check naming for sub sub assets
-      // if (nameTokens.length !== 4) {
-      //   throw new Error(`Could not parse subAsset name: ${name}`);
-      // }
+      if (nameTokens.length < 4) {
+        throw new Error(`Could not parse subAsset name: ${name}`);
+      }
 
-      const [_aws, awsCategory, parent, objName] = nameTokens;
-      finalObjName = objName;
+      const awsCategory = nameTokens[1];
+      const parent = nameTokens[nameTokens.length - 2];
+      finalObjName = nameTokens[nameTokens.length - 1];
 
       // For categories and parents, set to null if not all of them are the same
       if (finalAwsCategory === undefined) {

diff --git a/bin/clover/src/spec/sockets.ts b/bin/clover/src/spec/sockets.ts
@@ -15,7 +15,7 @@ export function createOutputSocketFromProp(
   const socket = createSocket(prop.name, "output", arity);
   if (socket.data) {
     socket.data.funcUniqueId = getSiFuncId("si:identity");
-    socket.inputs.push(attrFuncInputSpecFromProp(prop));
+    socket.inputs = [attrFuncInputSpecFromProp(prop)];
   }
   return socket;
 }
@@ -26,7 +26,7 @@ export function createInputSocketFromProp(
 ): SocketSpec {
   const socket = createSocket(prop.name, "input", arity);
   if (socket.data) {
-    prop.data.inputs?.push(attrFuncInputSpecFromSocket(socket));
+    prop.data.inputs = [attrFuncInputSpecFromSocket(socket)];
     prop.data.funcUniqueId = getSiFuncId("si:identity");
   }
   return socket;