@hubspot/project-parsing-lib 0.13.0-beta.0 → 0.13.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/project-parsing-lib",
-    "version": "0.13.0-beta.0",
+    "version": "0.13.0-beta.2",
     "description": "Parsing library for converting projects directory structures to their intermediate representation",
     "license": "Apache-2.0",
     "type": "module",

package/src/lib/migrate.d.ts

@@ -1 +1,2 @@
+export declare const OUTPUT_IR_FILE = "FULL_IR.json";
 export declare function migrate(inputDir: string, outputDir: string): Promise<void>;

package/src/lib/migrate.js

@@ -2,12 +2,12 @@ import { walk } from '@hubspot/local-dev-lib/fs';
 import path from 'path';
 import fs from 'fs';
 import { mapToUserFacingType } from './transform.js';
-import { METAFILE_EXTENSION, Components, HS_PROJECT_JSON_FILENAME, } from './constants.js';
+import { METAFILE_EXTENSION, Components, HS_PROJECT_JSON_FILENAME, APP_FUNCTIONS_PACKAGE_KEY, APP_FUNCTIONS_KEY, } from './constants.js';
 import { translate } from './translate.js';
 import { loadJsonFile } from './utils.js';
 const IR_FILENAME = 'ir.json';
 const filesDirectory = 'files';
-const OUTPUT_IR_FILE = 'FULL_IR.json';
+export const OUTPUT_IR_FILE = 'FULL_IR.json';
 export async function migrate(inputDir, outputDir) {
     if (!fs.existsSync(inputDir)) {
         throw new Error(`Input directory ${inputDir} does not exist`);
@@ -35,20 +35,25 @@ export async function migrate(inputDir, outputDir) {
         const irDirName = path.dirname(filename);
         const IR = loadJsonFile(filename);
         const { metaFilePath } = IR;
-        const projectConfig = convertIRToProjectConfig(IR);
-        const fullOutputPath = path.join(sourceCodeOutputDir, getTargetDirectoryFromComponentType(projectConfig.type));
+        const component = convertIRToProjectConfig(IR);
+        const fullOutputPath = path.join(sourceCodeOutputDir, getTargetDirectoryFromComponentType(component.type));
         // Ensure the output directory exists
         const currentFilesDirectory = path.join(irDirName, filesDirectory);
         ensureDirExists(currentFilesDirectory);
         fs.cpSync(currentFilesDirectory, fullOutputPath, {
             recursive: true,
         });
+        // In the current component is a APP_FUNCTIONS_PACKAGE we don't want to write a hsmeta.json file
+        // since it is an auto generate component
+        if (component.type === APP_FUNCTIONS_PACKAGE_KEY) {
+            return;
+        }
         // Use the metaFilePath if provided, otherwise use the project UID
         const hsmetaFilePath = path.join(fullOutputPath, metaFilePath
             ? path.basename(metaFilePath)
-            : `${projectConfig.uid}${METAFILE_EXTENSION}`);
+            : `${component.uid}${METAFILE_EXTENSION}`);
         // Write the hsmeta file to the output directory
-        fs.writeFileSync(hsmetaFilePath, JSON.stringify(projectConfig, null, 2));
+        fs.writeFileSync(hsmetaFilePath, JSON.stringify(component, null, 2));
     });
     const IR = await translate({
         projectSourceDir: sourceCodeOutputDir,
@@ -78,9 +83,12 @@ function convertIRToProjectConfig(IR) {
     };
 }
 function getTargetDirectoryFromComponentType(componentType) {
-    const component = Components[componentType];
+    let component = Components[componentType];
+    if (componentType === APP_FUNCTIONS_PACKAGE_KEY) {
+        component = Components[APP_FUNCTIONS_KEY];
+    }
     if (!component) {
-        throw Error('Unsupported component type');
+        throw Error(`Unsupported component type: "${componentType}"`);
     }
     const parentDirectory = component.parentComponent
         ? Components[component.parentComponent].dir

package/src/lib/transform.js

@@ -2,11 +2,11 @@ import path from 'path';
 import fs from 'fs';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { applyHsProfileVariables, getHsProfileVariables } from './profiles.js';
-import { APP_KEY, APP_OBJECT_KEY, CARDS_KEY, Components, PROJECT_STRUCTURE, APP_FUNCTIONS_KEY, APP_FUNCTIONS_PACKAGE_KEY, USER_FACING_TO_INTERNAL_TYPE, INTERNAL_TYPE_TO_USER_FACING, PACKAGE_JSON, PACKAGE_LOCK_JSON, PROFILE_VARIABLE_TYPES, } from './constants.js';
+import { APP_KEY, APP_OBJECT_KEY, Components, PROJECT_STRUCTURE, APP_FUNCTIONS_KEY, APP_FUNCTIONS_PACKAGE_KEY, USER_FACING_TO_INTERNAL_TYPE, INTERNAL_TYPE_TO_USER_FACING, PACKAGE_JSON, PACKAGE_LOCK_JSON, PROFILE_VARIABLE_TYPES, } from './constants.js';
 import { errorMessages } from '../lang/copy.js';
 import { getJavaNumberType } from './utils.js';
 import { convertPathToPosixPath } from './files.js';
-function calculateComponentDeps(fileValidationResult, parentComponents, appObjects, appFunctions, appFunctionsPackageUid) {
+function calculateComponentDeps(fileValidationResult, parentComponents, appObjects, appFunctionsPackageUid) {
     let dependencies = {};
     // If there are dependencies in the config file, pass them through
     if (!fileValidationResult.content?.dependencies) {
@@ -32,14 +32,6 @@ function calculateComponentDeps(fileValidationResult, parentComponents, appObjec
         if (type === APP_FUNCTIONS_KEY && appFunctionsPackageUid) {
             dependencies.serverlessPackage = appFunctionsPackageUid;
         }
-        if (type === CARDS_KEY) {
-            if (appFunctionsPackageUid) {
-                dependencies.serverlessPackage = appFunctionsPackageUid;
-            }
-            if (appFunctions.length > 0) {
-                dependencies.allAppFunctions = appFunctions;
-            }
-        }
     }
     return { dependencies };
 }
@@ -62,7 +54,6 @@ export function transform(fileParseResults, translationContext, hsProfileContent
     const parentTypes = Object.keys(PROJECT_STRUCTURE);
     const parentComponents = {};
     const allAppObjects = [];
-    const allAppFunctions = [];
     let appUid = '';
     let appFunctionsDirectory;
     // Apply the profile variable overrides to the config
@@ -82,7 +73,6 @@ export function transform(fileParseResults, translationContext, hsProfileContent
         }
         if (file.content?.type === APP_FUNCTIONS_KEY) {
             appFunctionsDirectory = path.dirname(file.file);
-            allAppFunctions.push(file.content.uid);
         }
     });
     const autoGeneratedComponents = [];
@@ -106,7 +96,7 @@ export function transform(fileParseResults, translationContext, hsProfileContent
             };
         }
         const { config, uid, type } = currentFile.content;
-        const { dependencies, errors } = calculateComponentDeps(currentFile, parentComponents, allAppObjects, allAppFunctions, serverlessPackageUid);
+        const { dependencies, errors } = calculateComponentDeps(currentFile, parentComponents, allAppObjects, serverlessPackageUid);
         if (errors) {
             currentFile.errors?.push(...errors);
         }