@servicenow/sdk-build-plugins 2.1.4 → 2.2.2

package/dist/db/TablePlugin.js

@@ -23,24 +23,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dynamic_value_mapping = exports.ColumnSchemaBootstrapAttributes = exports.TableSchemaBootstrapAttributes = exports.SysDocumentation = exports.TableSchemaBootstrap = exports.TableSchemaFull = exports.callerAccess = void 0;
-exports.transformColumnData = transformColumnData;
-exports.SysNumber = SysNumber;
 exports.generateColumnExpression = generateColumnExpression;
 exports.createObjectExpression = createObjectExpression;
-exports.factoryCreateValue = factoryCreateValue;
-exports.getCallExpressionFromType = getCallExpressionFromType;
 const db_1 = require("@servicenow/sdk-core/runtime/db");
 const sdk_build_core_1 = require("@servicenow/sdk-build-core");
 const xmlbuilder2_1 = require("xmlbuilder2");
 const lodash_1 = require("lodash");
 const zod_1 = require("zod");
 const RecordPlugin_1 = require("./RecordPlugin");
-const ts_morph_1 = require("ts-morph");
 const sdk_project_1 = require("@servicenow/sdk-project");
 const ScriptTemplatePlugin_1 = require("../ScriptTemplatePlugin");
 const os = __importStar(require("os"));
-const path = __importStar(require("path"));
 const DBUtils_1 = require("./DBUtils");
 const ServerModulePlugin_1 = require("../ServerModulePlugin");
 /**
@@ -51,9 +44,9 @@ const ServerModulePlugin_1 = require("../ServerModulePlugin");
  * - `restricted`: 2
  *
  */
-exports.callerAccess = ['none', 'tracking', 'restricted'];
+const callerAccess = ['none', 'tracking', 'restricted'];
 // Basic info needed for table references
