@servicenow/sdk-build-plugins 2.0.1 → 2.1.1

package/dist/ServerModulePlugin.js

@@ -0,0 +1,231 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleFunctionData = exports.ModuleEntityData = void 0;
+const sdk_build_core_1 = require("@servicenow/sdk-build-core");
+const sdk_project_1 = require("@servicenow/sdk-project");
+const pathModule = __importStar(require("path"));
+const ts_morph_1 = require("ts-morph");
+class ModuleEntityData extends sdk_build_core_1.EntityData {
+    constructor(content, file, context) {
+        const { scope } = context.app.config;
+        const { name: packageName, version } = context.app.package;
+        const relativePath = pathModule.relative(context.app.rootDir, pathModule.normalize(file.getFilePath()));
+        const mappedPath = applyModulePathMappings(relativePath, context);
+        const path = pathModule.join(scope, packageName, version, mappedPath);
+        super('module', context.registerExplicitId('sys_module', mappedPath.replaceAll(/[./\\]/g, '_')), new sdk_build_core_1.ObjectData({
+            path: new sdk_build_core_1.StringData(path, file),
+            content: new sdk_build_core_1.StringData(content, file),
+        }, file), file);
+    }
+}
+exports.ModuleEntityData = ModuleEntityData;
+class ModuleFunctionData extends sdk_build_core_1.ObjectData {
+    constructor(name, module, node) {
+        super({
+            exportName: new sdk_build_core_1.StringData(name, node),
+            modulePath: new sdk_build_core_1.StringData(module.getPropertyOrThrow('path', 'string').getValue(), node),
+            isDefault: new sdk_build_core_1.BooleanData(node.isDefaultExport(), node),
+        }, node);
+    }
+    getGlueCode(callExpressionProvider) {
+        return ModuleFunctionData.getGlueCode(this, callExpressionProvider);
+    }
+    static getGlueCode(scriptData, callExpressionProvider) {
+        if (sdk_build_core_1.Data.isString(scriptData)) {
+            return scriptData.getValue();
+        }
+        else if (!scriptData) {
+            return '';
+        }
+        scriptData = scriptData instanceof ModuleFunctionData ? scriptData.getValue() : scriptData;
+        if (scriptData instanceof sdk_build_core_1.Data) {
+            throw new Error(`Unsupported script data type: ${scriptData.getNode().getText()}`);
+        }
+        const { exportName, modulePath, isDefault } = scriptData;
+        return isDefault
+            ? `const ${exportName} = require('${modulePath}').default;\n${callExpressionProvider(exportName)};`
+            : `const { ${exportName} } = require('${modulePath}');\n${callExpressionProvider(exportName)};`;
+    }
+}
+exports.ModuleFunctionData = ModuleFunctionData;
+function applyModulePathMappings(path, context) {
+    const { modulePaths } = context.app.config;
+    if (!modulePaths) {
+        return path;
+    }
+    // TODO: Naive implementation for now that just supports simple patterns. We can explore supporting more complex patterns later.
+    for (const [source, target] of Object.entries(modulePaths)) {
+        const match = path.match(source.replace(/\*+/, '(.*)'))?.[1];
+        if (match !== undefined) {
+            return target.replace(/\*+/, match);
+        }
+    }
+    return path;
+}
+/**
+ * Removes invalid control characters that would cause XML parsing errors.
+ * Regex taken from: https://github.com/oozcitak/xmlbuilder-js/blob/b20136cd1591d0f17ab2f184053c7150150428b2/src/XMLStringifier.coffee#L119C15-L119C127
+ */
+function removeInvalidControlCharacters(content) {
+    return content.replace(
+    // eslint-disable-next-line no-control-regex
+    /[\0-\x08\x0B\f\x0E-\x1F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/g, '');
+}
+/**
+ * If the code contains the character sequence ']]>' it will be parsed as the end of
+ * the CDATA section. To avoid this, we need to split the sequence by dividing the
+ * content into two CDATA sections at that point.
+ */
+function sanitizeNestedCdataTags(content) {
+    return content.replace(/]]>/g, ']]]]><![CDATA[>');
+}
+function sanitizeModuleContent(content) {
+    return sanitizeNestedCdataTags(removeInvalidControlCharacters(content));
+}
+function extractFunctionDeclaration(node, context) {
+    const result = context.extractEntities(node.getSourceFile());
+    if (!result.handled) {
+        return result;
+    }
+    const module = result.data[0];
+    if (!(module instanceof ModuleEntityData)) {
+        return { handled: false };
+    }
+    const name = node.getName() ?? 'functionModule';
+    if (!name) {
+        return {
+            handled: true,
+            data: [],
+            diagnostics: [new sdk_build_core_1.FluentDiagnostic(node, 'Function declaration must have a name')],
+        };
+    }
+    return {
+        handled: true,
+        diagnostics: [],
+        data: [new ModuleFunctionData(name, module, node)],
+    };
+}
+function getEmitOutput(file) {
+    const path = pathModule.normalize(file.getFilePath());
+    if (!path.endsWith('.ts')) {
+        return file.getFullText();
+    }
+    const project = new ts_morph_1.Project({
+        // TODO: Use the project's local tsconfig.json if there is one
+        compilerOptions: {
+            target: ts_morph_1.ScriptTarget.ES2022,
+            module: ts_morph_1.ModuleKind.ES2022,
+            declaration: false,
+            sourceMap: false,
+        },
+    });
+    const emitResult = project
+        .createSourceFile('module.ts', file.getFullText(), { overwrite: true, scriptKind: ts_morph_1.ScriptKind.TS })
+        .getEmitOutput();
+    const diagnostics = emitResult
+        .getDiagnostics()
+        .map((d) => new sdk_project_1.TypeScriptDiagnostic(d))
+        .filter((d) => d.level === sdk_project_1.Diagnostic.Level.Error);
+    if (diagnostics.length > 0) {
+        return diagnostics;
+    }
+    const output = emitResult.getOutputFiles()[0];
+    if (!output) {
+        return [new sdk_build_core_1.FluentDiagnostic(file, `Failed to get emit output for module: ${path}`)];
+    }
+    return output.getText();
+}
+exports.default = (0, sdk_build_core_1.Plugin)({
+    name: 'ServerModule',
+    extractors: {
+        raw: {
+            module: {
+                FunctionDeclaration: extractFunctionDeclaration,
+                FunctionExpression(node, context) {
+                    const parent = node.getParentIfKind(ts_morph_1.SyntaxKind.VariableDeclaration);
+                    if (!parent) {
+                        return { handled: false };
+                    }
+                    return extractFunctionDeclaration(parent, context);
+                },
+            },
+        },
+        entity: {
+            module: {
+                SourceFile(file, context) {
+                    const path = pathModule.normalize(file.getFilePath());
+                    if (path === pathModule.normalize(context.getKeysSourceFile().getFilePath())) {
+                        return { handled: false };
+                    }
+                    const content = getEmitOutput(file);
+                    if (Array.isArray(content)) {
+                        return {
+                            handled: true,
+                            data: [],
+                            diagnostics: content,
+                        };
+                    }
+                    return {
+                        handled: true,
+                        diagnostics: [],
+                        data: [new ModuleEntityData(content, file, context)],
+                    };
+                },
+            },
+        },
+    },
+    composers: {
+        entity: {
+            module(module) {
+                return {
+                    kind: 'module',
+                    guid: module.getGuid(),
+                    node: module.getNode(),
+                    data: module.getValue(),
+                };
+            },
+        },
+    },
+    serializers: {
+        module(module, context) {
+            const { path, content } = module.data;
+            return {
+                name: `sys_module_${module.guid}.xml`,
+                directory: 'update',
+                content: `<?xml version="1.0"?>
+<record_update>
+  <sys_module action="INSERT_OR_UPDATE">
+    <sys_scope>${context.app.config.scopeId}</sys_scope>
+    <path>${path}</path>
+    <external_source>false</external_source>
+    <content><![CDATA[${sanitizeModuleContent(content)}]]></content>
+  </sys_module>
+</record_update>`,
+            };
+        },
+    },
+});
+//# sourceMappingURL=ServerModulePlugin.js.map

