@contrail/cli 3.4.8-alpha.4cb369c → 3.4.9-alpha.bd39c0c

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.4.8-alpha.4cb369c linux-x64 node-v20.20.2
+@contrail/cli/3.4.9-alpha.bd39c0c linux-x64 node-v24.14.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/helpers/load/helpers.js

@@ -71,7 +71,7 @@ async function uploadFile(incomingFileName) {
 async function loadFile(config) {
     const entities = new sdk_1.Entities();
     // start a load job referencing the newly created file
-    logger_1.default.info(`Loading with config: ${config}`);
+    logger_1.default.info(`Loading with config: ${JSON.stringify(config, null, 2)}`);
     const loadJob = await entities.create({
         entityName: 'loader-process',
         object: {

package/node_modules/@contrail/loader/lib/common/data-transformer-functions.js

@@ -237,9 +237,9 @@ function convertFromDisplayToValue(csvJSON, optionSetUsingTypePropertiesBySlug,
                 if (value === null || value === undefined) {
                     continue;
                 }
-                const values = value?.split(',');
+                const values = value?.split(',').map((v) => v.trim());
                 for (let i = 0; i < values?.length; i++) {
-                    const innerValue = values[i].trim();
+                    const innerValue = values[i];
                     if (!property || property?.optionLookupByValue[innerValue]) {
                         continue;
                     }

package/node_modules/@contrail/loader/lib/common/data-transformer.spec.js

@@ -572,6 +572,27 @@ describe('Data Transformer Functions', () => {
             expect(csvJSON[0].color).toEqual('red,blue');
             expect(csvJSON[1].color).toEqual('blue');
         });
+        it('should trim spaces from multi-select values that match by value lookup', () => {
+            const csvJSON = [
+                {
+                    id: '1',
+                    color: 'red, blue , green',
+                },
+            ];
+            const optionSetUsingTypePropertiesBySlug = {
+                color: {
+                    propertyType: 'multi_select',
+                    optionLookupByDisplay: {},
+                    optionLookupByValue: {
+                        red: { value: 'red' },
+                        blue: { value: 'blue' },
+                        green: { value: 'green' },
+                    },
+                },
+            };
+            (0, data_transformer_functions_1.convertFromDisplayToValue)(csvJSON, optionSetUsingTypePropertiesBySlug, [], []);
+            expect(csvJSON[0].color).toEqual('red,blue,green');
+        });
         it('should handle empty values for multi select values, returning the same values', () => {
             const csvJSON = [
                 {

package/node_modules/@contrail/loader/lib/common/entity-builder-helpers.js

@@ -48,7 +48,10 @@ function addProperty(propertyName, allPropertiesSlugs, valueType, object, value)
         value = null;
     }
     if (valueType === types_1.PropertyType.MultiSelect && typeof value === 'string') {
-        value = value.split(',');
+        value = value
+            .split(',')
+            .map((v) => v.trim())
+            .filter((v) => v.length > 0);
     }
     const propertyLevels = propertyName.split('.');
     if (allPropertiesSlugs.includes(propertyLevels[0])) {

package/node_modules/@contrail/loader/lib/common/entity-builder-helpers.spec.js

@@ -23,6 +23,11 @@ describe('addProperty', () => {
         const result = (0, entity_builder_helpers_1.addProperty)('testMultiSelect', ['testMultiSelect'], entity_types_1.PropertyType.MultiSelect, obj, obj.testMultiSelect);
         expect(result.testMultiSelect).toEqual(['1', '2']);
     });
+    it('should trim spaces and drop empties when splitting a spaced multi-select string', () => {
+        const obj = { testMultiSelect: '1, 2 , 3,,  ' };
+        const result = (0, entity_builder_helpers_1.addProperty)('testMultiSelect', ['testMultiSelect'], entity_types_1.PropertyType.MultiSelect, obj, obj.testMultiSelect);
+        expect(result.testMultiSelect).toEqual(['1', '2', '3']);
+    });
     it('should set date value as null when value is ""', () => {
         const obj = { testDate: '' };
         const result = (0, entity_builder_helpers_1.addProperty)('testDate', ['testDate'], entity_types_1.PropertyType.Date, obj, obj.testDate);

package/node_modules/@contrail/loader/lib/pipeline/project-item-execute-helpers.d.ts

@@ -3,3 +3,4 @@ import { LoaderConfig, ExecuteOptions, ConstructedEntitySet } from './types';
 import { ItemExecutionResult, ItemPreviewResult } from './item-execute-helpers';
 export declare function previewProjectItemEntities(client: EntitiesClient, entitySet: ConstructedEntitySet, config: LoaderConfig, projectNameById?: Record<string, string>): Promise<ItemPreviewResult>;
 export declare function executeProjectItemEntities(client: EntitiesClient, entitySet: ConstructedEntitySet, config: LoaderConfig, options?: ExecuteOptions): Promise<ItemExecutionResult>;
+export declare function applyAddedFromSource(changes: any, existingProjectItem: any | undefined): void;

package/node_modules/@contrail/loader/lib/pipeline/project-item-execute-helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeProjectItemEntities = exports.previewProjectItemEntities = void 0;
+exports.applyAddedFromSource = exports.executeProjectItemEntities = exports.previewProjectItemEntities = void 0;
 const types_1 = require("./types");
 const util_1 = require("@contrail/util");
 const lodash_1 = require("lodash");
@@ -63,6 +63,7 @@ async function previewProjectItemEntities(client, entitySet, config, projectName
             delete changes.projectId;
             changes.projectId = projectId;
             changes.itemId = item.id;
+            applyAddedFromSource(changes, existing);
             if ((0, entities_helper_1.UpdateNeeded)(changes, existing)) {
                 familyToUpdate.push(family);
             }
@@ -111,6 +112,7 @@ async function previewProjectItemEntities(client, entitySet, config, projectName
             delete changes.projectId;
             changes.projectId = projectId;
             changes.itemId = item.id;
+            applyAddedFromSource(changes, existing);
             if ((0, entities_helper_1.UpdateNeeded)(changes, existing)) {
                 optionToUpdate.push(opt);
             }
@@ -290,6 +292,7 @@ async function executeProjectItemEntities(client, entitySet, config, options) {
         delete changes.projectId;
         changes.projectId = projectId;
         changes.itemId = item.id;
+        applyAddedFromSource(changes, existingProjectItem);
         if (existingProjectItem) {
             if (!(0, entities_helper_1.UpdateNeeded)(changes, existingProjectItem)) {
                 familyUnchangedCount++;
@@ -358,6 +361,7 @@ async function executeProjectItemEntities(client, entitySet, config, options) {
         delete changes.projectId;
         changes.projectId = projectId;
         changes.itemId = item.id;
+        applyAddedFromSource(changes, existingProjectItem);
         if (existingProjectItem) {
             if (!(0, entities_helper_1.UpdateNeeded)(changes, existingProjectItem)) {
                 optionUnchangedCount++;
@@ -420,6 +424,15 @@ async function executeProjectItemEntities(client, entitySet, config, options) {
     return { summaries, skippedRows: allSkippedRows, warnings: allWarnings, hasFailures };
 }
 exports.executeProjectItemEntities = executeProjectItemEntities;
+function applyAddedFromSource(changes, existingProjectItem) {
+    if (existingProjectItem?.addedFromSource) {
+        delete changes.addedFromSource;
+    }
+    else {
+        changes.addedFromSource = 'LOADER';
+    }
+}
+exports.applyAddedFromSource = applyAddedFromSource;
 function splitForProjectItems(incomingEntities, typesByPath) {
     const byCompositeKey = {};
     for (const entity of incomingEntities) {

package/node_modules/@contrail/loader/lib/pipeline/project-item-execute-helpers.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/node_modules/@contrail/loader/lib/pipeline/project-item-execute-helpers.spec.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const project_item_execute_helpers_1 = require("./project-item-execute-helpers");
+describe('applyAddedFromSource', () => {
+    it('sets addedFromSource=LOADER when no existing project-item is present (create)', () => {
+        const changes = { name: 'New Project Item' };
+        (0, project_item_execute_helpers_1.applyAddedFromSource)(changes, undefined);
+        expect(changes.addedFromSource).toBe('LOADER');
+    });
+    it('sets addedFromSource=LOADER when existing project-item has no addedFromSource', () => {
+        const changes = { name: 'Updated' };
+        const existing = { id: 'proj:item', name: 'Old' };
+        (0, project_item_execute_helpers_1.applyAddedFromSource)(changes, existing);
+        expect(changes.addedFromSource).toBe('LOADER');
+    });
+    it('preserves the existing addedFromSource by removing it from the upsert payload', () => {
+        const changes = { name: 'Updated', addedFromSource: 'LOADER' };
+        const existing = { id: 'proj:item', addedFromSource: 'MANUAL' };
+        (0, project_item_execute_helpers_1.applyAddedFromSource)(changes, existing);
+        expect(changes).not.toHaveProperty('addedFromSource');
+    });
+    it('strips a row-supplied addedFromSource so it cannot overwrite a previously persisted one', () => {
+        const changes = { name: 'Updated', addedFromSource: 'EXTERNAL_SYSTEM' };
+        const existing = { id: 'proj:item', addedFromSource: 'API_INTEGRATION' };
+        (0, project_item_execute_helpers_1.applyAddedFromSource)(changes, existing);
+        expect(changes).not.toHaveProperty('addedFromSource');
+    });
+    it('treats an existing project-item with empty-string addedFromSource as "unset" and applies LOADER', () => {
+        const changes = {};
+        const existing = { id: 'proj:item', addedFromSource: '' };
+        (0, project_item_execute_helpers_1.applyAddedFromSource)(changes, existing);
+        expect(changes.addedFromSource).toBe('LOADER');
+    });
+});

package/node_modules/@contrail/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/loader",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Client library for helping with loader jobs.",
   "homepage": "https://archergreysorg.github.io/contrail-loader/",
   "main": "lib/index.js",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.4.8-alpha.4cb369c",
+  "version": "3.4.9-alpha.bd39c0c",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.4.8-alpha.4cb369c",
+  "version": "3.4.9-alpha.bd39c0c",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.6.1",
-    "@contrail/loader": "^2.0.0",
+    "@contrail/loader": "^2.0.2",
     "@contrail/org-config-migration": "^1.1.13",
     "@contrail/sdk": "^1.5.5",
     "@contrail/types": "^3.1.5",
@@ -134,7 +134,7 @@
     "format": "prettier --write \"**/*.ts\"",
     "copy-templates": "cp -r templates/ dist/templates",
     "postpack": "shx rm -f oclif.manifest.json",
-    "prepack": "yarn build && oclif manifest && oclif readme",
+    "prepack": "npm run build && oclif manifest && oclif readme",
     "test": "jest",
     "version": "oclif readme && git add README.md"
   },