-exports.TableSchemaFull = zod_1.z.object({
+const TableSchemaFull = zod_1.z.object({
     /** lowercase, one word name. Numbers, letters and underscores only */
     name: zod_1.z.string(),
     /** Object literal of column names with <type>Column() calls as values.
@@ -85,7 +78,7 @@ exports.TableSchemaFull = zod_1.z.object({
         .union([zod_1.z.literal('package_private'), zod_1.z.literal('public')])
         .optional()
         .default('public'),
-    caller_access: zod_1.z.enum(exports.callerAccess).optional(),
+    caller_access: zod_1.z.enum(callerAccess).optional(),
     /** Array of read, update, create, delete actions (['read', 'update',...])*/
     actions: zod_1.z
         .array(zod_1.z.union([zod_1.z.literal('read'), zod_1.z.literal('update'), zod_1.z.literal('delete'), zod_1.z.literal('create')]))
@@ -105,7 +98,10 @@ exports.TableSchemaFull = zod_1.z.object({
         .array(zod_1.z.object({
         name: zod_1.z.string(),
         unique: zod_1.z.boolean(),
-        element: zod_1.z.string(),
+        element: zod_1.z
+            .string()
+            .or(zod_1.z.array(zod_1.z.string()))
+            .transform((el) => ((0, lodash_1.isArray)(el) ? el : [el])),
     }))
         .optional(),
 });
@@ -160,7 +156,7 @@ const DBObjectIncomingAttributes = zod_1.z.object({
     caller_access: RecordPlugin_1.TextNumberSchema.or(IntFromString)
         .transform((val) => {
         if (val) {
-            return exports.callerAccess[val];
+            return callerAccess[val];
         }
         return;
     })
@@ -174,7 +170,7 @@ const DBObjectIncomingAttributes = zod_1.z.object({
     access: RecordPlugin_1.TextStringSchema.or(zod_1.z.string()).optional(),
 });
 // Attributes in the element='collection' tag of bootstrap xml
-exports.TableSchemaBootstrap = zod_1.z.object({
+const TableSchemaBootstrap = zod_1.z.object({
     name: zod_1.z.string(),
     extends: zod_1.z.string().optional(),
     label: zod_1.z.string().max(80, 'Cannot exceed 80 characters').or(zod_1.z.array(zod_1.z.any())).optional(),
@@ -194,7 +190,7 @@ exports.TableSchemaBootstrap = zod_1.z.object({
         .union([zod_1.z.literal('public'), zod_1.z.literal('package_private')])
         .optional()
         .default('public'),
-    caller_access: zod_1.z.enum(exports.callerAccess).default('none').optional(),
+    caller_access: zod_1.z.enum(callerAccess).default('none').optional(),
     actions: zod_1.z
         .array(zod_1.z.union([zod_1.z.literal('read'), zod_1.z.literal('update'), zod_1.z.literal('delete'), zod_1.z.literal('create')]))
         .default(['read'])
@@ -212,12 +208,12 @@ exports.TableSchemaBootstrap = zod_1.z.object({
         .default({})
         .optional(),
 });
-const TableSchemaBootstrapIncoming = exports.TableSchemaBootstrap.omit({ actions: true }).extend({
+const TableSchemaBootstrapIncoming = TableSchemaBootstrap.omit({ actions: true }).extend({
     caller_access: zod_1.z
         .union([zod_1.z.literal(0), zod_1.z.literal(1), zod_1.z.literal(2)])
         .transform((val) => {
         if (val) {
-            return exports.callerAccess[val];
+            return callerAccess[val];
         }
         return;
     })
@@ -239,7 +235,7 @@ const DBObjectIncoming = zod_1.z.object({
     '@_table': zod_1.z.literal('sys_db_object'),
     sys_db_object: zod_1.z.record(zod_1.z.any()),
 });
-exports.SysDocumentation = zod_1.z.object({
+const SysDocumentation = zod_1.z.object({
     sys_documentation: zod_1.z.object({
         element: RecordPlugin_1.TextStringSchema.optional(),
         label: RecordPlugin_1.TextStringSchema.optional(),
@@ -254,7 +250,7 @@ exports.SysDocumentation = zod_1.z.object({
     }),
 });
 // Attributes from element=table in bootstrap.xml
-exports.TableSchemaBootstrapAttributes = zod_1.z
+const TableSchemaBootstrapAttributes = zod_1.z
     .object({
     '@_name': zod_1.z.string(),
     '@_extends': zod_1.z.string().optional(),
@@ -302,11 +298,19 @@ exports.TableSchemaBootstrapAttributes = zod_1.z
 const IndexSchemaBootstrapAttributes = zod_1.z.object({
     '@_name': zod_1.z.string(),
     '@_unique': BooleanFromString,
-    element: zod_1.z.object({
+    element: zod_1.z
+        .object({ '@_name': zod_1.z.string() })
+        .or(zod_1.z.array(zod_1.z.object({
         '@_name': zod_1.z.string(),
+    })))
+        .transform((val) => {
+        if ((0, lodash_1.isArray)(val)) {
+            return val;
+        }
+        return [val];
     }),
 });
-exports.ColumnSchemaBootstrapAttributes = exports.TableSchemaBootstrapAttributes.omit({ '@_extends': true })
+const ColumnSchemaBootstrapAttributes = TableSchemaBootstrapAttributes.omit({ '@_extends': true })
     .extend({
     '@_choice': zod_1.z.coerce.number().optional(),
     '@_active': BooleanFromString,
@@ -346,10 +350,10 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                 // TODO: Cast to `any` is temporary workaround for the circular nature of Table entities
                 CallExpression: (node, context) => {
                     const result = (0, sdk_build_core_1.extractCallExpression)(db_1.Table, 'table', node, context, (table) => table.name);
-                    if (!result.handled || !(0 in result.data)) {
+                    if (!result.handled || !result.data) {
                         return result;
                     }
-                    const data = result.data[0];
+                    const data = result.data;
                     const diagnostics = result.diagnostics;
                     const scopeName = context.app.config.scope;
                     const scopeRegex = new RegExp(`^${scopeName}_`);
@@ -362,7 +366,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                         diagnostics.push(new sdk_build_core_1.FluentDiagnostic(tableName.getNode(), `Table name must only contain lowercase letters, numbers, and underscores and end with a letter or number`));
                     }
                     if (!scopeMatches) {
-                        const nameNode = tableName.getNode().asKindOrThrow(ts_morph_1.SyntaxKind.StringLiteral);
+                        const nameNode = tableName.getNode().asKindOrThrow(sdk_project_1.ts.SyntaxKind.StringLiteral);
                         if (nameNode.getParent().getKindName() !== 'AsExpression') {
                             diagnostics.push(new sdk_build_core_1.FluentDiagnostic(tableName.getNode(), `'name' property must start with scope prefix '${scopeName}'`));
                         }
@@ -371,7 +375,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                         }
                     }
                     const schema = data.getProperty('schema');
-                    const schemaNode = schema.getNode().asKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
+                    const schemaNode = schema.getNode().asKindOrThrow(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression);
                     for (const columnName in schema.getValue()) {
                         const columnNode = schemaNode.getPropertyOrThrow(columnName);
                         if (!ignoreColumnNameCheck &&
@@ -384,7 +388,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                             diagnostics.push(new sdk_build_core_1.FluentDiagnostic(columnNode, `Column name must only contain lowercase letters, numbers, and underscores`));
                         }
                     }
-                    const declaration = node.getParentIfKind(ts_morph_1.SyntaxKind.VariableDeclaration);
+                    const declaration = node.getParentIfKind(sdk_project_1.ts.SyntaxKind.VariableDeclaration);
                     if (!declaration ||
                         !declaration.isExported() ||
                         !declaration.isNamedExport() ||
@@ -392,7 +396,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                         diagnostics.push(new sdk_build_core_1.FluentDiagnostic(node, `Table definition should be exported as a named export with the name '${tableName.getValue()}'`, { level: sdk_project_1.Diagnostic.Level.Warn }));
                     }
                     diagnostics.push(...(0, DBUtils_1.getLabelDiagnostics)(data));
-                    return { handled: true, data: [data], diagnostics };
+                    return { handled: true, data, diagnostics };
                 },
             },
         },
@@ -401,7 +405,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
             let dbObjectData = {};
             const bootstrapDatabaseXML = BootstrapDatabaseElement.safeParse(xml.data['database']);
             if (bootstrapDatabaseXML.success) {
-                const data = exports.TableSchemaBootstrapAttributes.parse(bootstrapDatabaseXML.data.element);
+                const data = TableSchemaBootstrapAttributes.parse(bootstrapDatabaseXML.data.element);
                 Object.entries(data).forEach(([key, value]) => {
                     if (key.startsWith('@_')) {
                         bootstrapData[key.substring(2)] = value;
@@ -429,7 +433,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                         return;
                     }
                     if (table === 'sys_documentation') {
-                        const data = exports.SysDocumentation.parse(record_update[table]).sys_documentation;
+                        const data = SysDocumentation.parse(record_update[table]).sys_documentation;
                         return new sdk_build_core_1.XmlData({
                             table: table,
                             id: record_update[table][table]['sys_id']?.['#text'] ?? (0, sdk_build_core_1.GUID)(),
@@ -446,7 +450,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
             if (bootstrapDatabaseXML.success && bootstrapDatabaseXML.data.element['element']) {
                 const element = bootstrapDatabaseXML.data.element['element'];
                 const elementsArray = (0, lodash_1.isArray)(element) ? element : [element];
-                columns.push(...zod_1.z.array(exports.ColumnSchemaBootstrapAttributes).parse(elementsArray));
+                columns.push(...zod_1.z.array(ColumnSchemaBootstrapAttributes).parse(elementsArray));
                 columns.forEach((element) => {
                     if (element.choice && !(0, lodash_1.isEmpty)(element.choice)) {
                         element['choice_elements'] = {};
@@ -472,7 +476,10 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                     if (idxData.success) {
                         idxElements.push({
                             name: idxData.data['@_name'],
-                            element: idxData.data.element['@_name'],
+                            element: idxData.data.element.reduce((arr, curr) => {
+                                arr.push(curr['@_name']);
+                                return arr;
+                            }, []),
                             unique: idxData.data['@_unique'] ?? false,
                         });
                     }
@@ -487,7 +494,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
             table(entity, context) {
                 const node = entity.getNode();
                 const data = entity.getValue();
-                const table = exports.TableSchemaFull.parse(data);
+                const table = TableSchemaFull.parse(data);
                 const composeData = compose(table);
                 const { columnData, documentation } = composeColumns(table.schema, context, table.name, table.display);
                 composeData['columns'] = columnData;
@@ -554,11 +561,10 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                 sourceFile: (0, sdk_build_core_1.getOrCreateEntitySourceFile)(context, parsedBoostrapData.data.name),
                 moduleSpecifier: '@servicenow/sdk/core',
                 exportName: parsedBoostrapData.data.name,
-            }, db_1.Table, {}).getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.CallExpression));
+            }, db_1.Table, {}).getInitializerIfKindOrThrow(sdk_project_1.ts.SyntaxKind.CallExpression));
         },
         record(document, context) {
-            if (document.data?.['table'] !== 'sys_documentation' &&
-                document.data?.['table'] !== 'ua_table_licensing_config') {
+            if (document.data?.['table'] !== 'sys_documentation') {
                 return;
             }
             return (0, sdk_build_core_1.linkDocument)(document, (0, sdk_build_core_1.generateCallExpression)(context, (0, sdk_build_core_1.getOrCreateEntitySourceFile)(context, `${document.data?.['data'].name}`), '@servicenow/sdk/core', db_1.Record, { $id: document.guid }));
@@ -598,7 +604,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                     return false;
                 }
                 const [args] = document.node.getArguments();
-                if (!ts_morph_1.Node.isObjectLiteralExpression(args)) {
+                if (!sdk_project_1.ts.Node.isObjectLiteralExpression(args)) {
                     return false;
                 }
                 if (document.action === 'DELETE') {
@@ -626,33 +632,20 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                     rest['extends'] = ext;
                 }
                 if (caller_access) {
-                    rest['caller_access'] = exports.callerAccess[caller_access];
+                    rest['caller_access'] = callerAccess[caller_access];
                 }
                 if (!(0, lodash_1.isEmpty)(db_data)) {
-                    const actions = getActionsArray({ create_access, delete_access, update_access, read_access });
-                    if (actions.length > 0) {
-                        (0, sdk_build_core_1.writeCustomProperty)(args, 'actions', '[]', (0, sdk_build_core_1.stringify)(actions));
-                    }
-                    else {
-                        const actionsProp = (0, sdk_build_core_1.getOrCreatePropertyAssignment)(args, 'actions', '[]');
-                        actionsProp.remove();
-                    }
+                    rest.actions = getActionsArray(xmlData.dbObjectData);
                 }
                 if (!rest.attributes) {
                     delete rest.attributes;
                 }
-                if (xmlData.bootstrapData && xmlData.bootstrapData.index) {
-                    const indexProp = (0, sdk_build_core_1.getOrCreatePropertyAssignment)(args, 'index', '[]');
-                    indexProp.setInitializer((0, sdk_build_core_1.stringify)(xmlData.bootstrapData.index));
-                    if (xmlData.bootstrapData.index.length === 0) {
-                        indexProp.remove();
-                    }
-                }
                 (0, sdk_build_core_1.transformFunctionArguments)(document.node, db_1.Table, rest);
                 // Handle columns
                 const incomingColumns = xmlData.bootstrapData ? xmlData.bootstrapData.columns : undefined;
                 updateDisplayValue(document.node, columns, incomingColumns);
-                transformColumns(incomingColumns, args);
+                transformColumns(columns, incomingColumns, args);
+                transformIndexes(xmlData, args);
                 return true;
             },
         },
@@ -688,7 +681,7 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                             type: interfaceType,
                         });
                     }
-                    const filePath = path.normalize(table.getNode().getSourceFile().getFilePath());
+                    const filePath = table.getNode().getSourceFile().getFilePath();
                     const resolvedModuleSpecifier = generatedTableFile?.getRelativePathAsModuleSpecifierTo(filePath);
                     const importExists = context.compiler.importExistsInGlobalDeclaration(tableName);
                     if (!importExists) {
@@ -725,6 +718,25 @@ exports.default = (0, sdk_build_core_1.Plugin)({
         },
     },
 });
+function transformIndexes(xmlData, args) {
+    if (xmlData.bootstrapData?.index?.length > 0) {
+        // find the correct object literal
+        const indexProp = (0, sdk_build_core_1.getPropertyAssignment)(args, 'index');
+        if (indexProp) {
+            (0, sdk_build_core_1.mergeDataIntoObjectLiteralArray)(indexProp.getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.ArrayLiteralExpression), Object.values(xmlData.bootstrapData?.index), 'name');
+        }
+        else {
+            const newIndexProp = (0, sdk_build_core_1.getOrCreatePropertyAssignment)(args, 'index', '[]');
+            newIndexProp.setInitializer((0, sdk_build_core_1.stringify)(xmlData.bootstrapData.index));
+        }
+    }
+    else {
+        const indexProp = (0, sdk_build_core_1.getPropertyAssignment)(args, 'index');
+        if (indexProp) {
+            indexProp.remove();
+        }
+    }
+}
 function generateCallExpressionExportForDocument(context, info, fn, ...args) {
     const { sourceFile, moduleSpecifier } = info;
     return (0, sdk_build_core_1.generateCallExpressionExport)(context, sourceFile, moduleSpecifier, info.exportName, fn, ...args);
@@ -848,7 +860,7 @@ function compose(bootstrapData) {
         read_only: bootstrapData.read_only,
         audit: bootstrapData.audit,
         access: bootstrapData.accessible_from,
-        caller_access: exports.callerAccess.indexOf(bootstrapData.caller_access ?? 'none'),
+        caller_access: callerAccess.indexOf(bootstrapData.caller_access ?? 'none'),
         read_access: bootstrapData.actions?.includes('read'),
         update_access: bootstrapData.actions?.includes('update'),
         create_access: bootstrapData.actions?.includes('create'),
@@ -881,36 +893,118 @@ function mapNames(schema) {
     return schema;
 }
 let schemaPosition = 4;
-function transformColumns(incoming_schema, args) {
+function transformColumns(columns, incomingSchema, args) {
     const schemaProperty = (0, sdk_build_core_1.getOrCreatePropertyAssignment)(args, 'schema', '{}');
-    const schemaLiteral = schemaProperty.getChildrenOfKind(ts_morph_1.ts.SyntaxKind.ObjectLiteralExpression)[0];
+    const schemaLiteral = schemaProperty.getChildrenOfKind(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression)[0];
     if (!schemaLiteral) {
         return;
     }
-    const keys = Object.keys(incoming_schema ?? {});
+    const keys = Object.keys(columns ?? {});
     if (keys.length === 0) {
         return;
     }
     //TODO:: need to come up with a way to format script more accurately
     schemaPosition = schemaLiteral.getSourceFile().getLineAndColumnAtPos(schemaLiteral.getStart()).column;
-    const assignments = [];
+    const existingColumns = {};
+    schemaLiteral.getProperties().forEach((property) => {
+        const propertyAssignment = property.asKindOrThrow(sdk_project_1.ts.SyntaxKind.PropertyAssignment);
+        const name = propertyAssignment.getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.Identifier).getText();
+        const callExp = propertyAssignment.getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.CallExpression);
+        const callExpType = callExp.getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.Identifier).getText();
+        const objectLiteral = callExp.getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression);
+        existingColumns[name] = {
+            node: propertyAssignment,
+            type: callExpType,
+            objectLiteral,
+        };
+        if (!incomingSchema[name]) {
+            // Full bootstrap.xml does not have this existing column so remove it
+            (0, sdk_build_core_1.removeNode)(propertyAssignment);
+        }
+    });
     keys.forEach((key) => {
-        const data = incoming_schema[key];
-        const callExpFromType = getCallExpressionFromType(data.type);
-        const transformedColumn = transformColumnData(data, callExpFromType);
-        const callExp = generateColumnExpression(callExpFromType, {
-            ...transformedColumn,
-            choices: data.choice_elements,
-        });
-        assignments.push(ts_morph_1.ts.factory.createPropertyAssignment((0, sdk_build_core_1.createPropertyIdentifier)(data.name), callExp));
+        const partialData = columns[key];
+        if (!existingColumns[key]) {
+            // This column doesn't exist so let's make it
+            const callExpFromType = getCallExpressionFromType(partialData.type);
+            createNewColumn(schemaLiteral, callExpFromType.name, partialData);
+        }
+        else {
+            const existingColumn = existingColumns[key];
+            if (partialData.type && existingColumn.type !== partialData.type) {
+                // Switching the column type so regenerate the CallExpression and add all incoming data
+                (0, sdk_build_core_1.removeNode)(existingColumn.node);
+                const callExpFromType = getCallExpressionFromType(partialData.type);
+                createNewColumn(schemaLiteral, callExpFromType.name, incomingSchema[key]);
+            }
+            else {
+                // Update the existing column with changed data only
+                const transformedColumnData = transformColumnData(partialData, existingColumn.type);
+                (0, sdk_build_core_1.mergeDataIntoObjectLiteral)(existingColumn.objectLiteral, {
+                    ...transformedColumnData,
+                    choices: partialData.choice_elements,
+                });
+                removeChoicesIfNecessary(existingColumn, incomingSchema[key]);
+                removeAttributesIfNecessary(existingColumn, incomingSchema[key]);
+            }
+        }
+    });
+}
+function removeChoicesIfNecessary(existingColumn, columnFromBootstrap) {
+    const existingProperties = existingColumn.objectLiteral
+        .getProperties()
+        .reduce((a, v) => ({ ...a, [v.getName()]: v }), {});
+    if (!existingProperties['choices']) {
+        return;
+    }
+    if (!columnFromBootstrap['choice_elements']) {
+        (0, sdk_build_core_1.removeNode)(existingProperties['choices']);
+        return;
+    }
+    const choicesFromBootstrap = Object.keys(columnFromBootstrap['choice_elements']);
+    const existingChoices = existingProperties['choices']
+        .getFirstChildByKind(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression)
+        .getProperties()
+        .reduce((a, v) => ({ ...a, [v.getName()]: v }), {});
+    Object.keys(existingChoices).forEach((choice) => {
+        if (!choicesFromBootstrap.includes(choice)) {
+            (0, sdk_build_core_1.removeNode)(existingChoices[choice]);
+        }
     });
-    schemaLiteral.transform((traversal) => {
-        if (ts_morph_1.ts.isObjectLiteralExpression(traversal.currentNode)) {
-            return traversal.factory.updateObjectLiteralExpression(traversal.currentNode, assignments);
+}
+function removeAttributesIfNecessary(existingColumn, columnFromBootstrap) {
+    const existingProperties = existingColumn.objectLiteral
+        .getProperties()
+        .reduce((a, v) => ({ ...a, [v.getName()]: v }), {});
+    if (!existingProperties['attributes']) {
+        return;
+    }
+    if (!columnFromBootstrap['attributes']) {
+        (0, sdk_build_core_1.removeNode)(existingProperties['attributes']);
+        return;
+    }
+    const attributesFromBootstrap = Object.keys(columnFromBootstrap['attributes']);
+    const existingChoices = existingProperties['attributes']
+        .getFirstChildByKind(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression)
+        .getProperties()
+        .reduce((a, v) => ({ ...a, [v.getName()]: v }), {});
+    Object.keys(existingChoices).forEach((choice) => {
+        if (!(choice in attributesFromBootstrap)) {
+            (0, sdk_build_core_1.removeNode)(existingChoices[choice]);
         }
-        return traversal.currentNode;
     });
 }
+function createNewColumn(schemaLiteral, callExpName, data) {
+    const propertyAssignment = schemaLiteral.addPropertyAssignment({
+        name: data.name,
+        initializer: `${callExpName}({})`,
+    });
+    const objectLiteral = propertyAssignment
+        .getInitializer()
+        .getFirstChildByKindOrThrow(sdk_project_1.ts.SyntaxKind.ObjectLiteralExpression);
+    const transformedColumnData = transformColumnData(data, callExpName);
+    (0, sdk_build_core_1.mergeDataIntoObjectLiteral)(objectLiteral, { ...transformedColumnData, choices: data.choice_elements });
+}
 function getActionsArray(data) {
     const actions = [];
     if (data.read_access) {
@@ -931,12 +1025,19 @@ function getDynamicDefault(val) {
     if (!val) {
         return;
     }
-    return val.startsWith('javascript:') ? val : `javascript:${exports.dynamic_value_mapping[val]}`;
+    return val.startsWith('javascript:') ? val : `javascript:${dynamic_value_mapping[val]}`;
 }
 function buildIndexes(indexes = [], collection) {
     indexes.forEach((index) => {
         const indexElement = collection.ele('index', { name: index.name, unique: index.unique });
-        indexElement.ele('element', { name: index.element });
+        if ((0, lodash_1.isArray)(index.element)) {
+            index.element.forEach((element) => {
+                indexElement.ele('element', { name: element });
+            });
+        }
+        else {
+            indexElement.ele('element', { name: index.element });
+        }
     });
 }
 function buildChoices(column, element) {
@@ -974,9 +1075,9 @@ function buildChoices(column, element) {
 function transformColumnData(col, callExpFromType) {
     const { type: internal_type, choice, name, virtual, display, choice_table, choice_field, use_dependent_field, dependent, calculation, use_dynamic_default, default_value, choice_elements, table, default: def, max_length, reference, reference_cascade_rule, function_field, ...column } = col;
     if (max_length !== undefined) {
-        column.maxLength = max_length;
+        column.maxLength = (0, lodash_1.parseInt)(max_length, 10);
     }
-    if (internal_type && (callExpFromType.entityKind === 'generic' || callExpFromType.name === 'GenericColumn')) {
+    if (internal_type && callExpFromType === 'GenericColumn') {
         column.column_type = internal_type;
     }
     if (choice !== undefined) {
@@ -1057,7 +1158,7 @@ function SysNumber(category, maximum_digits, number, prefix) {
     });
 }
 // TODO should this reference sys_filter_option_dynamic instead?
-exports.dynamic_value_mapping = {
+const dynamic_value_mapping = {
     'Current Name': `current.name`,
     'Next ECC Sequence Number': `GlideCounter.next('ecc:sequence');`,
     'Get Module View': `var viewDefault='';if(current.device_type=='mobile') viewDefault='Mobile';else if(!current.application.nil() && current.application.device_type=='mobile' && current.device_type.nil()) viewDefault='Mobile';viewDefault`,
@@ -1086,28 +1187,28 @@ function generateColumnExpression(expression, args, argsSetIfDefined) {
             }
         });
     }
-    return ts_morph_1.ts.factory.createCallExpression(ts_morph_1.ts.factory.createIdentifier(expression.name), undefined, [
+    return sdk_project_1.tsc.factory.createCallExpression(sdk_project_1.tsc.factory.createIdentifier(expression.name), undefined, [
         createObjectExpression(setArgs),
     ]);
 }
 function createObjectExpression(firstArg) {
-    return ts_morph_1.ts.factory.createObjectLiteralExpression(Object.entries(firstArg)
+    return sdk_project_1.tsc.factory.createObjectLiteralExpression(Object.entries(firstArg)
         .filter(([_key, value]) => value !== undefined)
         .map(([key, value]) => {
         if (key === 'referenceTable') {
-            return ts_morph_1.ts.factory.createPropertyAssignment(ts_morph_1.ts.factory.createIdentifier('referenceTable'), ts_morph_1.ts.factory.createStringLiteral(value));
+            return sdk_project_1.tsc.factory.createPropertyAssignment(sdk_project_1.tsc.factory.createIdentifier('referenceTable'), sdk_project_1.tsc.factory.createStringLiteral(value));
         }
         else if (key === 'calculated_value') {
             const calVal = `${os.EOL}${(0, ScriptTemplatePlugin_1.formatScript)(value, schemaPosition)}`;
-            return ts_morph_1.ts.factory.createPropertyAssignment(ts_morph_1.ts.factory.createIdentifier(key), ts_morph_1.ts.factory.createTaggedTemplateExpression(ts_morph_1.ts.factory.createIdentifier('script'), undefined, ts_morph_1.ts.factory.createNoSubstitutionTemplateLiteral(calVal, calVal)));
+            return sdk_project_1.tsc.factory.createPropertyAssignment(sdk_project_1.tsc.factory.createIdentifier(key), sdk_project_1.tsc.factory.createTaggedTemplateExpression(sdk_project_1.tsc.factory.createIdentifier('script'), undefined, sdk_project_1.tsc.factory.createNoSubstitutionTemplateLiteral(calVal, calVal)));
         }
         else if (key === 'maxLength') {
             if (isNaN(+value)) {
-                return ts_morph_1.ts.factory.createPropertyAssignment(ts_morph_1.ts.factory.createIdentifier(key), ts_morph_1.ts.factory.createAsExpression(ts_morph_1.ts.factory.createStringLiteral(value), ts_morph_1.ts.factory.createKeywordTypeNode(ts_morph_1.ts.SyntaxKind.AnyKeyword)));
+                return sdk_project_1.tsc.factory.createPropertyAssignment(sdk_project_1.tsc.factory.createIdentifier(key), sdk_project_1.tsc.factory.createAsExpression(sdk_project_1.tsc.factory.createStringLiteral(value), sdk_project_1.tsc.factory.createKeywordTypeNode(sdk_project_1.ts.SyntaxKind.AnyKeyword)));
             }
-            return ts_morph_1.ts.factory.createPropertyAssignment(ts_morph_1.ts.factory.createIdentifier(key), ts_morph_1.ts.factory.createNumericLiteral(value));
+            return sdk_project_1.tsc.factory.createPropertyAssignment(sdk_project_1.tsc.factory.createIdentifier(key), sdk_project_1.tsc.factory.createNumericLiteral(value));
         }
-        return ts_morph_1.ts.factory.createPropertyAssignment((0, sdk_build_core_1.createPropertyIdentifier)(key), factoryCreateValue(value, ts_morph_1.ts.factory));
+        return sdk_project_1.tsc.factory.createPropertyAssignment((0, sdk_build_core_1.createPropertyIdentifier)(key), factoryCreateValue(value, sdk_project_1.tsc.factory));
     }));
 }
 function factoryCreateValue(value, factory) {
@@ -1119,7 +1220,7 @@ function factoryCreateValue(value, factory) {
             return factory.createNumericLiteral(value);
         }
         else {
-            return factory.createPrefixUnaryExpression(ts_morph_1.ts.SyntaxKind.MinusToken, factory.createNumericLiteral(Math.abs(value)));
+            return factory.createPrefixUnaryExpression(sdk_project_1.tsc.SyntaxKind.MinusToken, factory.createNumericLiteral(Math.abs(value)));
         }
     }
     if (typeof value === 'boolean') {
@@ -1136,7 +1237,7 @@ function factoryCreateValue(value, factory) {
             });
             return factory.createArrayLiteralExpression(newvals);
         }
-        else if (ts_morph_1.Structure.isImportSpecifier(value)) {
+        else if (sdk_project_1.ts.Structure.isImportSpecifier(value)) {
             return factory.createIdentifier(value['name']);
         }
         else {