@contrail/cli 3.4.0-alpha → 3.4.0

package/dist/api/types.d.ts

@@ -1,5 +1,3 @@
-import { TypeProperty as SDKTypeProperty } from '@contrail/types';
-import { PropertyLevel, PropertyType, Type } from '@contrail/types';
 export declare function getOptionSets(): Promise<any[]>;
 export declare function getUserLists(): Promise<any[]>;
 export declare function getOptionSetHierarchies(): Promise<any[]>;
@@ -11,36 +9,3 @@ export declare function getTypePropertyPolicies(): Promise<any[]>;
 export declare function getTypePropertyPolicyLinks(): Promise<any[]>;
 export declare function getTypePolicies(): Promise<any[]>;
 export declare function getTypePolicyLinks(): Promise<any[]>;
-type ColonDelimitedHelper<S extends string> = S extends `${infer Head}:${infer Tail}` ? `${Head}:${ColonDelimitedHelper<Tail>}` : S;
-export type ColonDelimited = ColonDelimitedHelper<string>;
-export type TypeWithProperties = Type & {
-    typeProperties: TypeProperty[];
-};
-export interface Option {
-    value: string;
-    display: string;
-    disabled?: boolean;
-}
-export interface TypeProperty extends SDKTypeProperty {
-    propertyType?: PropertyType;
-    referencedTypePath?: string;
-    referencedTypeRootSlug?: string;
-    propertyLevel?: PropertyLevel;
-}
-export interface TypePropertyOptionSet {
-    id?: string;
-    orgId?: string;
-    name: string;
-    slug: string;
-    optionSet: Option[];
-    isArchived?: boolean;
-}
-export type TypeReferencesCacheByPath = Map<string, TypeWithProperties>;
-export declare function getTypeByPath(path: ColonDelimited): Promise<TypeWithProperties>;
-export declare function buildLocalTypesCache(paths: ColonDelimited[]): Promise<TypeReferencesCacheByPath>;
-export declare function parseTypePath(path: ColonDelimited): {
-    root: string;
-    path: string;
-};
-export declare function getReferencedTypePaths(type: TypeWithProperties): ColonDelimited[];
-export {};

package/dist/api/types.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferencedTypePaths = exports.parseTypePath = exports.buildLocalTypesCache = exports.getTypeByPath = exports.getTypePolicyLinks = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchyLinks = exports.getOptionSetHierarchies = exports.getUserLists = exports.getOptionSets = void 0;
+exports.getTypePolicyLinks = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchyLinks = exports.getOptionSetHierarchies = exports.getUserLists = exports.getOptionSets = void 0;
 const sdk_1 = require("@contrail/sdk");
-const types_1 = require("@contrail/types");
 async function getOptionSets() {
     return await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
@@ -78,48 +77,3 @@ async function getTypePolicyLinks() {
     });
 }
 exports.getTypePolicyLinks = getTypePolicyLinks;
-const TYPES_CACHE_BY_PATH = new Map();
-async function fetchTypeByPath(path) {
-    const { root } = parseTypePath(path);
-    const client = new sdk_1.Entities();
-    const type = await client.get({
-        entityName: 'type',
-        suffix: `roots/${root}/path/${path}`,
-        relations: ['typeProperties'],
-    });
-    return type;
-}
-async function getTypeByPath(path) {
-    if (TYPES_CACHE_BY_PATH.has(path)) {
-        return TYPES_CACHE_BY_PATH.get(path);
-    }
-    const type = await fetchTypeByPath(path);
-    TYPES_CACHE_BY_PATH.set(path, type);
-    return type;
-}
-exports.getTypeByPath = getTypeByPath;
-async function buildLocalTypesCache(paths) {
-    const types = await Promise.all(paths.map((path) => getTypeByPath(path)));
-    const newCache = types.reduce((acc, type) => {
-        acc.set(type.typePath, type);
-        return acc;
-    }, new Map());
-    return newCache;
-}
-exports.buildLocalTypesCache = buildLocalTypesCache;
-function parseTypePath(path) {
-    const parts = path.split(':').filter(Boolean);
-    if (parts.length === 0) {
-        throw new Error('Path cannot be empty');
-    }
-    const root = parts[0];
-    return { root, path };
-}
-exports.parseTypePath = parseTypePath;
-function getReferencedTypePaths(type) {
-    const properties = type.typeProperties || [];
-    return properties
-        .filter((prop) => prop.propertyType === types_1.PropertyType.TypeReference)
-        .map(({ referencedTypePath }) => referencedTypePath);
-}
-exports.getReferencedTypePaths = getReferencedTypePaths;

