@contrail/cli 3.3.5 → 3.3.6-alpha.0

package/dist/helpers/types/type-uploader.spec.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const type_uploader_1 = require("./type-uploader");
+const login_1 = require("../../auth/login");
+const sdk_1 = require("../../__mocks__/@contrail/sdk");
+jest.mock('../../auth/login');
 describe('extractValueDifferences', () => {
     it('should return the correct value differences', () => {
         const object1 = {
@@ -117,3 +120,506 @@ describe('extractValueDifferences', () => {
         expect(valueDiff).toEqual(expectedValueDiff);
     });
 });
+describe('uploadTypes', () => {
+    let updateSpy;
+    let createSpy;
+    let requestSpy;
+    let fsSpy;
+    let authUserMock;
+    beforeEach(() => {
+        // Mock authUser
+        authUserMock = login_1.authUser;
+        authUserMock.mockResolvedValue({ orgSlug: 'test-org' });
+        const sdk = require('@contrail/sdk');
+        updateSpy = jest.spyOn(sdk.Entities.prototype, 'update');
+        createSpy = jest.spyOn(sdk.Entities.prototype, 'create');
+        // Mock Request.request as a function
+        sdk.Request = { request: jest.fn() };
+        requestSpy = sdk.Request.request;
+        // Mock filesystem operations
+        jest.spyOn(require('fs'), 'readdirSync').mockReturnValue(['color.yml']);
+        fsSpy = jest.spyOn(require('fs'), 'readFileSync');
+        fsSpy.mockReturnValue(FULL_TYPE_YML);
+    });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    it('should fully re-populate type and its properties when not merging', async () => {
+        fsSpy.mockReturnValue(FULL_TYPE_YML);
+        await (0, type_uploader_1.uploadTypes)('mock-dir', { isMerge: false });
+        const nonCoreTypePropertiesCount = sdk_1.BASE_TYPE_WITH_PROPERTIES.typeProperties.filter((prop) => !prop.core).length;
+        expect(updateSpy).toHaveBeenCalledTimes(nonCoreTypePropertiesCount + 1); // +1 for the type update
+        expect(requestSpy).toHaveBeenCalledTimes(0);
+        expect(createSpy).toHaveBeenCalledTimes(0);
+    });
+    it('should modify property "label" on type only', async () => {
+        fsSpy.mockReturnValue(TYPE_WITH_UPDATED_LABEL_YML);
+        await (0, type_uploader_1.uploadTypes)('mock-dir', { isMerge: true });
+        expect(requestSpy).toHaveBeenCalledTimes(0);
+        expect(createSpy).toHaveBeenCalledTimes(0);
+        expect(updateSpy).toHaveBeenCalledTimes(1);
+        expect(updateSpy).toHaveBeenCalledWith(expect.objectContaining({
+            entityName: 'type',
+            object: {
+                typePath: 'color',
+                label: 'Color 2',
+            },
+        }));
+    });
+    it('should update type-property on existing type only', async () => {
+        fsSpy.mockReturnValue(TYPE_WITH_UPDATED_PROPERTY_YML);
+        await (0, type_uploader_1.uploadTypes)('mock-dir', { isMerge: true });
+        expect(requestSpy).toHaveBeenCalledTimes(0);
+        expect(createSpy).toHaveBeenCalledTimes(0);
+        expect(updateSpy).toHaveBeenCalledTimes(1);
+        expect(updateSpy).toHaveBeenCalledWith(expect.objectContaining({
+            entityName: 'type-property',
+            object: {
+                slug: 'rgb',
+                isArchived: true,
+                typePropertyUserListId: null,
+            },
+        }));
+    });
+    it('should add new type-property to existing type', async () => {
+        fsSpy.mockReturnValue(TYPE_WITH_NEW_PROPERTY_YML);
+        await (0, type_uploader_1.uploadTypes)('mock-dir', { isMerge: true });
+        expect(createSpy).toHaveBeenCalledTimes(0);
+        expect(updateSpy).toHaveBeenCalledTimes(0);
+        expect(requestSpy).toHaveBeenCalledTimes(1);
+        expect(requestSpy).toHaveBeenCalledWith(expect.stringMatching(/^\/types\/[^/]+\/type-properties$/), expect.objectContaining({
+            method: 'POST',
+            body: JSON.stringify({
+                isArchived: false,
+                propertyType: 'number',
+                slug: 'code',
+                label: 'Code',
+                editable: true,
+                searchable: false,
+                core: false,
+                formula: null,
+                referencedTypePath: null,
+                carryOverBehavior: null,
+                carryOverDefault: null,
+                referencedTypeRootSlug: null,
+                defaultValue: null,
+                typePropertyUserListId: null,
+                referencedTypeRole: null,
+                isUniqueProperty: false,
+                isUniquePropertyInFamily: false,
+                propertyLevel: null,
+                formulaFunction: null,
+                validationFunction: null,
+                numberFormat: null,
+                sequenceSeedValue: null,
+            }),
+        }));
+    });
+    it('should create new subtype with property', async () => {
+        fsSpy.mockReturnValue(SUBTYPE_WITH_PROPERTY_YML);
+        await (0, type_uploader_1.uploadTypes)('mock-dir', { isMerge: true });
+        expect(updateSpy).toHaveBeenCalledTimes(0);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledWith(expect.objectContaining({
+            entityName: 'type',
+            object: {
+                slug: 'test-subtype',
+                label: 'Color Test Subtype',
+                typePath: 'color:test-subtype',
+                isArchived: false,
+            },
+        }));
+        expect(requestSpy).toHaveBeenCalledTimes(1);
+        expect(requestSpy).toHaveBeenCalledWith(expect.stringMatching(/^\/types\/[^/]+\/type-properties$/), expect.objectContaining({
+            method: 'POST',
+            body: JSON.stringify({
+                isArchived: false,
+                propertyType: 'number',
+                slug: 'subtypeProperty',
+                label: 'Subtype Property',
+                editable: true,
+                searchable: false,
+                core: false,
+                formula: null,
+                referencedTypePath: null,
+                carryOverBehavior: null,
+                carryOverDefault: null,
+                referencedTypeRootSlug: null,
+                defaultValue: null,
+                typePropertyUserListId: null,
+                referencedTypeRole: null,
+                isUniqueProperty: false,
+                isUniquePropertyInFamily: false,
+                propertyLevel: null,
+                formulaFunction: null,
+                validationFunction: null,
+                numberFormat: null,
+                sequenceSeedValue: null,
+            }),
+        }));
+    });
+});
+const FULL_TYPE_YML = `
+- typePath: color
+  slug: color
+  label: Color
+  isArchived: false
+  typeProperties:
+    - slug: blue
+      isArchived: false
+      propertyType: number
+      label: Blue
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: createdOn
+      isArchived: false
+      propertyType: date
+      label: Created On
+      editable: false
+      searchable: false
+      core: true
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: federatedId
+      isArchived: false
+      propertyType: sequence
+      label: Federated Id
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: 1
+    - slug: green
+      isArchived: false
+      propertyType: number
+      label: Green
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: hex
+      isArchived: false
+      propertyType: string
+      label: Hex
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: hexCode
+      isArchived: false
+      propertyType: string
+      label: Hex Code
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: isArchived
+      isArchived: false
+      propertyType: boolean
+      label: Archived
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: name
+      isArchived: false
+      propertyType: string
+      label: Name
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: red
+      isArchived: false
+      propertyType: number
+      label: Red
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: rgb
+      isArchived: false
+      propertyType: string
+      label: RGB
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: rgba
+      isArchived: false
+      propertyType: string
+      label: RGBA
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+    - slug: updatedOn
+      isArchived: false
+      propertyType: date
+      label: Updated On
+      editable: false
+      searchable: false
+      core: true
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+`;
+const SUBTYPE_WITH_PROPERTY_YML = `
+- typePath: color:test-subtype
+  slug: test-subtype
+  label: Color Test Subtype
+  isArchived: false
+  typeProperties:
+    - slug: subtypeProperty
+      isArchived: false
+      propertyType: number
+      label: Subtype Property
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+`;
+const TYPE_WITH_UPDATED_LABEL_YML = `
+- typePath: color
+  label: Color 2
+`;
+const TYPE_WITH_NEW_PROPERTY_YML = `
+- typePath: color
+  typeProperties:
+    - slug: code
+      isArchived: false
+      propertyType: number
+      label: Code
+      editable: true
+      searchable: false
+      core: false
+      formula: null
+      referencedTypePath: null
+      referencedTypeRootSlug: null
+      typePropertyUserListId: null
+      typePropertyUserListName: ''
+      referencedTypeRole: null
+      defaultValue: null
+      propertyLevel: null
+      carryOverBehavior: null
+      carryOverDefault: null
+      isUniqueProperty: false
+      isUniquePropertyInFamily: false
+      inherited: false
+      formulaFunction: null
+      validationFunction: null
+      numberFormat: null
+      sequenceSeedValue: null
+`;
+const TYPE_WITH_UPDATED_PROPERTY_YML = `
+- typePath: color
+  typeProperties:
+    - slug: rgb
+      isArchived: true
+`;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.5",
+  "version": "3.3.6-alpha.0",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -2373,6 +2373,14 @@
           "required": false,
           "multiple": false,
           "default": "."
+        },
+        "merge": {
+          "name": "merge",
+          "type": "boolean",
+          "char": "m",
+          "description": "Merge types and type properties without deleting missing ones. Only adds/updates those present in the source files.",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.3.5",
+  "version": "3.3.6-alpha.0",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.3.0",
-    "@contrail/org-config-migration": "^1.1.6",
+    "@contrail/org-config-migration": "^1.1.7",
     "@contrail/sdk": "^1.4.6",
     "@contrail/types": "^3.0.48",
     "@contrail/util": "^1.1.10",