package/dist/ServerModulePlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerModulePlugin.js","sourceRoot":"","sources":["../src/ServerModulePlugin.ts"],"names":[],"mappings":"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"}

package/dist/UserPreferencePlugin.d.ts

@@ -1,3 +1,4 @@
+import { EntityData } from '@servicenow/sdk-build-core';
 import { Diagnostic } from '@servicenow/sdk-project';
 import { Record } from '@servicenow/sdk-core/runtime/db';
 declare const _default: {
@@ -9,7 +10,9 @@ declare const _default: {
     };
     readonly extractors: {
         readonly entity: {
-            readonly CallExpression: (node: import("ts-morph").CallExpression<import("ts-morph").ts.CallExpression>, context: import("@servicenow/sdk-build-core").Context) => import("@servicenow/sdk-build-core").ExtractionResult<import("@servicenow/sdk-build-core").EntityData<Record<"sys_user_preference">>>;
+            readonly fluent: {
+                readonly CallExpression: (node: import("ts-morph").CallExpression<import("ts-morph").ts.CallExpression>, context: import("@servicenow/sdk-build-core").Context) => import("@servicenow/sdk-build-core").ExtractionResult<EntityData<Record<keyof Now.Internal.Tables>>>;
+            };
         };
     };
 };

package/dist/UserPreferencePlugin.js