package/dist/auth/login.js

@@ -40,6 +40,10 @@ async function authUser() {
             return await refreshCurrentUserOrg();
         }
         catch (e) {
+            if (isNetworkConnectionError(e)) {
+                logger_1.default.error("Encountered a network connection issue. Please ensure you're connected to the internet and try again");
+                process.exit(1);
+            }
             logger_1.default.info('Token expired. Requesting auth credentials...');
         }
     }
@@ -211,3 +215,7 @@ async function returnAndStoreConfig(config) {
     await (0, config_1.storeConfig)(configCopy);
     return configCopy;
 }
+function isNetworkConnectionError(e) {
+    const cause = e?.cause;
+    return cause?.code === 'ENOTFOUND' || cause?.code === 'ECONNREFUSED';
+}

package/dist/basecommand.d.ts

@@ -8,9 +8,7 @@ export declare abstract class BaseCommand extends Command {
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     protected flags: any;
-    protected args: {
-        [key: string]: any;
-    };
+    protected args: any;
     init(): Promise<void>;
     setLogLevel(logLevel: string, config?: any): void;
     private confirmEnv;

package/dist/basecommand.js

@@ -17,7 +17,7 @@ class BaseCommand extends core_1.Command {
         ...baseFlags_1.baseFlags,
     };
     flags;
-    args = {};
+    args;
     async init() {
         await super.init();
         if (!this.ctor?.flags)

package/dist/commands/app/create.js

@@ -27,7 +27,6 @@ class CreateApp extends basecommand_1.BaseCommand {
         const defaultAppIdentifier = `@${username}/hello-world`;
         const defaultAppDescription = `Hello world app by ${currentUser.email}`;
         const defaultAppPublisher = `${currentUser.email}`;
-        const defaultNodeRuntime = entity_types_1.NodeRuntime.NODEJS_22_X;
         const answers = await inquirer_1.default.prompt([
             {
                 type: 'input',
@@ -57,17 +56,6 @@ class CreateApp extends basecommand_1.BaseCommand {
                 default: defaultAppPublisher,
                 required: true,
             },
-            {
-                type: 'list',
-                name: 'nodeRuntime',
-                message: 'Select the Node.js runtime for your app:',
-                choices: [
-                    { name: 'Node.js 22.x (recommended)', value: entity_types_1.NodeRuntime.NODEJS_22_X },
-                    { name: 'Node.js 18.x (deprecated)', value: entity_types_1.NodeRuntime.NODEJS_18_X },
-                ],
-                default: defaultNodeRuntime,
-                required: true,
-            },
         ]);
         let sanitizedIdentifier = answers.appIdentifier;
         if (!sanitizedIdentifier.startsWith('@')) {
@@ -81,7 +69,7 @@ class CreateApp extends basecommand_1.BaseCommand {
             public: false,
             description: answers.appDescription,
             frameworkVersion: 2,
-            nodeRuntime: answers.nodeRuntime,
+            nodeRuntime: entity_types_1.NodeRuntime.NODEJS_22_X,
         };
         try {
             await new sdk_1.Entities().create({ entityName: 'app', object: newApp });
@@ -95,7 +83,6 @@ class CreateApp extends basecommand_1.BaseCommand {
             appIdentifier: sanitizedIdentifier,
             appDescription: answers.appDescription,
             appPublisher: answers.appPublisher,
-            nodeRuntime: answers.nodeRuntime,
         });
         try {
             let appDeclaration = (0, load_app_config_1.loadAppConfig)();

package/dist/commands/app/extension/deploy.js

@@ -40,10 +40,12 @@ class DeployExtension extends basecommand_1.BaseCommand {
             await this.validateExtensionDeclaration(appDeclaration, extensionIdentifier);
             const extensionDir = this.getExtensionDirectory(extensionIdentifier);
             // 2. Package and upload extension
-            const createdPackage = await (0, extension_package_deployer_1.createExtensionPackage)(app.id, extensionDir, { debug: this.flags.debug });
+            const createdPackage = await (0, extension_package_deployer_1.createExtensionPackage)(app.id, extensionDir, {
+                debug: this.flags.debug,
+            });
             // 3. Poll until package is ready (timeout after 1 minute)
             const readyPackage = await this.pollUntilPackageIsReady(createdPackage);
-            logger_1.default.info("Extension package is ready...Checking for extension deployment");
+            logger_1.default.info('Extension package is ready...Checking for extension deployment');
             logger_1.default.debug(JSON.stringify(readyPackage, null, 2));
             const deployment = await this.pollUntilDeploymentIsReady(readyPackage.deploymentId);
             logger_1.default.info(`${chalk_1.default.green.bold('SUCCESS')} Extension package is ready.`);

package/dist/commands/app/init.js

@@ -6,7 +6,6 @@ const login_1 = require("../../auth/login");
 const basecommand_1 = require("../../basecommand");
 const setup_template_1 = require("../../helpers/app/setup-template");
 const sdk_1 = require("@contrail/sdk");
-const entity_types_1 = require("@contrail/entity-types");
 class InitApp extends basecommand_1.BaseCommand {
     static description = 'Initialize an app directory from a template';
     static examples = [
@@ -24,7 +23,6 @@ class InitApp extends basecommand_1.BaseCommand {
         const defaultAppIdentifier = `@${username}/hello-world`;
         const defaultAppDescription = `Hello world app by ${currentUser.email}`;
         const defaultAppPublisher = `${currentUser.email}`;
-        const defaultNodeRuntime = entity_types_1.NodeRuntime.NODEJS_22_X;
         const answers = await inquirer_1.default.prompt([
             {
                 type: 'input',
@@ -54,17 +52,6 @@ class InitApp extends basecommand_1.BaseCommand {
                 default: defaultAppPublisher,
                 required: true,
             },
-            {
-                type: 'list',
-                name: 'nodeRuntime',
-                message: 'Select the Node.js runtime for your app:',
-                choices: [
-                    { name: 'Node.js 22.x (recommended)', value: entity_types_1.NodeRuntime.NODEJS_22_X },
-                    { name: 'Node.js 18.x (deprecated)', value: entity_types_1.NodeRuntime.NODEJS_18_X },
-                ],
-                default: defaultNodeRuntime,
-                required: true,
-            },
         ]);
         let sanitizedIdentifier = answers.appIdentifier;
         if (!sanitizedIdentifier.startsWith('@')) {
@@ -75,7 +62,6 @@ class InitApp extends basecommand_1.BaseCommand {
             appIdentifier: sanitizedIdentifier,
             appDescription: answers.appDescription,
             appPublisher: answers.appPublisher,
-            nodeRuntime: answers.nodeRuntime,
         });
     }
 }

package/dist/commands/types/uploadTypes.d.ts

@@ -4,9 +4,10 @@ export default class UploadTypes extends BaseCommand {
     static examples: string[];
     static flags: {
         dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        merge: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }
-export declare function uploadTypes(dir: string): Promise<void>;
+export declare function uploadTypes(dir: string, isMerge: boolean): Promise<void>;

package/dist/commands/types/uploadTypes.js

@@ -18,13 +18,19 @@ class UploadTypes extends basecommand_1.BaseCommand {
             required: false,
             default: '.',
         }),
+        merge: core_1.Flags.boolean({
+            char: 'm',
+            description: 'Merge types and type properties without deleting missing ones. Only adds/updates those present in the source files.',
+            required: false,
+            default: false,
+        }),
     };
     async run() {
-        return await uploadTypes(this.flags.dir);
+        return await uploadTypes(this.flags.dir, this.flags.merge);
     }
 }
 exports.default = UploadTypes;
-async function uploadTypes(dir) {
-    await (0, type_uploader_1.uploadTypes)(dir);
+async function uploadTypes(dir, isMerge) {
+    await (0, type_uploader_1.uploadTypes)(dir, { isMerge });
 }
 exports.uploadTypes = uploadTypes;

package/dist/commands/types/uploadUsageInfo.js

@@ -103,6 +103,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                         numberFormat: loadedUI.numberFormat,
                         defaultValue: loadedUI.defaultValue,
                         label: loadedUI.label,
+                        isArchived: loadedUI.isArchived,
                     },
                 });
             }
@@ -115,8 +116,21 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                     entityName: 'type-property-usage-info',
                     id: found.id,
                     object: {
-                        editable: loadedUI.editable,
-                        used: loadedUI.used,
+                        editable: loadedUI?.editable,
+                        used: loadedUI?.used,
+                        formulaFunction: loadedUI?.formulaFunction,
+                        validationFunction: loadedUI?.validationFunction,
+                        numberFormat: loadedUI?.numberFormat,
+                        defaultValue: loadedUI?.defaultValue,
+                        label: loadedUI?.label,
+                        required: loadedUI?.required,
+                        searchable: loadedUI?.searchable,
+                        isUniqueProperty: loadedUI?.isUniqueProperty,
+                        isUniquePropertyInFamily: loadedUI?.isUniquePropertyInFamily,
+                        copyBehavior: loadedUI?.copyBehavior,
+                        copyDefault: loadedUI?.copyDefault,
+                        propertyLevel: loadedUI?.propertyLevel,
+                        isArchived: loadedUI?.isArchived,
                     },
                 });
             }

package/dist/common.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="node" />
 export declare function getSeparatorByPlatform(): string;
 export declare function delay(ms: number): Promise<NodeJS.Timeout>;
-export declare function removeSlash(string: string): string;
+export declare function removeSlash(string: any): string;

package/dist/helpers/app/app-deployer.js

@@ -107,6 +107,7 @@ class AppDeployer {
         if (appDeclaration?.accessGrants) {
             accessGrants = await app_template_parsers_1.AccessGrantsParser.buildAccessGrants(appDeclaration);
         }
+        // eslint-disable-next-line no-prototype-builtins
         if (appDeclaration.hasOwnProperty('dockerImageRef')) {
             throw new Error('Docker apps are no longer supported. Please use a node app.');
         }
@@ -201,7 +202,11 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
         logger_1.default.info('Installing production dependencies done.');
         logger_1.default.info('Building package...');
         try {
-            child_process_1.default.execSync('npx tsc --outDir tmp/dist');
+            // Check for tsconfig.build.json first, fallback to tsconfig.json
+            const buildConfigPath = fs_1.default.existsSync('tsconfig.build.json')
+                ? 'tsconfig.build.json'
+                : 'tsconfig.json';
+            child_process_1.default.execSync(`npx tsc --project ${buildConfigPath} --outDir tmp/dist`);
         }
         catch (e) {
             logger_1.default.error(`${chalk_1.default.red.bold('APP')}      Failed to build package.`);
@@ -228,7 +233,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
             return {};
         }
         logger_1.default.info('Uploading package to S3...');
-        let apps = await entitiesClient.get({ entityName: 'app' });
+        const apps = await entitiesClient.get({ entityName: 'app' });
         const thisApp = apps.find((x) => x.identifier === appIdentifier);
         if (!thisApp) {
             throw new Error('App not found');
@@ -238,8 +243,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
             object: { appId: thisApp.id },
         });
         // upload an s3 object using a signed url with an https put request
-        const readStream = fs_1.default.readFileSync('tmp.zip');
-        const postBody = Buffer.from(readStream);
+        const postBody = fs_1.default.readFileSync('tmp.zip');
         // await axios.put(uploadUrlObject.signedUrl, postBody.toString());
         await axios_1.default.request({
             method: 'PUT',

package/dist/helpers/app/extension-package-deployer.js

@@ -119,7 +119,7 @@ async function createExtensionPackage(appId, extensionDir, options) {
     await uploadExtensionPackage(appExtensionPackage, tmpDir, options);
     logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Extension packaged and uploaded.`);
     if (options.debug) {
-        logger_1.default.debug("debug mode enabled. Not cleaning up tmp dir.");
+        logger_1.default.debug('debug mode enabled. Not cleaning up tmp dir.');
     }
     else {
         cleanUp(tmpDir);

package/dist/helpers/app/setup-template.d.ts

@@ -1,10 +1,8 @@
-import { NodeRuntime } from '@contrail/entity-types';
 interface AppSetUpInputs {
     appName: string;
     appIdentifier: string;
     appDescription: string;
     appPublisher: string;
-    nodeRuntime: NodeRuntime;
 }
 export declare function setUpTemplate(appInput: AppSetUpInputs): Promise<void>;
 export {};

package/dist/helpers/app/setup-template.js

@@ -38,8 +38,7 @@ async function setUpTemplate(appInput) {
             .replace(/APP_IDENTIFIER_STUB/g, appInput.appIdentifier)
             .replace(/APP_NAME_STUB/g, appInput.appName)
             .replace(/APP_DESCRIPTION_STUB/g, appInput.appDescription)
-            .replace(/APP_PUBLISHER_STUB/g, appInput.appPublisher)
-            .replace(/NODE_RUNTIME_STUB/g, appInput.nodeRuntime);
+            .replace(/APP_PUBLISHER_STUB/g, appInput.appPublisher);
         fs_1.default.writeFileSync(appYmlFileLoc, newAppYml);
     }
     catch (e) {

package/dist/helpers/config/config.js

@@ -103,13 +103,13 @@ exports.writeConfig = writeConfig;
 async function getConfig() {
     let fileContent;
     try {
-        fileContent = await (await node_fs_1.promises.readFile(configFileLocation)).toString();
+        fileContent = (await node_fs_1.promises.readFile(configFileLocation)).toString();
     }
     catch {
         logger_1.default.debug(`failed to open config file (${configFileLocation}) for reading.`);
         logger_1.default.debug('trying to initialize config file');
         await initializeVibeIQConfig();
-        fileContent = await (await node_fs_1.promises.readFile(configFileLocation)).toString();
+        fileContent = (await node_fs_1.promises.readFile(configFileLocation)).toString();
     }
     try {
         const configFileJSON = JSON.parse(fileContent);
@@ -156,7 +156,7 @@ async function getConfigContent(fileName) {
     const configFilePath = (0, node_path_1.join)(configDirectoryLocation, `${fileName}.json`);
     let fileContent;
     try {
-        fileContent = await (await node_fs_1.promises.readFile(configFilePath)).toString();
+        fileContent = (await node_fs_1.promises.readFile(configFilePath)).toString();
         return JSON.parse(fileContent);
     }
     catch (error) {

package/dist/helpers/file-helpers.d.ts

@@ -1,3 +1,2 @@
 export declare function safeFileOverwrite(fileLocation: string, overwrite: boolean): Promise<boolean>;
 export declare function parseCSVData(data: string): any;
-export declare function parseFileAsJsonArray(fileName: string): any[];

package/dist/helpers/file-helpers.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFileAsJsonArray = exports.parseCSVData = exports.safeFileOverwrite = void 0;
+exports.parseCSVData = exports.safeFileOverwrite = void 0;
 const tslib_1 = require("tslib");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const sync_1 = require("csv-parse/sync");
@@ -35,20 +34,3 @@ function parseCSVData(data) {
     });
 }
 exports.parseCSVData = parseCSVData;
-function parseFileAsJsonArray(fileName) {
-    if (!fs_1.default.existsSync(fileName)) {
-        throw new Error(`File not found: ${fileName}`);
-    }
-    const fileContent = fs_1.default.readFileSync(fileName, 'utf-8');
-    try {
-        const jsonArray = JSON.parse(fileContent);
-        if (!Array.isArray(jsonArray)) {
-            throw new Error(`File content is not a valid JSON array: ${fileName}`);
-        }
-        return jsonArray;
-    }
-    catch (error) {
-        throw new Error(`Error parsing JSON from file ${fileName}: ${error.message}`);
-    }
-}
-exports.parseFileAsJsonArray = parseFileAsJsonArray;

package/dist/helpers/types/type-uploader.d.ts

@@ -1,4 +1,6 @@
-export declare function uploadTypes(dir: string): Promise<void>;
+export declare function uploadTypes(dir: string, options?: {
+    isMerge: boolean;
+}): Promise<void>;
 export interface ValueDiff {
     adds: any[];
     updates: any[];

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

@@ -10,12 +10,12 @@ const _ = tslib_1.__importStar(require("lodash"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const login_1 = require("../../auth/login");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-async function uploadTypes(dir) {
+async function uploadTypes(dir, options = { isMerge: false }) {
     try {
         const userConfig = await (0, login_1.authUser)();
         logger_1.default.info(`START Getting all types for org ${userConfig.orgSlug}`);
         logger_1.default.info('TYPES Uploading ');
-        await uploadReducedTypes(dir);
+        await uploadReducedTypes(dir, options);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Uploaded`);
     }
     catch (e) {
@@ -39,7 +39,7 @@ function loadReducedTypes(fromDir) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
-async function uploadReducedTypes(dir) {
+async function uploadReducedTypes(dir, options) {
     const types = loadReducedTypes(dir);
     const currentTypesWithoutProperties = await new sdk_1.Entities().get({
         entityName: 'type',
@@ -88,15 +88,15 @@ async function uploadReducedTypes(dir) {
                 });
                 const newTypeProperties = (await new sdk_1.Types().getType({ id: createdType.id }))
                     .typeProperties;
-                await uploadReducedTypeProperties(createdType, newTypeProperties, type.typeProperties, optionSets);
+                await uploadReducedTypeProperties(createdType, newTypeProperties, type.typeProperties, optionSets, options);
             }
             else {
-                const proposedType = {
+                const proposedType = Object.fromEntries(Object.entries({
                     slug: type.slug,
                     label: type.label,
                     typePath: type.typePath,
                     isArchived: type.isArchived,
-                };
+                }).filter(([_, value]) => value !== undefined));
                 const differences = extractValueDifferences(found, proposedType, [
                     'id',
                     'createdOn',
@@ -116,7 +116,10 @@ async function uploadReducedTypes(dir) {
                     'typeInterfaces',
                 ]);
                 let updatedType = found;
-                if (differences.updates.length || differences.adds.length || differences.deletions.length) {
+                const hasChangesToSave = options.isMerge
+                    ? Boolean(differences.updates.length || differences.adds.length)
+                    : Boolean(differences.updates.length || differences.adds.length || differences.deletions.length);
+                if (hasChangesToSave) {
                     logger_1.default.debug(`found differences: ${JSON.stringify(differences, null, 2)}`);
                     logger_1.default.info(`Updating Type:  ${type.slug}`);
                     updatedType = await new sdk_1.Entities().update({
@@ -128,7 +131,7 @@ async function uploadReducedTypes(dir) {
                 else {
                     logger_1.default.debug(`Skipping empty update of type ${type.typePath}`);
                 }
-                await uploadReducedTypeProperties(updatedType, found.typeProperties, type.typeProperties, optionSets);
+                await uploadReducedTypeProperties(updatedType, found.typeProperties, type.typeProperties, optionSets, options);
             }
         }
         catch (err) {
@@ -136,7 +139,7 @@ async function uploadReducedTypes(dir) {
         }
     }
 }
-async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes, optionSets) {
+async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes, optionSets, options) {
     const currentPropertyTypeBySlug = {};
     for (const currentPropertyType of currentPropertyTypes) {
         currentPropertyTypeBySlug[currentPropertyType.slug] = currentPropertyType;
@@ -188,6 +191,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         validationFunction: newPropertyType.validationFunction,
                         numberFormat: newPropertyType.numberFormat,
                         sequenceSeedValue: newPropertyType.sequenceSeedValue,
+                        copyBehavior: newPropertyType?.copyBehavior,
                     }),
                     headers: {
                         Accept: 'application/json',
@@ -199,35 +203,43 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             // !newPropertyType.inherited &&
             // !typePropertiesEqual(found, newPropertyType, optionSetIdBySlug)
             ) {
-                const proposedTP = {
-                    isArchived: newPropertyType.isArchived ?? null,
-                    propertyType: newPropertyType.propertyType ?? null,
-                    slug: newPropertyType.slug ?? null,
-                    label: newPropertyType.label ?? null,
-                    editable: newPropertyType.editable ?? null,
-                    searchable: newPropertyType.searchable ?? null,
-                    core: newPropertyType.core ?? null,
-                    typePropertyOptionSetId: optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug] ?? null,
-                    formula: newPropertyType.formula ?? null,
-                    referencedTypePath: newPropertyType.referencedTypePath ?? null,
-                    carryOverBehavior: newPropertyType.carryOverBehavior ?? null,
-                    carryOverDefault: newPropertyType.carryOverDefault ?? null,
-                    referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug ?? null,
-                    defaultValue: newPropertyType.defaultValue ?? null,
-                    propertyLevel: newPropertyType.propertyLevel ?? null,
+                // Skip platform-managed entities
+                if (found.core || newPropertyType.core) {
+                    logger_1.default.debug(`Skipping platform-managed property: ${newPropertyType.slug}`);
+                    continue;
+                }
+                const defaultValueForUndefinedEntries = options.isMerge ? undefined : null;
+                const defaultIfUndefined = (value) => value === undefined ? defaultValueForUndefinedEntries : value;
+                const proposedTypeProperty = Object.fromEntries(Object.entries({
+                    isArchived: defaultIfUndefined(newPropertyType.isArchived),
+                    propertyType: defaultIfUndefined(newPropertyType.propertyType),
+                    slug: defaultIfUndefined(newPropertyType.slug),
+                    label: defaultIfUndefined(newPropertyType.label),
+                    editable: defaultIfUndefined(newPropertyType.editable),
+                    searchable: defaultIfUndefined(newPropertyType.searchable),
+                    core: defaultIfUndefined(newPropertyType.core),
+                    typePropertyOptionSetId: defaultIfUndefined(optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug]),
+                    formula: defaultIfUndefined(newPropertyType.formula),
+                    referencedTypePath: defaultIfUndefined(newPropertyType.referencedTypePath),
+                    carryOverBehavior: defaultIfUndefined(newPropertyType.carryOverBehavior),
+                    carryOverDefault: defaultIfUndefined(newPropertyType.carryOverDefault),
+                    referencedTypeRootSlug: defaultIfUndefined(newPropertyType.referencedTypeRootSlug),
+                    defaultValue: defaultIfUndefined(newPropertyType.defaultValue),
+                    propertyLevel: defaultIfUndefined(newPropertyType.propertyLevel),
                     typePropertyUserListId,
-                    referencedTypeRole: newPropertyType.referencedTypeRole ?? null,
-                    isUniqueProperty: newPropertyType.isUniqueProperty ?? null,
-                    isUniquePropertyInFamily: newPropertyType.isUniquePropertyInFamily ?? null,
-                    formulaFunction: newPropertyType.formulaFunction ?? null,
-                    validationFunction: newPropertyType.validationFunction ?? null,
-                    numberFormat: newPropertyType.numberFormat ?? null,
-                    sequenceSeedValue: newPropertyType.sequenceSeedValue ?? null,
-                };
+                    referencedTypeRole: defaultIfUndefined(newPropertyType.referencedTypeRole),
+                    isUniqueProperty: defaultIfUndefined(newPropertyType.isUniqueProperty),
+                    isUniquePropertyInFamily: defaultIfUndefined(newPropertyType.isUniquePropertyInFamily),
+                    formulaFunction: defaultIfUndefined(newPropertyType.formulaFunction),
+                    validationFunction: defaultIfUndefined(newPropertyType.validationFunction),
+                    numberFormat: defaultIfUndefined(newPropertyType.numberFormat),
+                    sequenceSeedValue: defaultIfUndefined(newPropertyType.sequenceSeedValue),
+                    copyBehavior: defaultIfUndefined(newPropertyType.copyBehavior),
+                }).filter(([_, value]) => value !== undefined));
                 // logger.debug(
                 //   `found type property option set: ${newPropertyType.typePropertyOptionSetSlug}, ${proposedTP.typePropertyOptionSetId}, `,
                 // );
-                const differences = extractValueDifferences(found, proposedTP, [
+                const differences = extractValueDifferences(found, proposedTypeProperty, [
                     'id',
                     'createdOn',
                     'updatedOn',
@@ -249,13 +261,16 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                     'used',
                     'typePropertyPolicyIds',
                 ]);
-                if (differences.updates.length || differences.adds.length || differences.deletions.length) {
+                const hasChangesToSave = options.isMerge
+                    ? Boolean(differences.updates.length || differences.adds.length)
+                    : Boolean(differences.updates.length || differences.adds.length || differences.deletions.length);
+                if (hasChangesToSave) {
                     logger_1.default.debug(`found differences: ${JSON.stringify(differences, null, 2)}`);
-                    logger_1.default.debug(`Updating Type-Property:  ${newPropertyType.slug}, ${found.id}, ${JSON.stringify(proposedTP, null, 2)}`);
+                    logger_1.default.debug(`Updating Type-Property:  ${newPropertyType.slug}, ${found.id}, ${JSON.stringify(proposedTypeProperty, null, 2)}`);
                     await new sdk_1.Entities().update({
                         entityName: 'type-property',
                         id: found.id,
-                        object: proposedTP,
+                        object: proposedTypeProperty,
                     });
                 }
                 else {
@@ -267,6 +282,9 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             logger_1.default.info(`Error Creating Properties: ${err}`);
         }
     }
+    if (options.isMerge) {
+        return;
+    }
     for (const currentPropertyType of currentPropertyTypes) {
         try {
             const found = newPropertyTypesBySlug[currentPropertyType.slug];