@contrail/cli 3.6.0-alpha-5 → 3.6.0-alpha-6

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.6.0-alpha-5 darwin-arm64 node-v22.19.0
+@contrail/cli/3.6.0-alpha-6 darwin-arm64 node-v23.5.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/entities/create.js

@@ -90,7 +90,8 @@ const FIND_VALID_VALUE_MAP = {
                 if (entity.itemFamilyId)
                     return; // skip if already specified
                 if (entity.roles?.includes('option')) {
-                    entity.itemFamilyId = Array.from(validValues)[Math.floor(Math.random() * validValues.size)];
+                    entity.itemFamilyId =
+                        Array.from(validValues)[Math.floor(Math.random() * validValues.size)];
                     // can reuse itemFamilyId for options
                 }
             },
@@ -238,18 +239,24 @@ class CreateEntity extends basecommand_1.BaseCommand {
             ? (0, file_helpers_1.parseFileAsJsonArray)(inputFilename)
             : Array.from({ length: count || 1 }).fill({});
         NUM_ENTITIES_TO_CREATE = partialEntities.length;
+        const { root: entityName } = (0, types_2.parseTypePath)(entityTypePath);
         // Ensure we have the required properties for the entity type
-        if (SLUGS_THAT_MUST_BE_SPECIFIED_BY_TYPE_PATH[entityTypePath]) {
-            const requiredSlugs = SLUGS_THAT_MUST_BE_SPECIFIED_BY_TYPE_PATH[entityTypePath];
+        if (SLUGS_THAT_MUST_BE_SPECIFIED_BY_TYPE_PATH[entityName]) {
+            const requiredSlugs = SLUGS_THAT_MUST_BE_SPECIFIED_BY_TYPE_PATH[entityName];
             for (const slug of requiredSlugs) {
-                if (!propertySpecBySlug.has(slug)) {
-                    this.error(`Property '${slug}' must be specified for entity type '${entityTypePath}'.`);
+                // Check if the property is specified in command-line args
+                const isInCommandLineArgs = propertySpecBySlug.has(slug);
+                // Check if all entities from input file have this property
+                const allEntitiesHaveProperty = inputFilename
+                    ? partialEntities.every((entity) => entity[slug] !== undefined && entity[slug] !== null)
+                    : false;
+                if (!isInCommandLineArgs && !allEntitiesHaveProperty) {
+                    this.error(`Property '${slug}' must be specified for entity type '${entityName}'.`);
                 }
             }
         }
         try {
             const entitiesToCreate = await buildEntitiesToCreate(entityTypePath, partialEntities, propertySpecBySlug);
-            const { root: entityName } = (0, types_2.parseTypePath)(entityTypePath);
             const createdEntities = await createEntities(entityName, entitiesToCreate);
             if (outputFilename) {
                 fs_1.default.writeFileSync(outputFilename, JSON.stringify(createdEntities, null, 2));
@@ -294,15 +301,26 @@ async function buildEntitiesToCreate(entityTypePath, entities, propertySpecifica
     }));
     const limit = (0, p_limit_1.default)(30);
     await Promise.all(populatedEntities.map(async () => limit(() => throwIfEntityIsInvalid)));
+    // Skip system value generation if -p flag is set (preciseProperties mode)
+    if (SHOULD_ONLY_USE_SPECIFIED_PROPERTIES) {
+        console.log('Precise properties mode: skipping system value generation.');
+        return populatedEntities;
+    }
     // Add system values if needed
     const { root } = (0, types_2.parseTypePath)(type.typePath);
     const valueFinderApplierForEntity = FIND_VALID_VALUE_MAP[root] || [];
     for (const { slug, findValidValuesFn, applyValueToEntityFn } of valueFinderApplierForEntity) {
-        // If the property is already specified, skip it unless it is a role for an option or family
+        // If the property is already specified in command-line args, skip it
         if (propertySpecificationBySlug?.has(slug)) {
             console.log(`Skipping property ${slug} because it is already specified.`);
             continue;
         }
+        // If all entities already have this property, skip finding values
+        const allEntitiesHaveProperty = populatedEntities.every((entity) => entity[slug] !== undefined && entity[slug] !== null);
+        if (allEntitiesHaveProperty) {
+            console.log(`Skipping property ${slug} because all entities already have this value.`);
+            continue;
+        }
         const values = await findValidValuesFn(populatedEntities, entities.length);
         if (values) {
             populatedEntities.forEach((e) => applyValueToEntityFn(e, values));
@@ -452,7 +470,10 @@ function generateRandomNumber(min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 function generateRandomReadableString() {
-    return (0, unique_names_generator_1.uniqueNamesGenerator)({ dictionaries: [unique_names_generator_1.adjectives, unique_names_generator_1.animals, unique_names_generator_1.colors, unique_names_generator_1.animals, unique_names_generator_1.colors], length: 5 });
+    return (0, unique_names_generator_1.uniqueNamesGenerator)({
+        dictionaries: [unique_names_generator_1.adjectives, unique_names_generator_1.animals, unique_names_generator_1.colors, unique_names_generator_1.animals, unique_names_generator_1.colors],
+        length: 5,
+    });
 }
 function generateRandomDateString() {
     return new Date().toISOString();

package/dist/commands/entities/get.js

@@ -148,7 +148,15 @@ async function getEntityByTypePath(typePath, propertySpec, options = {}) {
     if (entityName === 'custom-entity' && !id) {
         criteria.typePath = typePath;
     }
-    return find(entityName, { id, skipHydrateRelationships, relations, propertySlugs, criteria, skip, take });
+    return find(entityName, {
+        id,
+        skipHydrateRelationships,
+        relations,
+        propertySlugs,
+        criteria,
+        skip,
+        take,
+    });
 }
 function convertPropertySpecIntoCriteria(propertySpec) {
     const criteria = {};
@@ -165,7 +173,7 @@ async function find(entityName, options = {}) {
         skipHydrateRelationships,
         relations,
         skip,
-        take
+        take,
     };
     if (propertySlugs && propertySlugs.length > 0) {
         queryOptions.customParams = { propertySlugs: propertySlugs.join(',') };

package/dist/commands/entities/update.js

@@ -37,7 +37,7 @@ class UpdateEntity extends basecommand_1.BaseCommand {
             char: 'F',
             description: 'Force update without validation. Internal use only',
             required: false,
-        })
+        }),
     };
     static args = {
         entityName: core_1.Args.string({
@@ -55,7 +55,7 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         await (0, login_1.authUser)();
         const { args, argv } = await this.parse(UpdateEntity);
         const { id: specifiedId, entityName } = args;
-        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships, force } = this.flags;
+        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships, force, } = this.flags;
         const propertySpecArgs = argv.slice(1, argv.length).filter(propertySpecifications_1.isValidPropertySpecification);
         const propertySpec = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)(propertySpecArgs);
         if (inputFilename && specifiedId) {

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/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0-alpha-5",
+  "version": "3.6.0-alpha-6",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.6.0-alpha-5",
+  "version": "3.6.0-alpha-6",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",