@@ -4,17 +4,17 @@ const app_1 = require("@servicenow/sdk-core/runtime/app");
 const sdk_build_core_1 = require("@servicenow/sdk-build-core");
 const RecordPlugin_1 = require("./db/RecordPlugin");
 const sdk_project_1 = require("@servicenow/sdk-project");
-const db_1 = require("@servicenow/sdk-core/runtime/db");
-function asRecord(config) {
-    const { $id, value, ...rest } = app_1.UserPreferenceSchema.parse(config);
-    return (0, db_1.Record)({
-        table: 'sys_user_preference',
+function asRecord(entity) {
+    const node = entity.getNode();
+    const { $id, value, ...rest } = entity.getProperties();
+    return new sdk_build_core_1.ObjectData({
+        table: new sdk_build_core_1.StringData('sys_user_preference', node),
         $id,
-        data: {
+        data: new sdk_build_core_1.ObjectData({
             ...rest,
-            value: `${value}`, // TODO: Should be allowed to assign non-strings to string columns
-        },
-    });
+            value: new sdk_build_core_1.StringData(value.getValue().toString(), value.getNode()),
+        }, node),
+    }, node);
 }
 exports.default = (0, sdk_build_core_1.Plugin)({
     name: 'UserPreference',
@@ -23,7 +23,9 @@ exports.default = (0, sdk_build_core_1.Plugin)({
     },
     extractors: {
         entity: {
-            CallExpression: (node, context) => (0, RecordPlugin_1.extractCallExpressionAsRecord)(app_1.UserPreference, asRecord, (pref) => context.registerExplicitId('sys_user_preference', pref.$id), node, context),
+            fluent: {
+                CallExpression: (node, context) => (0, RecordPlugin_1.extractCallExpressionAsRecord)(app_1.UserPreference, asRecord, (pref) => context.registerExplicitId('sys_user_preference', pref.$id), node, context),
+            },
         },
     },
 });

package/dist/UserPreferencePlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserPreferencePlugin.js","sourceRoot":"","sources":["../src/UserPreferencePlugin.ts"],"names":[],"mappings":";;AAAA,0DAA6G;AAC7G,+DAAmD;AACnD,oDAAiE;AACjE,yDAAoD;AACpD,wDAAwD;AAExD,SAAS,QAAQ,CAAC,MAA4B;IAC1C,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,0BAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAClE,OAAO,IAAA,WAAM,EAAC;QACV,KAAK,EAAE,qBAAqB;QAC5B,GAAG;QACH,IAAI,EAAE;YACF,GAAG,IAAI;YACP,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,kEAAkE;SACxF;KACJ,CAAC,CAAA;AACN,CAAC;AAED,kBAAe,IAAA,uBAAM,EAAC;IAClB,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE;QACT,mBAAmB,EAAE,EAAE,eAAe,EAAE,wBAAU,CAAC,KAAK,CAAC,IAAI,EAAE;KAClE;IACD,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAC9B,IAAA,4CAA6B,EACzB,oBAAc,EACd,QAAQ,EACR,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,IAAI,CAAC,GAAa,CAAC,EAC/E,IAAI,EACJ,OAAO,CACV;SACR;KACJ;CACJ,CAAC,CAAA"}
+{"version":3,"file":"UserPreferencePlugin.js","sourceRoot":"","sources":["../src/UserPreferencePlugin.ts"],"names":[],"mappings":";;AAAA,0DAAuF;AACvF,+DAAuF;AACvF,oDAAiE;AACjE,yDAAoD;AAGpD,SAAS,QAAQ,CAAC,MAAwC;IACtD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;IAC7B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,aAAa,EAAE,CAAA;IACtD,OAAO,IAAI,2BAAU,CACjB;QACI,KAAK,EAAE,IAAI,2BAAU,CAAC,qBAAqB,EAAE,IAAI,CAAC;QAClD,GAAG;QACH,IAAI,EAAE,IAAI,2BAAU,CAChB;YACI,GAAG,IAAI;YACP,KAAK,EAAE,IAAI,2BAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACtE,EACD,IAAI,CACP;KACJ,EACD,IAAI,CACP,CAAA;AACL,CAAC;AAED,kBAAe,IAAA,uBAAM,EAAC;IAClB,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE;QACT,mBAAmB,EAAE,EAAE,eAAe,EAAE,wBAAU,CAAC,KAAK,CAAC,IAAI,EAAE;KAClE;IACD,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,MAAM,EAAE;gBACJ,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAC9B,IAAA,4CAA6B,EACzB,oBAAc,EACd,QAAQ,EACR,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,IAAI,CAAC,GAAa,CAAC,EAC/E,IAAI,EACJ,OAAO,CACV;aACR;SACJ;KACJ;CACJ,CAAC,CAAA"}

package/dist/aclAndRole/AclPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Acl } from '@servicenow/sdk-core/runtime/app';
-import { Context, FluentDiagnostic, EntityData, ObjectData } from '@servicenow/sdk-build-core';
+import { FluentDiagnostic, EntityData } from '@servicenow/sdk-build-core';
 import { Record as DBRecord } from '@servicenow/sdk-core/runtime/db';
 import * as ts from 'ts-morph';
 import { Diagnostic } from '@servicenow/sdk-project';
@@ -12,74 +12,48 @@ declare const _default: {
     };
     readonly extractors: {
         readonly entity: {
-            readonly CallExpression: (node: ts.CallExpression<ts.ts.CallExpression>, context: Context) => {
-                handled: false;
-            } | {
-                handled: true;
-                data: EntityData<Acl<keyof Now.Internal.Tables>>[];
-                diagnostics: FluentDiagnostic[];
-            } | {
-                handled: true;
-                diagnostics: FluentDiagnostic[];
-                data: (EntityData<{
-                    readonly table: "sys_security_acl_role";
-                    readonly $id: string;
-                    readonly data: {
-                        readonly sys_security_acl: string;
-                        readonly sys_user_role: string;
-                    };
-                }> | EntityData<{
-                    data: {
-                        script: string;
-                        name: string;
-                        active: boolean;
-                        type: string;
-                        operation: string;
-                        decision_type: "allow" | "deny";
-                        description: string;
-                        local_or_existing: "Local" | "Existing";
-                        admin_overrides: boolean;
-                        advanced: boolean;
-                        condition: string;
-                        applies_to: string;
-                        security_attribute: string | DBRecord<"sys_security_attribute">;
-                    };
-                    table: "sys_security_acl";
-                    $id: any;
-                }>)[];
-            };
-        };
-        readonly raw: {
-            readonly FunctionDeclaration: (node: ts.FunctionDeclaration, context: Context) => {
-                handled: false;
-                diagnostics?: never;
-                data?: never;
-            } | {
-                handled: true;
-                diagnostics: never[];
-                data: ObjectData<{
-                    readonly filePath: string;
-                    readonly functionName: string | undefined;
-                    readonly isDefault: boolean;
-                }>[];
-            };
-            readonly FunctionExpression: (node: ts.FunctionExpression, context: Context) => {
-                handled: false;
-                diagnostics?: never;
-                data?: never;
-            } | {
-                handled: true;
-                diagnostics: never[];
-                data: ObjectData<{
-                    readonly filePath: string;
-                    readonly functionName: string | undefined;
-                    readonly isDefault: boolean;
-                }>[];
+            readonly fluent: {
+                readonly CallExpression: (node: ts.CallExpression<ts.ts.CallExpression>, context: import("@servicenow/sdk-build-core").Context) => {
+                    handled: false;
+                } | {
+                    handled: true;
+                    data: EntityData<Acl<keyof Now.Internal.Tables>>[];
+                    diagnostics: FluentDiagnostic[];
+                } | {
+                    handled: true;
+                    diagnostics: FluentDiagnostic[];
+                    data: (EntityData<{
+                        readonly table: "sys_security_acl_role";
+                        readonly $id: string;
+                        readonly data: {
+                            readonly sys_security_acl: string;
+                            readonly sys_user_role: string;
+                        };
+                    }> | EntityData<{
+                        data: {
+                            script: string;
+                            name: string;
+                            active: boolean;
+                            type: string;
+                            operation: string;
+                            decision_type: "allow" | "deny";
+                            description: string;
+                            local_or_existing: "Local" | "Existing";
+                            admin_overrides: boolean;
+                            advanced: boolean;
+                            condition: string;
+                            applies_to: string;
+                            security_attribute: string | DBRecord<"sys_security_attribute">;
+                        };
+                        table: "sys_security_acl";
+                        $id: any;
+                    }>)[];
+                };
             };
         };
     };
     readonly arrangers: {
-        readonly record: (document: import("@servicenow/sdk-build-core").Document<"record">, context: Context) => {
+        readonly record: (document: import("@servicenow/sdk-build-core").Document<string>, context: import("@servicenow/sdk-build-core").Context) => {
             handled: false;
             result?: never;
         } | {
@@ -91,26 +65,14 @@ declare const _default: {
         };
     };
     readonly generators: {
-        readonly record: (document: import("@servicenow/sdk-build-core").UnlinkedDocument<"record"> & import("@servicenow/sdk-build-core").Arranged, context: Context, linkedDocuments: import("@servicenow/sdk-build-core").LinkedDocument[]) => import("@servicenow/sdk-build-core").LinkedDocument<"record", ts.CallExpression<ts.ts.CallExpression>> | {
-            node: (ts.CallExpression<ts.ts.CallExpression> | ts.Node<ts.ts.EndOfFileToken> | ts.TypeAliasDeclaration | ts.TypeReferenceNode | ts.TypeLiteralNode | ts.PropertySignature | ts.TupleTypeNode | ts.FunctionExpression | ts.FunctionDeclaration | ts.ArrayLiteralExpression | ts.StringLiteral | ts.NumericLiteral | ts.TrueLiteral | ts.FalseLiteral | ts.Identifier | ts.SourceFile | ts.VariableDeclaration | ts.ClassDeclaration | ts.ExportDeclaration | ts.ObjectLiteralExpression | ts.AsExpression | ts.ComputedPropertyName | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.PropertyAccessExpression<ts.ts.PropertyAccessExpression> | ts.NoSubstitutionTemplateLiteral | ts.ExpressionStatement | ts.TaggedTemplateExpression | ts.ExportAssignment | ts.ElementAccessExpression<ts.ts.ElementAccessExpression> | ts.TemplateExpression | ts.ImportClause | ts.ImportSpecifier | ts.ImportDeclaration | ts.NamedImports | ts.VariableStatement | ts.VariableDeclarationList | ts.Node<ts.ts.PlusToken> | ts.Node<ts.ts.ExportKeyword> | ts.Node<ts.ts.KeywordTypeNode<ts.ts.SyntaxKind.AnyKeyword>> | ts.ModuleDeclaration | ts.ModuleBlock | ts.Block | ts.ParameterDeclaration | ts.Node<ts.ts.EqualsGreaterThanToken> | ts.ArrowFunction | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateSpan | ts.TemplateTail | ts.PrefixUnaryExpression | undefined) & (ts.CallExpression<ts.ts.CallExpression> | ts.Node<ts.ts.EndOfFileToken> | ts.TypeAliasDeclaration | ts.TypeReferenceNode | ts.TypeLiteralNode | ts.PropertySignature | ts.TupleTypeNode | ts.FunctionExpression | ts.FunctionDeclaration | ts.ArrayLiteralExpression | ts.StringLiteral | ts.NumericLiteral | ts.TrueLiteral | ts.FalseLiteral | ts.Identifier | ts.SourceFile | ts.VariableDeclaration | ts.ClassDeclaration | ts.ExportDeclaration | ts.ObjectLiteralExpression | ts.AsExpression | ts.ComputedPropertyName | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.PropertyAccessExpression<ts.ts.PropertyAccessExpression> | ts.NoSubstitutionTemplateLiteral | ts.ExpressionStatement | ts.TaggedTemplateExpression | ts.ExportAssignment | ts.ElementAccessExpression<ts.ts.ElementAccessExpression> | ts.TemplateExpression | ts.ImportClause | ts.ImportSpecifier | ts.ImportDeclaration | ts.NamedImports | ts.VariableStatement | ts.VariableDeclarationList | ts.Node<ts.ts.PlusToken> | ts.Node<ts.ts.ExportKeyword> | ts.Node<ts.ts.KeywordTypeNode<ts.ts.SyntaxKind.AnyKeyword>> | ts.ModuleDeclaration | ts.ModuleBlock | ts.Block | ts.ParameterDeclaration | ts.Node<ts.ts.EqualsGreaterThanToken> | ts.ArrowFunction | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateSpan | ts.TemplateTail | ts.PrefixUnaryExpression);
-            data: unknown;
-            kind: "record";
-            guid: string;
-            changedData?: unknown;
-            xmlData?: unknown;
-            action?: import("@servicenow/sdk-build-core").Action;
-            parent?: import("@servicenow/sdk-build-core").Document<string, ts.CallExpression<ts.ts.CallExpression> | ts.Node<ts.ts.EndOfFileToken> | ts.TypeAliasDeclaration | ts.TypeReferenceNode | ts.TypeLiteralNode | ts.PropertySignature | ts.TupleTypeNode | ts.FunctionExpression | ts.FunctionDeclaration | ts.ArrayLiteralExpression | ts.StringLiteral | ts.NumericLiteral | ts.TrueLiteral | ts.FalseLiteral | ts.Identifier | ts.SourceFile | ts.VariableDeclaration | ts.ClassDeclaration | ts.ExportDeclaration | ts.ObjectLiteralExpression | ts.AsExpression | ts.ComputedPropertyName | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.PropertyAccessExpression<ts.ts.PropertyAccessExpression> | ts.NoSubstitutionTemplateLiteral | ts.ExpressionStatement | ts.TaggedTemplateExpression | ts.ExportAssignment | ts.ElementAccessExpression<ts.ts.ElementAccessExpression> | ts.TemplateExpression | ts.ImportClause | ts.ImportSpecifier | ts.ImportDeclaration | ts.NamedImports | ts.VariableStatement | ts.VariableDeclarationList | ts.Node<ts.ts.PlusToken> | ts.Node<ts.ts.ExportKeyword> | ts.Node<ts.ts.KeywordTypeNode<ts.ts.SyntaxKind.AnyKeyword>> | ts.ModuleDeclaration | ts.ModuleBlock | ts.Block | ts.ParameterDeclaration | ts.Node<ts.ts.EqualsGreaterThanToken> | ts.ArrowFunction | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateSpan | ts.TemplateTail | ts.PrefixUnaryExpression> & {
-                entity?: EntityData;
-                node: ts.CallExpression<ts.ts.CallExpression> | ts.Node<ts.ts.EndOfFileToken> | ts.TypeAliasDeclaration | ts.TypeReferenceNode | ts.TypeLiteralNode | ts.PropertySignature | ts.TupleTypeNode | ts.FunctionExpression | ts.FunctionDeclaration | ts.ArrayLiteralExpression | ts.StringLiteral | ts.NumericLiteral | ts.TrueLiteral | ts.FalseLiteral | ts.Identifier | ts.SourceFile | ts.VariableDeclaration | ts.ClassDeclaration | ts.ExportDeclaration | ts.ObjectLiteralExpression | ts.AsExpression | ts.ComputedPropertyName | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.PropertyAccessExpression<ts.ts.PropertyAccessExpression> | ts.NoSubstitutionTemplateLiteral | ts.ExpressionStatement | ts.TaggedTemplateExpression | ts.ExportAssignment | ts.ElementAccessExpression<ts.ts.ElementAccessExpression> | ts.TemplateExpression | ts.ImportClause | ts.ImportSpecifier | ts.ImportDeclaration | ts.NamedImports | ts.VariableStatement | ts.VariableDeclarationList | ts.Node<ts.ts.PlusToken> | ts.Node<ts.ts.ExportKeyword> | ts.Node<ts.ts.KeywordTypeNode<ts.ts.SyntaxKind.AnyKeyword>> | ts.ModuleDeclaration | ts.ModuleBlock | ts.Block | ts.ParameterDeclaration | ts.Node<ts.ts.EqualsGreaterThanToken> | ts.ArrowFunction | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateSpan | ts.TemplateTail | ts.PrefixUnaryExpression;
-            } & import("@servicenow/sdk-build-core").Arranged<"resolved">;
-        } | undefined;
+        readonly record: (document: any, context: any, linkedDocuments: any) => any;
     };
     readonly transformers: {
         readonly record: {
             readonly CallExpression: (document: import("@servicenow/sdk-build-core").Document<any, ts.CallExpression<ts.ts.CallExpression>> & {
                 entity?: EntityData;
                 node: ts.CallExpression<ts.ts.CallExpression>;
-            } & import("@servicenow/sdk-build-core").Arranged, context: Context) => boolean;
+            } & import("@servicenow/sdk-build-core").Arranged, context: import("@servicenow/sdk-build-core").Context) => boolean;
         };
     };
 };

package/dist/aclAndRole/AclPlugin.js

@@ -32,6 +32,7 @@ const ts = __importStar(require("ts-morph"));
 const app_2 = require("@servicenow/sdk-core/runtime/app");
 const ScriptTemplatePlugin_1 = require("../ScriptTemplatePlugin");
 const sdk_project_1 = require("@servicenow/sdk-project");
+const ServerModulePlugin_1 = require("../ServerModulePlugin");
 const ExecuteOnlyTypes = new Set([
     'client_callable_flow_object',
     'client_callable_script_include',
@@ -47,8 +48,8 @@ function aclAsRecord(config) {
     if (!name) {
         throw new Error(`ACL of type ${config.type} and $id '${config.$id}' has no name or associated table`);
     }
-    if (config.operation === 'execute' && !ExecuteOnlyTypes.has(config.type)) {
-        throw new Error(`ACL ${name} cannot use operation 'execute', because it is of type '${config.type}'`);
+    if (config.operation !== 'execute' && ExecuteOnlyTypes.has(config.type)) {
+        throw new Error(`ACL ${name} must use operation 'execute', because it is of type '${config.type}'`);
     }
     if (config.script && config.type === 'graphql') {
         throw new Error(`ACL ${name} does not support scripts, because it is of type ${config.type}`);
@@ -88,58 +89,45 @@ exports.default = (0, sdk_build_core_1.Plugin)({
     },
     extractors: {
         entity: {
-            CallExpression(node, context) {
-                const result = (0, sdk_build_core_1.extractCallExpression)(app_1.Acl, 'record', node, context, (acl) => context.registerExplicitId('sys_security_acl', acl.$id));
-                if (!result.handled || !(0 in result.data)) {
-                    return result;
-                }
-                const acl = result.data[0];
-                const scriptVal = getScript(acl, context);
-                const aclRecord = aclAsRecord(acl.getValue());
-                const m2mRoleToAcl = acl
-                    .getProperty('roles')
-                    ?.getValue()
-                    ?.map((role) => {
-                    const roleId = typeof role === 'string' ? role : role.$id;
-                    const aclId = context.keys.registerExplicitId('sys_security_acl', aclRecord.$id);
-                    const roleSysId = typeof role === 'string' ? role : context.registerExplicitId('sys_user_role', role.$id);
-                    const guid = context.keys.registerCompositeId('sys_security_acl_role', {
-                        sys_security_acl: aclRecord.$id,
-                        sys_user_role: roleId,
-                    });
-                    return new sdk_build_core_1.EntityData('record', guid, sdk_build_core_1.ObjectData.fromObjectValue((0, db_1.Record)({
-                        table: 'sys_security_acl_role',
-                        $id: guid,
-                        data: {
-                            sys_security_acl: aclId,
-                            sys_user_role: roleSysId,
-                        },
-                    }), node), node);
-                }) || [];
-                const diagnostics = performDiagnosticChecksOnSecurityAttribute(node, acl.getValue(), m2mRoleToAcl, context.mode);
-                const aclWithScript = { ...aclRecord, data: { ...aclRecord.data, script: scriptVal || '' } };
-                const aclEntityData = new sdk_build_core_1.EntityData('record', acl.getGuid(), sdk_build_core_1.ObjectData.fromObjectValue(aclWithScript, node), node);
-                return {
-                    handled: true,
-                    diagnostics: [...result.diagnostics, ...diagnostics],
-                    data: [aclEntityData, ...m2mRoleToAcl],
-                };
-            },
-        },
-        raw: {
-            FunctionDeclaration(node, context) {
-                const info = (0, scriptUtils_1.scriptInfo)(node, context, app_1.Acl.name);
-                if (!info) {
-                    return { handled: false };
-                }
-                return { handled: true, diagnostics: [], data: [info] };
-            },
-            FunctionExpression(node, context) {
-                const info = (0, scriptUtils_1.scriptInfo)(node, context, app_1.Acl.name);
-                if (!info) {
-                    return { handled: false };
-                }
-                return { handled: true, diagnostics: [], data: [info] };
+            fluent: {
+                CallExpression(node, context) {
+                    const result = (0, sdk_build_core_1.extractCallExpression)(app_1.Acl, 'record', node, context, (acl) => context.registerExplicitId('sys_security_acl', acl.$id));
+                    if (!result.handled || !(0 in result.data)) {
+                        return result;
+                    }
+                    const acl = result.data[0];
+                    const aclRecord = aclAsRecord(acl.getValue());
+                    const scriptVal = ServerModulePlugin_1.ModuleFunctionData.getGlueCode(acl.getProperty('script'), (n) => `answer = ${n}(current)`);
+                    const m2mRoleToAcl = acl
+                        .getProperty('roles')
+                        ?.getValue(true)
+                        ?.map((role) => {
+                        const roleId = typeof role === 'string' ? role : role.$id;
+                        const roleSysId = typeof role === 'string'
+                            ? role
+                            : context.registerExplicitId('sys_user_role', role.$id);
+                        const guid = context.keys.registerCompositeId('sys_security_acl_role', {
+                            sys_security_acl: aclRecord.$id,
+                            sys_user_role: roleId,
+                        });
+                        return new sdk_build_core_1.EntityData('record', guid, sdk_build_core_1.ObjectData.fromObjectValue((0, db_1.Record)({
+                            table: 'sys_security_acl_role',
+                            $id: guid,
+                            data: {
+                                sys_security_acl: acl.getGuid(),
+                                sys_user_role: roleSysId,
+                            },
+                        }), node), node);
+                    }) || [];
+                    const diagnostics = performDiagnosticChecksOnSecurityAttribute(node, acl.getValue(true), m2mRoleToAcl);
+                    const aclWithScript = { ...aclRecord, data: { ...aclRecord.data, script: scriptVal || '' } };
+                    const aclEntityData = new sdk_build_core_1.EntityData('record', acl.getGuid(), sdk_build_core_1.ObjectData.fromObjectValue(aclWithScript, node), node);
+                    return {
+                        handled: true,
+                        diagnostics: [...result.diagnostics, ...diagnostics],
+                        data: [aclEntityData, ...m2mRoleToAcl],
+                    };
+                },
             },
         },
     },
@@ -190,7 +178,8 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                 }
                 if (documentType === 'sys_security_acl_role') {
                     if (!document.parent) {
-                        return true;
+                        // Record plugin can handle this as its own entity
+                        return false;
                     }
                     const acl2Role = document.data.data;
                     if (document.action === 'DELETE') {
@@ -227,20 +216,22 @@ exports.default = (0, sdk_build_core_1.Plugin)({
                 };
                 const { script } = modifiedAclData;
                 if (script !== undefined) {
-                    (0, ScriptTemplatePlugin_1.processScript)(args, 'script', script, document.guid, 'sys_security_acl', context);
+                    (0, ScriptTemplatePlugin_1.processScript)(args, 'script', script);
                 }
-                return (0, sdk_build_core_1.transformFunctionArguments)(document.node, app_1.Acl, aclData);
+                (0, sdk_build_core_1.transformFunctionArguments)(document.node, app_1.Acl, aclData);
+                (0, sdk_build_core_1.fixFunctionArgumentTypes)(context, document.node);
+                return true;
             },
         },
     },
 });
 // security_attribute.is_localizsed ? 'Local' : 'Existing'
-function performDiagnosticChecksOnSecurityAttribute(callExpression, aclData, roles, mode) {
+function performDiagnosticChecksOnSecurityAttribute(callExpression, aclData, roles) {
     const diagnostics = [];
     if (roles.length < 1) {
         const attributeRecord = aclData.security_attribute;
         if (!aclData.security_attribute && !aclData.script && !aclData.condition) {
-            diagnostics.push(new sdk_build_core_1.FluentDiagnostic(callExpression, 'ACLs must have at least one of the following: roles, security_attribute, condition, or script', { level: mode === 'transform' ? sdk_project_1.Diagnostic.Level.Warn : sdk_project_1.Diagnostic.Level.Error }));
+            diagnostics.push(new sdk_build_core_1.FluentDiagnostic(callExpression, 'ACLs must have at least one of the following: roles, security_attribute, condition, or script', { level: sdk_project_1.Diagnostic.Level.Warn }));
         }
         else if (attributeRecord && attributeRecord.data) {
             if (aclData.local_or_existing === 'Existing' &&
@@ -264,19 +255,6 @@ function getTableOrName(type, name) {
     const field = tablePathParts[1] || '';
     return { table, field };
 }
-// TODO: The casting and type guards in this function are a bit of a mess and prone to errors.
-function getScript(acl, context) {
-    const scriptData = acl.getProperty('script')?.getValue();
-    let scriptVal;
-    if (scriptData && scriptData.filePath) {
-        const { filePath, functionName, isDefault } = scriptData;
-        scriptVal = (0, scriptUtils_1.buildScriptImport)(filePath, functionName, isDefault, context, (funcName) => `answer = ${funcName}(current)\n`);
-    }
-    else {
-        scriptVal = scriptData;
-    }
-    return scriptVal;
-}
 function reverseLookup(obj, sysId) {
     return (Object.entries(obj)
         .filter(([_, id]) => id === sysId)