@hubspot/project-parsing-lib 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/project-parsing-lib",
-    "version": "0.8.3",
+    "version": "0.8.4",
     "description": "Parsing library for converting projects directory structures to their intermediate representation",
     "license": "Apache-2.0",
     "main": "src/index.js",

package/src/lang/copy.js

@@ -16,7 +16,7 @@ exports.errorMessages = {
         accountIdIsRequiredToFetchSchemas: 'Account id is required to fetch schemas',
     },
     project: {
-        mustHaveAppComponent: (componentType) => `No *-hsmeta.json files were found with type '${constants_1.AppKey}'. You must have an '${constants_1.AppKey}' to associate '${componentType}'`,
+        mustHaveAppComponent: (componentType) => `This '${componentType}' component must be a child of the '${constants_1.AppKey}' component. No *-hsmeta.json files were found with type '${constants_1.AppKey}'`,
         noHsMetaFiles: 'No *-hsmeta.json files found in the current directory. Please make sure you are inside the correct project directory.',
         failedToTranslateProject: 'Project validation failed',
         duplicateUid: (uid, files) => `Duplicate uid '${uid}' found in:\n- ${files.join('\n- ')}`,

package/src/lib/transform.js

@@ -31,7 +31,10 @@ function calculateComponentDeps(fileValidationResult, parentComponents, appObjec
         }
         else {
             logger_1.logger.debug(parentComponents);
-            throw new Error(copy_1.errorMessages.project.mustHaveAppComponent(type));
+            return {
+                dependencies,
+                errors: [copy_1.errorMessages.project.mustHaveAppComponent(type)],
+            };
         }
         if (type !== constants_1.AppObjectKey) {
             dependencies.allAppObjects = appObjects;
@@ -40,7 +43,7 @@ function calculateComponentDeps(fileValidationResult, parentComponents, appObjec
             dependencies.serverlessPackage = appFunctionsPackageUid;
         }
     }
-    return dependencies;
+    return { dependencies };
 }
 function mapToInternalType(type) {
     const resolvedType = constants_1.userFacingToInternalType[type] || type || '';
@@ -91,19 +94,25 @@ function transform(fileParseResults, translationContext, hsProfileContents) {
     }
     const transformations = fileParseResults.map((currentFile) => {
         if (!currentFile.content) {
-            currentFile.errors?.push(copy_1.errorMessages.project.fileContentMissingFor(currentFile.file));
+            if (!currentFile.errors?.includes(copy_1.errorMessages.validation.invalidJson)) {
+                currentFile.errors?.push(copy_1.errorMessages.project.fileContentMissingFor(currentFile.file));
+            }
             return {
                 intermediateRepresentation: null,
                 fileParseResult: currentFile,
             };
         }
         const { config, uid, type } = currentFile.content;
+        const { dependencies, errors } = calculateComponentDeps(currentFile, parentComponents, allAppObjects, serverlessPackageUid);
+        if (errors) {
+            currentFile.errors?.push(...errors);
+        }
         return {
             intermediateRepresentation: {
                 uid,
                 config,
                 componentType: mapToInternalType(type),
-                componentDeps: calculateComponentDeps(currentFile, parentComponents, allAppObjects, serverlessPackageUid),
+                componentDeps: dependencies,
                 metaFilePath: currentFile.file,
                 files: {},
             },

package/src/lib/validation.js

@@ -96,6 +96,7 @@ function validateIntermediateRepresentationNode(schema, transformation, irNode,
     };
 }
 async function validateIntermediateRepresentation(intermediateRepresentation, transformation, translationContext) {
+    const hasAnyFileParseErrors = transformation.some(t => t.fileParseResult.errors.length > 0);
     const schema = await (0, schemas_1.getIntermediateRepresentationSchema)(translationContext);
     const potentialDuplicatesByComponent = {};
     const results = Object.values(intermediateRepresentation.intermediateNodesIndexedByUid).map((irNode, index) => {
@@ -120,7 +121,9 @@ async function validateIntermediateRepresentation(intermediateRepresentation, tr
                 ?.fileParseResult.errors.push(copy_1.errorMessages.project.duplicateComponent(componentType));
         });
     });
-    const valid = !hasDuplicates && results.every(result => result.valid);
+    const valid = !hasAnyFileParseErrors &&
+        !hasDuplicates &&
+        results.every(result => result.valid);
     if (valid) {
         return {
             valid,