@contrail/cli 2.1.25 → 2.1.27

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.1.25 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.27 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/projects/load.d.ts

@@ -7,3 +7,15 @@ export default class LoadProject extends BaseCommand {
     };
     run(): Promise<void>;
 }
+interface CheckerFunction {
+    (key: string, value: any): boolean;
+}
+interface ApplyFunction {
+    (key: string, value: any): Promise<void>;
+}
+export interface Transformer {
+    checker: CheckerFunction;
+    recursive: boolean;
+    apply: ApplyFunction;
+}
+export {};

package/dist/commands/projects/load.js

@@ -8,6 +8,7 @@ const helpers_1 = require("../../helpers/projects/helpers");
 const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const types_1 = require("@contrail/types");
 class LoadProject extends basecommand_1.BaseCommand {
     async run() {
         const { args } = await this.parse(LoadProject);
@@ -42,6 +43,8 @@ LoadProject.args = {
 async function uploadProject(templateFileLocation) {
     const projectConfigurationFromFile = (0, helpers_1.getProjectFile)(templateFileLocation);
     const projectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
+    logger_1.default.info('Checking for object and type references');
+    await transformProject(projectConfiguration);
     logger_1.default.info('Configuring Project.');
     await sdk_1.Request.request('/project-configurator', {
         method: 'POST',
@@ -111,3 +114,85 @@ function parseToProjectConfiguration(projectConfigurationFromFile) {
     }
     return projectConfiguration;
 }
+/**
+ * recursively traverse all the project nodes and transforms any
+ *  entities that need transformation.
+ */
+async function transformProject(projectConfiguration) {
+    const transformers = [
+        {
+            checker: (k, v) => k === 'assortments' && Array.isArray(v),
+            recursive: false,
+            apply: transformAssortmentObjectReferences,
+        },
+    ];
+    for (const transformer of transformers) {
+        // recurse through the project config and check all nodes
+        for (const [k, v] of Object.entries(projectConfiguration)) {
+            if (transformer.checker(k, v)) {
+                await transformer.apply(k, v);
+                if (transformer.recursive) {
+                    await transformProject(projectConfiguration[k]);
+                }
+            }
+            else if (typeof projectConfiguration[k] === 'object') {
+                // recurse for all properties because nested properties
+                // might need to be transformed
+                await transformProject(projectConfiguration[k]);
+            }
+        }
+    }
+}
+/**
+ * Hydrates object reference and type references in the assortment attributes.
+ * @param _ unused parameter for keys
+ * @param assortments The expected node value passed ot this function is a list of assortments
+ */
+async function transformAssortmentObjectReferences(_, assortments) {
+    var _a, _b, _c, _d, _e;
+    const typesClient = new sdk_1.Types();
+    const assortmentType = await typesClient.getType({
+        path: 'assortment',
+        relations: ['typeProperties'],
+    });
+    const assortmentProperties = assortmentType.typeProperties;
+    for (const assortment of assortments !== null && assortments !== void 0 ? assortments : []) {
+        const attributes = JSON.parse(JSON.stringify((_a = assortment === null || assortment === void 0 ? void 0 : assortment.assortmentAtts) !== null && _a !== void 0 ? _a : {}));
+        if (!((_b = Object.keys(attributes)) === null || _b === void 0 ? void 0 : _b.length)) {
+            continue;
+        }
+        for (const [attributeKey, attributeValue] of Object.entries(attributes)) {
+            const property = assortmentProperties.find((x) => x.slug === attributeKey);
+            // if not a reference
+            if (!property || !property.referencedTypePath) {
+                continue;
+            }
+            if (property.propertyType === types_1.PropertyType.TypeReference) {
+                logger_1.default.debug(`found type reference!${attributeKey}${attributeValue}`);
+                // special case: handle type references
+                const type = (_c = (await new sdk_1.Types().getType({ path: attributeValue }))) === null || _c === void 0 ? void 0 : _c.id;
+                logger_1.default.debug(`found type ${type}`);
+                logger_1.default.info(`replacing ${attributeKey}:${attributeValue} with ${attributeKey}Id:${type}`);
+                assortment.assortmentAtts[`${attributeKey}Id`] = type;
+            }
+            else if (property.propertyType === types_1.PropertyType.ObjectReference) {
+                logger_1.default.debug(`found object reference!${attributeKey}${attributeValue}`);
+                let allEntities = [];
+                if (property.referencedTypePath.startsWith('custom-entity')) {
+                    allEntities = await new sdk_1.Entities().get({
+                        entityName: 'custom-entity',
+                        criteria: { typePath: property.referencedTypePath },
+                    });
+                }
+                else {
+                    allEntities = await new sdk_1.Entities().get({ entityName: property.referencedTypePath });
+                }
+                // special case: handle type references
+                const foundAttribute = (_e = (_d = allEntities.find((x) => x.name === attributeValue)) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : attributeKey;
+                logger_1.default.debug(`found attribute ${foundAttribute}`);
+                logger_1.default.info(`replacing ${attributeKey}:${attributeValue} with ${attributeKey}Id:${foundAttribute}`);
+                assortment.assortmentAtts[`${attributeKey}Id`] = foundAttribute;
+            }
+        }
+    }
+}

package/dist/helpers/colors/helpers.js

@@ -22,14 +22,23 @@ async function getLocalColors() {
 exports.getLocalColors = getLocalColors;
 async function getExistingColors() {
     logger_1.default.info('%s Getting Existing Colors', chalk_1.default.yellow.bold('COLORS'));
+    const colors = [];
     try {
-        const result = await new sdk_1.Entities().get({ entityName: 'color', take: 3000 }); //, useSearch: false }); Not in EntitiesClientGetOptions yet
-        logger_1.default.info('Found %s existing colors', result.length);
-        return result;
+        let nextPageKey = null;
+        do {
+            const result = await new sdk_1.Entities().get({
+                entityName: 'color',
+                nextPageKey,
+                apiVersion: sdk_1.API_VERSION.V2,
+            });
+            colors.push(...result.results);
+            nextPageKey = result.nextPageKey;
+        } while (nextPageKey);
     }
     catch (e) {
         throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
     }
+    return colors;
 }
 exports.getExistingColors = getExistingColors;
 async function deleteColor(color) {

package/dist/helpers/workflow-template-definitions/workflow-template-definition-deployer.d.ts

@@ -8,5 +8,6 @@ export declare class WorkflowTemplateDefinitionDeployer {
     private createNewWorkflowDefinition;
     private populateActionIds;
     private updateWorkflowTemplateDefinition;
-    getWorkflowDeclarationIdentifier(actionKey: any, app: App): string;
+    getActionDeclarationIdentifier(actionKey: any, app: App): string;
+    getWorkflowDeclarationIdentifier(workflowKey: any, app: App): string;
 }

package/dist/helpers/workflow-template-definitions/workflow-template-definition-deployer.js

@@ -147,6 +147,10 @@ class WorkflowTemplateDefinitionDeployer {
                     throw new Error(`Could not find action ${actionKey} declared in workflow definition ${workflowDefinition.name}`);
                 }
                 actionConfiguration.id = action.id;
+                actionConfiguration.identifier = (0, actions_deployer_1.getActionDeclarationIdentifier)(actionKey, app);
+                if (!actionConfiguration.identifier) {
+                    throw new Error(`Could not create action identifier for action ${actionKey} workflow definition ${workflowDefinition.name}`);
+                }
             }
         }
     }
@@ -168,8 +172,11 @@ class WorkflowTemplateDefinitionDeployer {
         logger_1.default.info(`%s      Updated existing workflow definition: ${updatedWorkflowDefinition.identifier}`, chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
         return updatedWorkflowDefinition;
     }
-    getWorkflowDeclarationIdentifier(actionKey, app) {
+    getActionDeclarationIdentifier(actionKey, app) {
         return `${app.identifier}@${app.latestAppVersionId}:${actionKey}`;
     }
+    getWorkflowDeclarationIdentifier(workflowKey, app) {
+        return `${app.identifier}@${app.latestAppVersionId}:${workflowKey}`;
+    }
 }
 exports.WorkflowTemplateDefinitionDeployer = WorkflowTemplateDefinitionDeployer;

package/dist/interfaces.d.ts

@@ -114,6 +114,7 @@ export interface ActionDefinitionConfig {
         [key: string]: any;
     };
     id?: string;
+    identifier?: string;
 }
 export interface App {
     id: string;

package/dist/templates/typescript/eslintrc.json

@@ -0,0 +1,47 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "ignorePatterns": ["node_modules/", "dist/"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint", "unused-imports"],
+  "rules": {
+    "indent": ["error", 2],
+    "linebreak-style": ["error", "unix"],
+    "quote-props": ["error", "as-needed"],
+    "quotes": ["error", "single"],
+    "semi": ["error", "always"],
+    "no-multiple-empty-lines": ["error", { "max": 1, "maxEOF": 0 }],
+    "no-trailing-spaces": "error",
+    "no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
+    "@typescript-eslint/no-empty-function": [
+      "error",
+      { "allow": ["arrowFunctions"] }
+    ],
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-var-requires": "warn",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
+    "unused-imports/no-unused-vars": [
+      "warn",
+      {
+        "vars": "all",
+        "varsIgnorePattern": "^_",
+        "args": "after-used",
+        "argsIgnorePattern": "^_"
+      }
+    ]
+  }
+}

package/dist/templates/typescript/package.json

@@ -36,6 +36,9 @@
     "nodemon": "^1.19.4",
     "ts-jest": "^29.0.3",
     "ts-node": "^7.0.1",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "eslint": "^8.53.0",
+    "eslint-plugin-unused-imports": "^3.0.0",
     "typescript": "^4.7.4"
   }
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.25",
+  "version": "2.1.27",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.1.25",
+  "version": "2.1.27",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.1.17",
-    "@contrail/sdk": "^1.2.3",
+    "@contrail/sdk": "^1.2.17",
     "@contrail/types": "^3.0.20",
     "@contrail/util": "^1.0.41",
     "@oclif/core": "^2",