@hubspot/project-parsing-lib 0.1.6 → 0.1.7

package/package.json

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

package/src/lang/copy.d.ts

@@ -2,6 +2,7 @@ import { ComponentMetadata } from '../lib/constants';
 export declare const errorMessages: {
     api: {
         failedToFetchSchemas: string;
+        accountIdIsRequiredToFetchSchemas: string;
     };
     project: {
         noHsMetaFiles: string;

package/src/lang/copy.js

@@ -4,6 +4,7 @@ exports.logMessages = exports.errorMessages = void 0;
 exports.errorMessages = {
     api: {
         failedToFetchSchemas: 'Failed to fetch schemas',
+        accountIdIsRequiredToFetchSchemas: 'Account id is required to fetch schemas',
     },
     project: {
         noHsMetaFiles: 'No *-hsmeta.json files found in the current directory. Please make sure you are inside the correct project directory.',
@@ -16,7 +17,7 @@ exports.errorMessages = {
         missingRequiredField: (field) => `Missing required field: '${field}'`,
         missingUid: `Missing required field: 'uid'`,
         emptyUid: `'uid' must be at least one character long`,
-        invalidUid: `'uid' should be in lowercase, using only letters, numbers, and underscores. For example: app_id_123`,
+        invalidUid: `'uid' should use only letters, numbers, periods, hyphens, and underscores (for example: app-id_1.2.3)`,
         uidTooLong: `'uid' must be 64 characters or less`,
         missingType: `Missing required field: 'type'`,
         missingConfig: `Missing required field: 'config'`,

package/src/lib/migrate.js

@@ -9,9 +9,11 @@ const path_1 = __importDefault(require("path"));
 const fs_2 = __importDefault(require("fs"));
 const transform_1 = require("./transform");
 const constants_1 = require("./constants");
+const index_1 = require("../index");
 const IR_FILENAME = 'ir.json';
 const filesDirectory = 'files';
 const hsProjectJsonFilename = 'hsproject.json';
+const OUTPUT_IR_FILE = 'FULL_IR.json';
 async function migrate(inputDir, outputDir) {
     if (!fs_2.default.existsSync(inputDir)) {
         throw new Error(`Input directory ${inputDir} does not exist`);
@@ -20,9 +22,17 @@ async function migrate(inputDir, outputDir) {
     if (!fs_2.default.existsSync(hsProjectJsonPath)) {
         throw new Error(`hsproject.json file does not exist in ${inputDir}`);
     }
+    let hsProjectJson;
+    try {
+        hsProjectJson = loadJsonFile(hsProjectJsonPath);
+    }
+    catch (e) {
+        throw new Error(`Error parsing hsproject.json: ${e}`);
+    }
     const files = await (0, fs_1.walk)(inputDir);
+    const sourceCodeOutputDir = path_1.default.join(outputDir, 'src');
     // Create the output directory if it doesn't exist
-    ensureDirExists(outputDir);
+    ensureDirExists(sourceCodeOutputDir);
     files.forEach((filename) => {
         // Skip everything that's not an IR file
         if (!isIRFile(filename)) {
@@ -32,7 +42,7 @@ async function migrate(inputDir, outputDir) {
         const IR = loadJsonFile(filename);
         const { metaFilePath } = IR;
         const projectConfig = convertIRToProjectConfig(IR);
-        const fullOutputPath = path_1.default.join(outputDir, getTargetDirectoryFromComponentType(projectConfig.type));
+        const fullOutputPath = path_1.default.join(sourceCodeOutputDir, getTargetDirectoryFromComponentType(projectConfig.type));
         // Ensure the output directory exists
         const currentFilesDirectory = path_1.default.join(irDirName, filesDirectory);
         ensureDirExists(currentFilesDirectory);
@@ -46,6 +56,12 @@ async function migrate(inputDir, outputDir) {
         // Write the hsmeta file to the output directory
         fs_2.default.writeFileSync(hsmetaFilePath, JSON.stringify(projectConfig, null, 2));
     });
+    const IR = await (0, index_1.translate)({
+        projectSourceDir: sourceCodeOutputDir,
+        platformVersion: hsProjectJson.platformVersion,
+    }, { skipValidation: true });
+    // Write the IR file to the output directory
+    fs_2.default.writeFileSync(path_1.default.join(outputDir, OUTPUT_IR_FILE), JSON.stringify(IR, null, 2));
 }
 function ensureDirExists(dir) {
     if (!fs_2.default.existsSync(dir)) {

package/src/lib/schemas.js

@@ -5,6 +5,9 @@ const http_1 = require("@hubspot/local-dev-lib/http");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const copy_1 = require("../lang/copy");
 async function getIntermediateRepresentationSchema(translationContext) {
+    if (!translationContext.accountId) {
+        throw new Error(copy_1.errorMessages.api.accountIdIsRequiredToFetchSchemas);
+    }
     try {
         const { accountId, platformVersion } = translationContext;
         const { data } = await http_1.http.get(accountId, {

package/src/lib/types.d.ts

@@ -52,7 +52,7 @@ export type CompiledError = {
 export interface TranslationContext {
     projectSourceDir: string;
     platformVersion: string;
-    accountId: number;
+    accountId?: number;
 }
 export interface TranslationOptions {
     skipValidation?: boolean;

package/src/lib/uid.js

@@ -9,7 +9,7 @@ function validateUid(uid) {
     if (uid.length > 64) {
         return copy_1.errorMessages.validation.uidTooLong;
     }
-    if (!/^[a-z0-9_]+$/.test(uid)) {
+    if (!/^[a-zA-Z0-9_\-.]+$/.test(uid)) {
         return copy_1.errorMessages.validation.invalidUid;
     }
 }