@snowtop/ent 0.1.0-alpha99 → 0.1.0

package/schema/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstraintType = exports.optionalField = exports.requiredField = exports.NoFields = exports.ActionOperation = exports.getTransformedUpdateOp = exports.getObjectLoaderProperties = exports.getTransformedReadClause = exports.getFieldsWithPrivacy = exports.getStorageKey = exports.getFields = exports.getSchema = exports.DBType = exports.SQLStatementOperation = void 0;
+exports.ConstraintType = exports.optionalField = exports.requiredField = exports.NoFields = exports.ActionOperation = exports.getTransformedUpdateOp = exports.getObjectLoaderProperties = exports.getTransformedReadClause = exports.getFieldsForCreateAction = exports.getFieldsWithEditPrivacy = exports.getFieldsWithPrivacy = exports.getStorageKey = exports.getFields = exports.getSchema = exports.DBType = exports.SQLStatementOperation = void 0;
 const snake_case_1 = require("snake-case");
 // we also want this transformation to exist on a per-action basis
 // if it exists on an action, we don't do the global schema transformation
@@ -85,53 +85,45 @@ function getStorageKey(field, fieldName) {
 }
 exports.getStorageKey = getStorageKey;
 // returns a mapping of storage key to field privacy
-function getFieldsWithPrivacy(value, fieldMap) {
+function getFieldsWithPrivacy(value, fieldInfoMap) {
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, ["privacyPolicy"]);
+}
+exports.getFieldsWithPrivacy = getFieldsWithPrivacy;
+function getFieldsWithEditPrivacy(value, fieldInfoMap) {
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, ["editPrivacyPolicy"]);
+}
+exports.getFieldsWithEditPrivacy = getFieldsWithEditPrivacy;
+function getFieldsForCreateAction(value, fieldInfoMap) {
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, [
+        "createOnlyOverrideEditPrivacyPolicy",
+        "editPrivacyPolicy",
+    ]);
+}
+exports.getFieldsForCreateAction = getFieldsForCreateAction;
+function getFieldsWithPrivacyImpl(value, fieldInfoMap, keys) {
     const schema = getSchema(value);
     function addFields(fields) {
-        if (Array.isArray(fields)) {
-            for (const field of fields) {
-                const name = field.name;
-                if (!field.name) {
-                    throw new Error(`name required`);
-                }
-                if (field.getDerivedFields !== undefined) {
-                    addFields(field.getDerivedFields(name));
-                }
-                if (field.privacyPolicy) {
-                    let privacyPolicy;
-                    if (typeof field.privacyPolicy === "function") {
-                        privacyPolicy = field.privacyPolicy();
-                    }
-                    else {
-                        privacyPolicy = field.privacyPolicy;
-                    }
-                    const info = fieldMap[name];
-                    if (!info) {
-                        throw new Error(`field with name ${name} not passed in fieldMap`);
-                    }
-                    m.set(info.dbCol, privacyPolicy);
-                }
-            }
-            return;
-        }
         for (const name in fields) {
             const field = fields[name];
+            if (field.dbOnly) {
+                continue;
+            }
             if (field.getDerivedFields !== undefined) {
                 addFields(field.getDerivedFields(name));
             }
-            if (field.privacyPolicy) {
-                let privacyPolicy;
-                if (typeof field.privacyPolicy === "function") {
-                    privacyPolicy = field.privacyPolicy();
-                }
-                else {
-                    privacyPolicy = field.privacyPolicy;
-                }
-                const info = fieldMap[name];
-                if (!info) {
-                    throw new Error(`field with name ${name} not passed in fieldMap`);
+            for (const key of keys) {
+                let privacyPolicy = field[key];
+                if (privacyPolicy) {
+                    if (typeof privacyPolicy === "function") {
+                        privacyPolicy = privacyPolicy();
+                    }
+                    const info = fieldInfoMap[name];
+                    if (!info) {
+                        throw new Error(`field with name ${name} not passed in fieldMap`);
+                    }
+                    m.set(info.dbCol, privacyPolicy);
+                    break;
                 }
-                m.set(info.dbCol, privacyPolicy);
             }
         }
     }
@@ -144,7 +136,6 @@ function getFieldsWithPrivacy(value, fieldMap) {
     addFields(schema.fields);
     return m;
 }
-exports.getFieldsWithPrivacy = getFieldsWithPrivacy;
 function getTransformedReadClause(value) {
     const schema = getSchema(value);
     if (!schema.patterns) {
@@ -160,6 +151,9 @@ function getTransformedReadClause(value) {
     return;
 }
 exports.getTransformedReadClause = getTransformedReadClause;
+// would like to avoid calling this so that itwe don't run into circular dependencies
+// but the fact that it returns a clause makes it hard since we don't control the patterns...
+// we can make each clause return a format that can be extrapolated and used in codegen...
 function getObjectLoaderProperties(value, tableName) {
     return {
         clause: () => getTransformedReadClause(value),

package/schema/struct_field.d.ts

@@ -1,20 +1,22 @@
 import { BaseField, ListField } from "./field";
 import { FieldOptions, Field, Type, FieldMap } from "./schema";
-export interface StructOptions extends FieldOptions {
+interface structFieldOptions extends FieldOptions {
     tsType: string;
     fields: FieldMap;
     graphQLType?: string;
     jsonNotJSONB?: boolean;
 }
-interface allStructOptions extends StructOptions {
-    jsonAsList?: boolean;
+interface GlobalStructOptions extends FieldOptions {
+    globalType: string;
 }
+export type StructOptions = structFieldOptions | GlobalStructOptions;
 export declare class StructField extends BaseField implements Field {
     private options;
+    private jsonAsList?;
     type: Type;
-    constructor(options: allStructOptions);
+    constructor(options: StructOptions, jsonAsList?: boolean | undefined);
     formatImpl(obj: any, nested?: boolean): string | Object;
-    format(obj: any, nested?: boolean): string | Object;
+    format(obj: any, nested?: boolean): any;
     private validImpl;
     valid(obj: any): Promise<boolean>;
 }
@@ -23,5 +25,5 @@ export declare function StructType(options: StructOptions): StructField & Struct
  * @deprecated use StructTypeAsList
  */
 export declare function StructListType(options: StructOptions): ListField;
-export declare function StructTypeAsList(options: allStructOptions): StructField & allStructOptions;
+export declare function StructTypeAsList(options: StructOptions): StructField & StructOptions;
 export {};

package/schema/struct_field.js

@@ -4,20 +4,24 @@ exports.StructTypeAsList = exports.StructListType = exports.StructType = exports
 const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
+const global_schema_1 = require("../core/global_schema");
+const logger_1 = require("../core/logger");
 class StructField extends field_1.BaseField {
-    constructor(options) {
+    constructor(options, jsonAsList) {
         super();
         this.options = options;
+        this.jsonAsList = jsonAsList;
         this.type = {
             dbType: schema_1.DBType.JSONB,
         };
         this.type.subFields = options.fields;
         this.type.type = options.tsType;
         this.type.graphQLType = options.graphQLType || options.tsType;
+        this.type.globalType = this.options.globalType;
         if (options.jsonNotJSONB) {
             this.type.dbType = schema_1.DBType.JSON;
         }
-        if (options?.jsonAsList) {
+        if (jsonAsList) {
             this.type.listElemType = {
                 dbType: schema_1.DBType.JSONB,
             };
@@ -57,7 +61,37 @@ class StructField extends field_1.BaseField {
         return JSON.stringify(ret);
     }
     format(obj, nested) {
-        if (Array.isArray(obj) && this.options.jsonAsList) {
+        if (this.type.globalType) {
+            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
+            if (f && f.format) {
+                if (JSON.stringify(this.type.listElemType) !==
+                    JSON.stringify(f?.type.listElemType)) {
+                    if (this.jsonAsList) {
+                        // handle as nested
+                        // @ts-ignore
+                        const formatted = obj.map((v) => f.format(v, true));
+                        if (nested) {
+                            return formatted;
+                        }
+                        else {
+                            return JSON.stringify(formatted);
+                        }
+                    }
+                    else {
+                        const formatted = f.format([obj], true);
+                        if (nested) {
+                            return formatted[0];
+                        }
+                        else {
+                            return JSON.stringify(formatted[0]);
+                        }
+                    }
+                }
+                // TODO handle format code
+                return f.format(obj);
+            }
+        }
+        if (Array.isArray(obj) && this.jsonAsList) {
             const ret = obj.map((v) => this.formatImpl(v, true));
             if (nested) {
                 return ret;
@@ -102,7 +136,35 @@ class StructField extends field_1.BaseField {
         return ret.every((v) => v);
     }
     async valid(obj) {
-        if (this.options.jsonAsList) {
+        if (this.type.globalType) {
+            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
+            // list and global type is not valid.
+            if (f) {
+                if (f.valid) {
+                    if (JSON.stringify(this.type.listElemType) !==
+                        JSON.stringify(f?.type.listElemType)) {
+                        if (this.jsonAsList) {
+                            if (!Array.isArray(obj)) {
+                                return false;
+                            }
+                            // @ts-ignore
+                            const valid = await Promise.all(obj.map((v) => f.valid(v)));
+                            return valid.every((b) => b);
+                        }
+                        else {
+                            return f.valid([obj]);
+                        }
+                    }
+                    return f.valid(obj);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
+            }
+        }
+        if (this.jsonAsList) {
             if (!Array.isArray(obj)) {
                 return false;
             }
@@ -129,10 +191,7 @@ function StructListType(options) {
 }
 exports.StructListType = StructListType;
 function StructTypeAsList(options) {
-    let result = new StructField({
-        ...options,
-        jsonAsList: true,
-    });
+    let result = new StructField(options, true);
     return Object.assign(result, options);
 }
 exports.StructTypeAsList = StructTypeAsList;

package/schema/union_field.d.ts

@@ -15,7 +15,7 @@ export declare class UnionField extends BaseField implements FieldOptions {
     type: Type;
     m: Map<Object, string>;
     constructor(options: UnionOptions);
-    format(obj: any): string | Object;
+    format(obj: any): any;
     private validField;
     valid(obj: any): Promise<boolean>;
 }

package/scripts/custom_compiler.js

@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const typescript_1 = __importDefault(require("typescript"));
 const path = __importStar(require("path"));
-const glob_1 = __importDefault(require("glob"));
+const glob = __importStar(require("glob"));
 const compilerOptions_1 = require("../tsc/compilerOptions");
 // TODO this should probably be its own package but for now it's here
 class Compiler {
@@ -229,7 +229,7 @@ class Compiler {
                     let relPath = checkPath(paths, text);
                     if (relPath) {
                         // update the node...
-                        return typescript_1.default.factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, typescript_1.default.factory.createStringLiteral(relPath), importNode.assertClause);
+                        return typescript_1.default.factory.updateImportDeclaration(importNode, importNode.modifiers, importNode.importClause, typescript_1.default.factory.createStringLiteral(relPath), importNode.assertClause);
                     }
                 }
                 if (node.kind === typescript_1.default.SyntaxKind.ExportDeclaration) {
@@ -239,7 +239,7 @@ class Compiler {
                         let relPath = checkPath(paths, text);
                         if (relPath) {
                             // update the node...
-                            return typescript_1.default.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, typescript_1.default.factory.createStringLiteral(relPath), exportNode.isTypeOnly);
+                            return typescript_1.default.factory.updateExportDeclaration(exportNode, exportNode.modifiers, exportNode.isTypeOnly, exportNode.exportClause, typescript_1.default.factory.createStringLiteral(relPath), exportNode.assertClause);
                         }
                     }
                 }
@@ -265,6 +265,6 @@ class Compiler {
 // todo this should be configurable
 // TODO this should be broken into its own repo and npm module
 // TODO use includes and exclude in tsconfig.json if it exists
-new Compiler(glob_1.default.sync("**/*.ts", {
+new Compiler(glob.sync("**/*.ts", {
     ignore: ["node_modules/**", "tests/**", "**/*.test.ts"],
 }), ["node_modules/@types/node"]).compile();

package/scripts/custom_graphql.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const glob_1 = __importDefault(require("glob"));
+const glob = __importStar(require("glob"));
 const json5_1 = __importDefault(require("json5"));
 const minimist_1 = __importDefault(require("minimist"));
 const path = __importStar(require("path"));
@@ -37,10 +37,11 @@ const readline = __importStar(require("readline"));
 const imports_1 = require("../imports");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
+const const_1 = require("../core/const");
 // need to use the GQLCapture from the package so that when we call GQLCapture.enable()
 // we're affecting the local paths as opposed to a different instance
 // life is hard
-const MODULE_PATH = "@snowtop/ent/graphql";
+const MODULE_PATH = const_1.GRAPHQL_PATH;
 async function readInputs() {
     return await new Promise((resolve) => {
         const rl = readline.createInterface({
@@ -59,14 +60,7 @@ async function readInputs() {
         });
     });
 }
-function processCustomObjects(l, gqlCapture, input) {
-    let m;
-    if (input) {
-        m = gqlCapture.getCustomInputObjects();
-    }
-    else {
-        m = gqlCapture.getCustomObjects();
-    }
+function processCustomObjects(l, gqlCapture, m) {
     for (const input of l) {
         m.set(input.name, {
             nodeName: input.graphQLName || input.name,
@@ -77,7 +71,7 @@ function processCustomObjects(l, gqlCapture, input) {
         }
     }
 }
-function transformArgs(f) {
+function transformArgs(f, gqlCapture) {
     return (f.args || []).map((v) => {
         const ret = {
             ...v,
@@ -85,13 +79,25 @@ function transformArgs(f) {
         // duplicated from getType in graphql.ts
         if ((0, graphql_1.isCustomType)(ret.type)) {
             ret.type = v.type.type;
-            (0, graphql_1.addCustomType)(v.type);
+            (0, graphql_1.addCustomType)(v.type, gqlCapture);
         }
         // scalar types not supported for now
         ret.tsType = graphql_1.knownAllowedNames.get(v.type);
         return ret;
     });
 }
+function transformFieldTypeInput(input) {
+    switch (input) {
+        case "ACCESSOR":
+            return graphql_1.CustomFieldType.Accessor;
+        case "ASYNC_FUNCTION":
+            return graphql_1.CustomFieldType.AsyncFunction;
+        case "FUNCTION":
+            return graphql_1.CustomFieldType.Function;
+        case "FIELD":
+            return graphql_1.CustomFieldType.Field;
+    }
+}
 function transformResultType(f) {
     return f.resultType
         ? [
@@ -106,14 +112,15 @@ function transformResultType(f) {
         ]
         : [];
 }
-function processTopLevel(l, l2) {
+function processTopLevel(l, l2, gqlCapture) {
     for (const custom of l) {
         l2.push({
-            nodeName: custom.class,
-            functionName: custom.functionName || custom.name,
-            gqlName: custom.graphQLName || custom.name,
-            fieldType: custom.fieldType,
-            args: transformArgs(custom),
+            nodeName: custom.class ?? "",
+            functionName: custom.functionName || custom.name || "",
+            gqlName: custom.graphQLName || custom.name || "",
+            edgeName: custom.edgeName,
+            fieldType: transformFieldTypeInput(custom.fieldType),
+            args: transformArgs(custom, gqlCapture),
             results: transformResultType(custom),
             description: custom.description,
             extraImports: custom.extraImports,
@@ -121,16 +128,21 @@ function processTopLevel(l, l2) {
         });
     }
 }
+function processCustomTypes(m, gqlCapture) {
+    for (const k in m) {
+        (0, graphql_1.addCustomType)(m[k], gqlCapture);
+    }
+}
 function processCustomFields(fields, gqlCapture, nodeName) {
     const m = gqlCapture.getCustomFields();
     let results = [];
     for (const f of fields) {
         results.push({
             nodeName: nodeName,
-            gqlName: f.graphQLName || f.name,
-            functionName: f.functionName || f.name,
-            fieldType: f.fieldType,
-            args: transformArgs(f),
+            gqlName: f.graphQLName || f.name || "",
+            functionName: f.functionName || f.name || "",
+            fieldType: transformFieldTypeInput(f.fieldType),
+            args: transformArgs(f, gqlCapture),
             results: transformResultType(f),
             description: f.description,
         });
@@ -141,9 +153,26 @@ async function captureDynamic(filePath, gqlCapture) {
     if (!filePath) {
         return;
     }
-    return await new Promise((resolve, reject) => {
-        // do we eventually need tsconfig-paths here or do we get it by default because child process?
-        const r = (0, child_process_1.spawn)("ts-node", [filePath]);
+    return new Promise((resolve, reject) => {
+        let cmd = "";
+        const args = [];
+        const env = {
+            ...process.env,
+        };
+        if (process.env.ENABLE_SWC) {
+            cmd = "node";
+            // we seem to get tsconfig-paths by default because child process but not 100% sure...
+            args.push("-r", "@swc-node/register");
+            env.SWCRC = "true";
+        }
+        else {
+            cmd = "ts-node";
+            args.push("--transpileOnly");
+        }
+        args.push(filePath);
+        const r = (0, child_process_1.spawn)(cmd, args, {
+            env,
+        });
         const datas = [];
         r.stdout.on("data", (data) => {
             datas.push(data.toString());
@@ -157,45 +186,42 @@ async function captureDynamic(filePath, gqlCapture) {
                 return;
             }
             let json = json5_1.default.parse(datas.join(""));
-            for (const k in json) {
-                const v = json[k];
-                switch (k) {
-                    case "queries":
-                        processTopLevel(v, gqlCapture.getCustomQueries());
-                        break;
-                    case "mutations":
-                        processTopLevel(v, gqlCapture.getCustomMutations());
-                        break;
-                    default:
-                        reject(new Error(`key ${k} is unsupported in dynamic custom graphql. only queries and mutations are supported`));
-                }
-            }
+            processJSON(gqlCapture, json);
             resolve(undefined);
         });
     });
 }
+async function processJSON(gqlCapture, json) {
+    if (json.fields) {
+        for (const k in json.fields) {
+            processCustomFields(json.fields[k], gqlCapture, k);
+        }
+    }
+    if (json.inputs) {
+        processCustomObjects(json.inputs, gqlCapture, gqlCapture.getCustomInputObjects());
+    }
+    if (json.objects) {
+        processCustomObjects(json.objects, gqlCapture, gqlCapture.getCustomObjects());
+    }
+    if (json.args) {
+        processCustomObjects(json.args, gqlCapture, gqlCapture.getCustomArgs());
+    }
+    if (json.queries) {
+        processTopLevel(json.queries, gqlCapture.getCustomQueries(), gqlCapture);
+    }
+    if (json.mutations) {
+        processTopLevel(json.mutations, gqlCapture.getCustomMutations(), gqlCapture);
+    }
+    if (json.customTypes) {
+        processCustomTypes(json.customTypes, gqlCapture);
+    }
+}
 async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
     if (jsonPath !== undefined) {
         let json = json5_1.default.parse(fs.readFileSync(jsonPath, {
             encoding: "utf8",
         }));
-        if (json.fields) {
-            for (const k in json.fields) {
-                processCustomFields(json.fields[k], gqlCapture, k);
-            }
-        }
-        if (json.inputs) {
-            processCustomObjects(json.inputs, gqlCapture, true);
-        }
-        if (json.objects) {
-            processCustomObjects(json.objects, gqlCapture);
-        }
-        if (json.queries) {
-            processTopLevel(json.queries, gqlCapture.getCustomQueries());
-        }
-        if (json.mutations) {
-            processTopLevel(json.mutations, gqlCapture.getCustomMutations());
-        }
+        processJSON(gqlCapture, json);
         return;
     }
     if (filesCsv !== undefined) {
@@ -225,12 +251,12 @@ async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
         // ignore test files.
         "**/*.test.ts",
     ];
-    const customGQLResolvers = glob_1.default.sync(path.join(filePath, "/graphql/resolvers/**/*.ts"), {
+    const customGQLResolvers = glob.sync(path.join(filePath, "/graphql/resolvers/**/*.ts"), {
         // no actions for now to speed things up
         // no index.ts or internal file.
         ignore: ignore,
     });
-    const customGQLMutations = glob_1.default.sync(path.join(filePath, "/graphql/mutations/**/*.ts"), {
+    const customGQLMutations = glob.sync(path.join(filePath, "/graphql/mutations/**/*.ts"), {
         // no actions for now to speed things up
         // no index.ts or internal file.
         ignore: ignore,
@@ -295,24 +321,6 @@ function findGraphQLPath(filePath) {
 // also, there should be a way to get the list of objects here that's not manual
 //echo "User\nContact\nContactEmail\nComment" | ts-node-script --log-error --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/custom_graphql.ts --path ~/code/ent/examples/simple/src/
 async function main() {
-    // known custom types that are not required
-    // if not in the schema, will be ignored
-    // something like GraphQLUpload gotten via gqlArg({type: gqlFileUpload})
-    // these 2 need this because they're added by the schema
-    // if this list grows too long, need to build this into golang types and passed here
-    // TODO foreign non-scalars eventually
-    (0, graphql_1.addCustomType)({
-        importPath: MODULE_PATH,
-        // for go tests...
-        // TODO need a flag that only does this for go tests
-        // breaks when running locally sometimes...
-        secondaryImportPath: "../graphql/scalars/time",
-        type: "GraphQLTime",
-    });
-    (0, graphql_1.addCustomType)({
-        importPath: "graphql-type-json",
-        type: "GraphQLJSON",
-    });
     const options = (0, minimist_1.default)(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
@@ -337,6 +345,24 @@ async function main() {
         gqlCapture = r.GQLCapture;
         gqlCapture.enable(true);
     }
+    // known custom types that are not required
+    // if not in the schema, will be ignored
+    // something like GraphQLUpload gotten via gqlArg({type: gqlFileUpload})
+    // these 2 need this because they're added by the schema
+    // if this list grows too long, need to build this into golang types and passed here
+    // TODO foreign non-scalars eventually
+    (0, graphql_1.addCustomType)({
+        importPath: MODULE_PATH,
+        // for go tests...
+        // TODO need a flag that only does this for go tests
+        // breaks when running locally sometimes...
+        secondaryImportPath: "../graphql/scalars/time",
+        type: "GraphQLTime",
+    }, gqlCapture);
+    (0, graphql_1.addCustomType)({
+        importPath: "graphql-type-json",
+        type: "GraphQLJSON",
+    }, gqlCapture);
     const [inputsRead, _, __, imports] = await Promise.all([
         readInputs(),
         captureCustom(options.path, options.files, options.json_path, gqlCapture),
@@ -358,6 +384,8 @@ async function main() {
     let queries = gqlCapture.getProcessedCustomQueries();
     let mutations = gqlCapture.getProcessedCustomMutations();
     let objects = fromMap(gqlCapture.getCustomObjects());
+    let interfaces = fromMap(gqlCapture.getCustomInterfaces());
+    let unions = fromMap(gqlCapture.getCustomUnions());
     let customTypes = fromMap(gqlCapture.getCustomTypes());
     let classes = {};
     let allFiles = {};
@@ -420,6 +448,8 @@ async function main() {
         mutations,
         classes,
         objects,
+        interfaces,
+        unions,
         files: allFiles,
         customTypes,
     }));

package/scripts/move_types.js

@@ -36,7 +36,10 @@ class GatherExportsInGeneratedTypes {
         this.names = [];
     }
     traverseChild(sourceFile, contents, file, node) {
-        const exported = node.modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
+        const modifiers = typescript_1.default.canHaveModifiers(node)
+            ? typescript_1.default.getModifiers(node)
+            : undefined;
+        const exported = modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
         if (exported?.length) {
             if (typescript_1.default.isEnumDeclaration(node) ||
                 typescript_1.default.isInterfaceDeclaration(node) ||

package/scripts/read_schema.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const glob_1 = __importDefault(require("glob"));
+const glob = __importStar(require("glob"));
 const path = __importStar(require("path"));
 const pascal_case_1 = require("pascal-case");
 const minimist_1 = __importDefault(require("minimist"));
@@ -42,7 +42,7 @@ function main() {
     let globalSchema;
     const r = /(\w+).ts/;
     // do we still even need this...
-    const paths = glob_1.default.sync(path.join(options.path, "*.ts"), {
+    const paths = glob.sync(path.join(options.path, "*.ts"), {
         ignore: [`\d+_read_schema.ts`],
     });
     let potentialSchemas = {};

package/testutils/action/complex_schemas.d.ts

@@ -1,5 +1,5 @@
 import { Ent, ID, Viewer, Data } from "../../core/base";
-import { DataOperation } from "../../core/ent";
+import { DataOperation } from "../../action/operations";
 import { Action, Builder, Executor, WriteOperation, Trigger, Observer, TriggerReturn } from "../../action/action";
 import { EdgeInputData } from "../../action/orchestrator";
 import { User, Group, Message, Contact, SimpleBuilder, BuilderSchema, SimpleAction, BaseEnt } from "../../testutils/builder";