@snowtop/ent 0.2.6 → 0.2.8

package/parse_schema/parse.d.ts

@@ -1,5 +1,5 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type, FieldMap, GlobalSchema, EdgeIndex, TransformReadBetaResult, CanViewerDo } from "../schema/schema";
+import { ActionField, Type, DBExtension, FieldMap, GlobalSchema, EdgeIndex, TransformReadBetaResult, CanViewerDo } from "../schema/schema";
 export declare function processFields(src: FieldMap | Field[], patternName?: string): Promise<ProcessedField[]>;
 declare enum NullableResult {
     CONTENTS = "contents",
@@ -68,22 +68,11 @@ interface Result {
     schemas: schemasDict;
     patterns: patternsDict;
     globalSchema?: ProcessedGlobalSchema;
-    config?: {
-        rome?: BiomeConfig;
-    };
 }
 declare type PotentialSchemas = {
     [key: string]: any;
 };
 export declare function parseSchema(potentialSchemas: PotentialSchemas, globalSchema?: GlobalSchema): Promise<Result>;
-interface BiomeConfig {
-    indentStyle?: string;
-    lineWidth?: number;
-    indentSize?: number;
-    quoteStyle?: string;
-    quoteProperties?: string;
-    trailingComma?: string;
-}
 interface ProcessedGlobalSchema {
     globalEdges: ProcessedAssocEdge[];
     extraEdgeFields: ProcessedField[];
@@ -91,5 +80,6 @@ interface ProcessedGlobalSchema {
     init?: boolean;
     transformsEdges?: boolean;
     globalFields?: ProcessedField[];
+    dbExtensions?: DBExtension[];
 }
 export {};

package/parse_schema/parse.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFields = processFields;
 exports.parseSchema = parseSchema;
-const cosmiconfig_1 = require("cosmiconfig");
 const const_1 = require("../core/const");
 const global_schema_1 = require("../core/global_schema");
 async function processFields(src, patternName) {
@@ -448,53 +447,31 @@ async function parseSchema(potentialSchemas, globalSchema) {
         }
         schemas[key] = processedSchema;
     }
-    const biome = translatePrettier();
     return {
         schemas,
         patterns: processPatterns.patternsDict,
         globalSchema: parsedGlobalSchema,
-        config: {
-            rome: biome,
-        },
     };
 }
-function translatePrettier() {
-    const r = (0, cosmiconfig_1.cosmiconfigSync)("prettier").search();
-    if (!r) {
-        return;
-    }
-    const ret = {};
-    if (r.config.printWidth !== undefined) {
-        ret.lineWidth = parseInt(r.config.printWidth);
-    }
-    if (r.config.useTabs) {
-        ret.indentStyle = "tab";
-    }
-    else {
-        ret.indentStyle = "space";
-    }
-    if (r.config.tabWidth !== undefined) {
-        ret.indentSize = parseInt(r.config.tabWidth);
-    }
-    if (r.config.singleQuote) {
-        ret.quoteStyle = "single";
-    }
-    else {
-        ret.quoteStyle = "double";
-    }
-    if (r.config.quoteProps !== undefined) {
-        if (r.config.quoteProps === "consistent") {
-            // biome doesn't support this
-            ret.quoteProperties = "as-needed";
-        }
-        else {
-            ret.quoteProperties = r.config.quoteProps;
-        }
+function normalizeProvisionedBy(extension) {
+    if (extension.provisionedBy === "ent" ||
+        extension.provisionedBy === "external") {
+        return extension.provisionedBy;
     }
-    if (r.config.trailingComma !== undefined) {
-        ret.trailingComma = r.config.trailingComma;
+    if (extension.provisionedBy) {
+        throw new Error(`invalid provisionedBy ${extension.provisionedBy} for db extension ${extension.name}`);
     }
-    return ret;
+    return "ent";
+}
+function processDBExtensions(src) {
+    return src
+        .map((extension) => ({
+        ...extension,
+        provisionedBy: normalizeProvisionedBy(extension),
+        runtimeSchemas: extension.runtimeSchemas || [],
+        dropCascade: extension.dropCascade === true,
+    }))
+        .sort((lhs, rhs) => lhs.name.localeCompare(rhs.name));
 }
 async function parseGlobalSchema(s) {
     const ret = {
@@ -504,7 +481,8 @@ async function parseGlobalSchema(s) {
             !!s.edgeIndices ||
             s.transformEdgeRead !== undefined ||
             s.transformEdgeWrite !== undefined ||
-            s.fields !== undefined,
+            s.fields !== undefined ||
+            !!s.dbExtensions?.length,
         transformsEdges: !!s.transformEdgeRead || !!s.transformEdgeWrite,
     };
     if (s.extraEdgeFields) {
@@ -519,5 +497,8 @@ async function parseGlobalSchema(s) {
     if (s.fields) {
         ret.globalFields = await processFields(s.fields);
     }
+    if (s.dbExtensions) {
+        ret.dbExtensions = processDBExtensions(s.dbExtensions);
+    }
     return ret;
 }

package/schema/index.d.ts

@@ -1,6 +1,6 @@
 import Schema from "./schema";
 export { Schema };
-export { Field, AssocEdge, AssocEdgeGroup, InverseAssocEdge, Edge, Pattern, DBType, Type, FieldOptions, SchemaConstructor, SchemaInputType, getFields, getFieldsWithPrivacy, getFieldsWithEditPrivacy, getStorageKey, ActionOperation, Action, EdgeAction, NoFields, FieldMap, Constraint, Index, EdgeIndex, ConstraintType, ForeignKeyInfo, requiredField, optionalField, UpdateOperation, TransformedUpdateOperation, SQLStatementOperation, EdgeUpdateOperation, TransformedEdgeUpdateOperation, getTransformedReadClause, getObjectLoaderProperties, GlobalSchema, ActionField, } from "./schema";
+export { Field, AssocEdge, AssocEdgeGroup, InverseAssocEdge, Edge, Pattern, DBType, Type, FieldOptions, SchemaConstructor, SchemaInputType, getFields, getFieldsWithPrivacy, getFieldsWithEditPrivacy, getStorageKey, ActionOperation, Action, EdgeAction, NoFields, FieldMap, Constraint, Index, EdgeIndex, ConstraintType, ForeignKeyInfo, requiredField, optionalField, UpdateOperation, TransformedUpdateOperation, SQLStatementOperation, EdgeUpdateOperation, TransformedEdgeUpdateOperation, getTransformedReadClause, getObjectLoaderProperties, GlobalSchema, DBExtension, ActionField, } from "./schema";
 export { Timestamps, Node, BaseEntSchema, BaseEntSchemaWithTZ, EntSchema, EntSchemaWithTZ, SchemaConfig, } from "./base_schema";
 export * from "./field";
 export * from "./json_field";

package/schema/schema.d.ts

@@ -13,6 +13,15 @@ interface FieldInfo {
 export type FieldInfoMap = {
     [key: string]: FieldInfo;
 };
+export interface DBExtension {
+    name: string;
+    provisionedBy?: "ent" | "external";
+    version?: string;
+    installSchema?: string;
+    runtimeSchemas?: string[];
+    dropCascade?: boolean;
+    [x: string]: any;
+}
 export interface GlobalSchema {
     edges?: Edge[];
     extraEdgeFields?: FieldMap;
@@ -20,6 +29,7 @@ export interface GlobalSchema {
     transformEdgeRead?: () => Clause;
     transformEdgeWrite?: (stmt: EdgeUpdateOperation) => TransformedEdgeUpdateOperation | null;
     fields?: FieldMap;
+    dbExtensions?: DBExtension[];
 }
 type FieldOverride = Pick<FieldOptions, "nullable" | "storageKey" | "serverDefault" | "unique" | "hideFromGraphQL" | "graphqlName" | "index" | "indexConcurrently" | "indexWhere">;
 export type FieldOverrideMap = {
@@ -186,6 +196,8 @@ export interface Type {
     deprecatedIntEnumMap?: IntEnumMap;
     disableUnknownType?: boolean;
     globalType?: string;
+    postgresType?: string;
+    dbExtension?: string;
     importType?: DeprecatedImportType;
     subFields?: FieldMap;
     unionFields?: FieldMap;
@@ -361,9 +373,16 @@ export interface Index {
     columns: string[];
     unique?: boolean;
     fulltext?: FullText;
-    indexType?: "gin" | "btree";
+    indexType?: string;
     concurrently?: boolean;
     where?: string;
+    ops?: {
+        [column: string]: string;
+    };
+    indexParams?: {
+        [key: string]: string | number | boolean;
+    };
+    dbExtension?: string;
     [x: string]: any;
 }
 export interface EdgeIndex extends Omit<Index, "name"> {

package/scripts/custom_graphql.js

@@ -38,20 +38,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const glob = __importStar(require("glob"));
-const json5_1 = __importDefault(require("json5"));
-const minimist_1 = __importDefault(require("minimist"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
+const typescript_1 = __importDefault(require("typescript"));
 const graphql_1 = require("../graphql/graphql");
 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");
+const { parseArgs } = require("./parse_args");
 // 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 = const_1.GRAPHQL_PATH;
+function parseJSONC(fileName, text) {
+    const { config, error } = typescript_1.default.parseConfigFileTextToJson(fileName, text);
+    if (error) {
+        throw new Error(typescript_1.default.flattenDiagnosticMessageText(error.messageText, "\n"));
+    }
+    return config;
+}
 async function readInputs() {
     return new Promise((resolve) => {
         const rl = readline.createInterface({
@@ -195,7 +202,7 @@ async function captureDynamic(filePath, gqlCapture) {
                 reject(new Error(`error code ${code} on dynamic path`));
                 return;
             }
-            let json = json5_1.default.parse(datas.join(""));
+            const json = parseJSONC(filePath, datas.join(""));
             processJSON(gqlCapture, json);
             resolve(undefined);
         });
@@ -228,7 +235,7 @@ async function processJSON(gqlCapture, json) {
 }
 async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
     if (jsonPath !== undefined) {
-        let json = json5_1.default.parse(fs.readFileSync(jsonPath, {
+        const json = parseJSONC(jsonPath, fs.readFileSync(jsonPath, {
             encoding: "utf8",
         }));
         processJSON(gqlCapture, json);
@@ -331,7 +338,7 @@ 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() {
-    const options = (0, minimist_1.default)(process.argv.slice(2));
+    const options = parseArgs(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
     }

package/scripts/fix_action_exports.js

@@ -39,7 +39,7 @@ const typescript_1 = __importStar(require("typescript"));
 class FixActionExports {
     constructor() {
         this.glob = "src/ent/**/actions/*_action.ts";
-        this.prettierGlob = "src/ent/**/actions/*_action.ts";
+        this.formatGlob = "src/ent/**/actions/*_action.ts";
     }
     traverseChild(sourceFile, contents, file, node) {
         if (!(0, typescript_1.isClassDeclaration)(node)) {

package/scripts/migrate_v0.1.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const minimist_1 = __importDefault(require("minimist"));
+const { parseArgs } = require("./parse_args");
 const transform_1 = require("../tsc/transform");
 const transform_schema_1 = require("../tsc/transform_schema");
 const transform_ent_1 = require("../tsc/transform_ent");
@@ -14,7 +11,7 @@ const ast_1 = require("../tsc/ast");
 //  ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/migrate_v0.1.ts --transform_schema --old_base_class BaseEntTodoSchema --new_schema_class TodoEntSchema  --transform_path src/schema/patterns/base
 function main() {
     const customInfo = (0, ast_1.getCustomInfo)();
-    const options = (0, minimist_1.default)(process.argv.slice(2));
+    const options = parseArgs(process.argv.slice(2));
     // install 0.1.x dependencies
     // maybe provide options to make this easier if someone wants to do this in steps to see what's happening
     if (options.move_generated) {

package/scripts/move_types.js

@@ -66,7 +66,7 @@ class GatherExportsInGeneratedTypes {
 class TransformImports {
     constructor() {
         this.glob = "src/**/*.ts";
-        this.prettierGlob = "src/**/*.ts";
+        this.formatGlob = "src/**/*.ts";
         this.impsToMove = new Map();
         this.cwd = "";
         this.relative = false;

package/scripts/read_schema.js

@@ -32,18 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const glob = __importStar(require("glob"));
 const path = __importStar(require("path"));
-const minimist_1 = __importDefault(require("minimist"));
+const { parseArgs } = require("./parse_args");
 const parse_1 = require("../parse_schema/parse");
 const ast_1 = require("../tsc/ast");
 const names_1 = require("../names/names");
 function main() {
-    const options = (0, minimist_1.default)(process.argv.slice(2));
+    const options = parseArgs(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
     }

package/testutils/builder.js

@@ -195,8 +195,7 @@ class SimpleBuilder {
         // create dynamic placeholder
         // TODO: do we need to use this as the node when there's an existingEnt
         // same for generated builders.
-        this.placeholderID = `$ent.idPlaceholderID$ ${randomNum()}-${schema.ent
-            ?.name}`;
+        this.placeholderID = `$ent.idPlaceholderID$ ${randomNum()}-${schema.ent?.name}`;
         if (this.operation === action_1.WriteOperation.Insert) {
             for (const [key, value] of fields) {
                 if (key === "id" && value === "{id}") {

package/testutils/parse_sql.js

@@ -584,7 +584,7 @@ function parseUpdateStatement(ast, values, map, returningAll) {
         const colRef = "type" in setAny
             ? setAny
             : "column" in setAny
-                ? setAny.column ?? setAny
+                ? (setAny.column ?? setAny)
                 : setAny;
         const colName = typeof colRef === "string" ? colRef : getColumnFromRef(colRef);
         let value = getValueFromRegex(set.value, values);

package/tsc/compilerOptions.d.ts

@@ -1,7 +1,7 @@
 import ts from "typescript";
 export declare function readCompilerOptions(filePath: string): ts.CompilerOptions;
-export declare function getTarget(target?: string): ts.ScriptTarget;
-export declare function getModule(module?: string): ts.ModuleKind;
+export declare function getTarget(target?: string | number): ts.ScriptTarget;
+export declare function getModule(module?: string | number): ts.ModuleKind;
 export declare function getTargetFromCurrentDir(): ts.ScriptTarget;
 export declare function createSourceFile(target: ts.ScriptTarget, file: string): {
     contents: string;

package/tsc/compilerOptions.js

@@ -42,7 +42,6 @@ exports.getModule = getModule;
 exports.getTargetFromCurrentDir = getTargetFromCurrentDir;
 exports.createSourceFile = createSourceFile;
 const fs = __importStar(require("fs"));
-const json5_1 = __importDefault(require("json5"));
 const typescript_1 = __importDefault(require("typescript"));
 const path = __importStar(require("path"));
 function findTSConfigFile(filePath) {
@@ -56,29 +55,21 @@ function findTSConfigFile(filePath) {
     return null;
 }
 function readCompilerOptions(filePath) {
-    let configPath = findTSConfigFile(filePath);
+    const configPath = findTSConfigFile(filePath);
     if (!configPath) {
         return {};
     }
-    let json = {};
-    try {
-        json = json5_1.default.parse(fs.readFileSync(configPath, {
-            encoding: "utf8",
-        }));
-    }
-    catch (e) {
+    const { config, error } = typescript_1.default.readConfigFile(configPath, typescript_1.default.sys.readFile);
+    if (error) {
         console.error("couldn't read tsconfig.json file");
+        return {};
     }
-    let options = json["compilerOptions"] || {};
-    // @ts-ignore
-    if (options.moduleResolution === "node") {
-        options.moduleResolution = typescript_1.default.ModuleResolutionKind.NodeJs;
-    }
-    options.target = getTarget(options.target);
-    options.module = getModule(options.module);
-    return options;
+    return typescript_1.default.parseJsonConfigFileContent(config, typescript_1.default.sys, path.dirname(configPath), undefined, configPath).options;
 }
 function getTarget(target) {
+    if (typeof target === "number") {
+        return target;
+    }
     switch (target?.toLowerCase()) {
         case "es2015":
             return typescript_1.default.ScriptTarget.ES2015;
@@ -105,6 +96,9 @@ function getTarget(target) {
     }
 }
 function getModule(module) {
+    if (typeof module === "number") {
+        return module;
+    }
     switch (module?.toLowerCase()) {
         case "none":
             return typescript_1.default.ModuleKind.None;
@@ -134,7 +128,7 @@ function getModule(module) {
 }
 function getTargetFromCurrentDir() {
     const options = readCompilerOptions(".");
-    return getTarget(options.target?.toString());
+    return getTarget(options.target);
 }
 function createSourceFile(target, file) {
     let contents = fs.readFileSync(file).toString();

package/tsc/move_generated.js

@@ -53,9 +53,9 @@ class MoveFiles {
     }
 }
 class TransformImports {
-    constructor(glob, prettierGlob, relativeImports, checkRelativeImportsValid) {
+    constructor(glob, formatGlob, relativeImports, checkRelativeImportsValid) {
         this.glob = glob;
-        this.prettierGlob = prettierGlob;
+        this.formatGlob = formatGlob;
         this.relativeImports = relativeImports;
         this.checkRelativeImportsValid = checkRelativeImportsValid;
         this.globOptions = {

package/tsc/transform.d.ts

@@ -16,7 +16,7 @@ export interface TransformFile {
     filter?(files: string[]): string[];
     fileToWrite?(file: string): string;
     postProcess?(file: string): void;
-    prettierGlob?: string;
+    formatGlob?: string;
 }
 export declare function transform(transform: TransformFile): void;
 export {};

package/tsc/transform.js

@@ -177,8 +177,22 @@ function transform(transform) {
             transform.postProcess(file);
         }
     });
-    if (transform.prettierGlob) {
-        (0, child_process_1.spawnSync)(`prettier`, [transform.prettierGlob, "--write"]);
+    if (transform.formatGlob) {
+        const files = glob
+            .sync(transform.formatGlob, transform.globOptions ?? {})
+            .map((f) => (typeof f === "string" ? f : f.path));
+        if (!files.length) {
+            return;
+        }
+        const result = (0, child_process_1.spawnSync)(`biome`, ["format", "--write", "--files-ignore-unknown=true", ...files], {
+            encoding: "utf8",
+        });
+        if (result.error) {
+            throw result.error;
+        }
+        if (result.status !== 0) {
+            throw new Error(result.stderr || "biome format failed");
+        }
     }
 }
 function isRequireStatement(node, sourceFile) {

package/tsc/transform_action.d.ts

@@ -4,7 +4,7 @@ import { TransformFile } from "./transform";
 export declare class TransformAction implements TransformFile {
     private customInfo;
     glob: string;
-    prettierGlob: string;
+    formatGlob: string;
     constructor(customInfo: customInfo);
     traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): {
         node: ts.Node;

package/tsc/transform_action.js

@@ -120,7 +120,7 @@ class TransformAction {
     constructor(customInfo) {
         this.customInfo = customInfo;
         this.glob = "src/ent/**/actions/**/*_action.ts";
-        this.prettierGlob = "src/ent/**/actions/**.ts";
+        this.formatGlob = "src/ent/**/actions/**.ts";
     }
     traverseChild(sourceFile, contents, file, node) {
         if (!typescript_1.default.isClassDeclaration(node) || !node.heritageClauses) {

package/tsc/transform_ent.d.ts

@@ -13,5 +13,5 @@ export declare class TransformEnt implements TransformFile {
         imports: Map<string, string[]>;
         node?: undefined;
     } | undefined;
-    prettierGlob: string;
+    formatGlob: string;
 }

package/tsc/transform_ent.js

@@ -14,7 +14,7 @@ function isPrivacyPolicy(mm) {
 class TransformEnt {
     constructor() {
         this.glob = "src/ent/*.ts";
-        this.prettierGlob = "src/ent/*.ts";
+        this.formatGlob = "src/ent/*.ts";
     }
     traverseChild(sourceFile, contents, file, node) {
         if (!typescript_1.default.isClassDeclaration(node) || !node.heritageClauses) {

package/tsc/transform_schema.d.ts

@@ -23,5 +23,5 @@ export declare class TransformSchema implements TransformFile {
     } | undefined;
     fileToWrite(file: string): string;
     postProcess(file: string): void;
-    prettierGlob: string;
+    formatGlob: string;
 }

package/tsc/transform_schema.js

@@ -211,7 +211,7 @@ function getConstructorElementInfo(fileContents, member, sourceFile) {
     return {
         key: "patterns",
         // remove this.addPatterns at the front, remove trailing ) at the end
-        // if there's a trailing comma, it'll be handled by prettier
+        // if there's a trailing comma, it'll be handled by the formatter
         value: `[${line.slice(addPatterns.length, -1)}]`,
         comment: "",
     };
@@ -343,7 +343,7 @@ class TransformSchema {
         this.newSchemaClass = newSchemaClass;
         this.transformPath = transformPath;
         this.glob = "src/schema/*.ts";
-        this.prettierGlob = "src/schema/*.ts";
+        this.formatGlob = "src/schema/*.ts";
     }
     transformSchema(className) {
         if (className === "BaseEntSchema" || className === "BaseEntSchemaWithTZ") {