@snowtop/ent 0.1.0-alpha143 → 0.1.0-alpha144

package/action/executor.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOperations = exports.ComplexExecutor = exports.ListBasedExecutor = void 0;
-const graph_data_structure_1 = __importDefault(require("graph-data-structure"));
+const graph_data_structure_1 = require("graph-data-structure");
 const ent_1 = require("../core/ent");
 const db_1 = __importDefault(require("../core/db"));
 const logger_1 = require("../core/logger");
@@ -123,7 +123,7 @@ class ComplexExecutor {
         this.executors = [];
         this.updatedOps = new Map();
         this.builder = options?.builder;
-        let graph = (0, graph_data_structure_1.default)();
+        let graph = (0, graph_data_structure_1.Graph)();
         const changesetMap = new Map();
         const impl = (c) => {
             changesetMap.set(c.placeholderID.toString(), c);

package/imports/index.d.ts

@@ -1,7 +1,7 @@
 export interface Options {
     filter?: (file: string, index: number, array: string[]) => boolean;
     justCurrentDir?: boolean;
-    ignore?: string | Readonly<string[]> | undefined;
+    ignore?: string | string[] | undefined;
 }
 export interface PathResult {
     m: Map<string, file[]>;

package/imports/index.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCustomImports = void 0;
-const glob_1 = __importDefault(require("glob"));
+const glob = __importStar(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -42,7 +42,7 @@ function getFiles(filePath, opts) {
     if (opts?.justCurrentDir) {
         pattern = `${filePath}/**.ts`;
     }
-    let files = glob_1.default.sync(pattern, {
+    let files = glob.sync(pattern, {
         ignore: opts?.ignore,
     });
     if (opts?.filter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha143",
+  "version": "0.1.0-alpha144",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,24 +9,24 @@
   },
   "dependencies": {
     "@swc-node/register": "^1.6.5",
-    "@types/node": "^18.11.18",
+    "@types/node": "^20.2.5",
     "camel-case": "^4.1.2",
-    "cosmiconfig": "^8.0.0",
-    "dataloader": "^2.1.0",
-    "glob": "^8.0.3",
-    "graph-data-structure": "^2.0.0",
+    "cosmiconfig": "^8.1.3",
+    "dataloader": "^2.2.2",
+    "glob": "^10.2.6",
+    "graph-data-structure": "^3.3.0",
     "js-yaml": "^4.1.0",
-    "json5": "^2.2.2",
-    "luxon": "^3.1.1",
+    "json5": "^2.2.3",
+    "luxon": "^3.3.0",
     "memoizee": "^0.4.15",
-    "minimist": "^1.2.7",
+    "minimist": "^1.2.8",
     "pascal-case": "^3.1.2",
     "pg": "^8.11.0",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.8",
     "snake-case": "^3.0.4",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
-    "tslib": "^2.5.0",
+    "tslib": "^2.5.2",
     "typescript": "^5.0.4",
     "uuid": "^9.0.0"
   },

package/parse_schema/parse.js

@@ -269,6 +269,7 @@ async function parseSchema(potentialSchemas, globalSchema) {
             assocEdgeGroups: [],
             customGraphQLInterfaces: schema.customGraphQLInterfaces,
             supportUpsert: schema.supportUpsert,
+            supportCanViewerSee: schema.supportCanViewerSee,
         };
         // let's put patterns first just so we have id, created_at, updated_at first
         // ¯\_(ツ)_/¯

package/schema/base_schema.d.ts

@@ -21,6 +21,7 @@ export declare class EntSchema implements Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[] | undefined;
     supportUpsert?: boolean | undefined;
+    supportCanViewerSee?: boolean | undefined;
     constructor(cfg: SchemaConfig);
 }
 export declare class EntSchemaWithTZ implements Schema {
@@ -40,6 +41,7 @@ export declare class EntSchemaWithTZ implements Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[] | undefined;
     supportUpsert?: boolean | undefined;
+    supportCanViewerSee?: boolean | undefined;
     constructor(cfg: SchemaConfig);
 }
 export declare abstract class BaseEntSchema {

package/schema/base_schema.js

@@ -91,6 +91,7 @@ class EntSchema {
         // TODO annoying that have to list these...
         this.customGraphQLInterfaces = cfg.customGraphQLInterfaces;
         this.supportUpsert = cfg.supportUpsert;
+        this.supportCanViewerSee = cfg.supportCanViewerSee;
     }
 }
 exports.EntSchema = EntSchema;
@@ -121,6 +122,7 @@ class EntSchemaWithTZ {
         // TODO annoying that have to list these...
         this.customGraphQLInterfaces = cfg.customGraphQLInterfaces;
         this.supportUpsert = cfg.supportUpsert;
+        this.supportCanViewerSee = cfg.supportCanViewerSee;
     }
 }
 exports.EntSchemaWithTZ = EntSchemaWithTZ;

package/schema/schema.d.ts

@@ -40,6 +40,7 @@ export default interface Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[];
     supportUpsert?: boolean;
+    supportCanViewerSee?: boolean;
 }
 export interface AssocEdge {
     name: string;

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 {
@@ -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"));
@@ -256,12 +256,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,

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/db/temp_db.d.ts

@@ -73,6 +73,11 @@ export declare function dateList(name: string, opts?: options): Column;
 export declare function boolList(name: string, opts?: options): Column;
 export declare function table(name: string, ...items: SchemaItem[]): Table;
 export declare function enumType(name: string, values: string[]): CoreConcept;
+interface TempDBOptions {
+    dialect: Dialect;
+    sqliteConnString?: string;
+    tables?: CoreConcept[] | (() => CoreConcept[]);
+}
 export declare class TempDB {
     private db;
     private client;
@@ -81,7 +86,9 @@ export declare class TempDB {
     private dialect;
     private sqlite;
     private setTables;
+    private sqliteConnString;
     constructor(dialect: Dialect, tables?: CoreConcept[] | (() => CoreConcept[]));
+    constructor(opts: TempDBOptions);
     getDialect(): Dialect;
     __getTables(): Map<string, CoreConcept>;
     beforeAll(setupConnString?: boolean): Promise<void>;

package/testutils/db/temp_db.js

@@ -381,8 +381,15 @@ function randomDB() {
 class TempDB {
     constructor(dialect, tables) {
         this.tables = new Map();
-        this.dialect = dialect;
-        this.setTables = tables;
+        if (typeof dialect === "string") {
+            this.dialect = dialect;
+            this.setTables = tables;
+        }
+        else {
+            this.dialect = dialect.dialect;
+            this.setTables = dialect.tables;
+            this.sqliteConnString = dialect.sqliteConnString;
+        }
     }
     getDialect() {
         return this.dialect;
@@ -434,10 +441,17 @@ class TempDB {
             await this.dbClient.connect();
         }
         else {
-            if (process.env.DB_CONNECTION_STRING === undefined) {
-                throw new Error(`DB_CONNECTION_STRING required for sqlite `);
+            let connString;
+            if (this.sqliteConnString) {
+                connString = this.sqliteConnString;
             }
-            const filePath = process.env.DB_CONNECTION_STRING.substr(10);
+            else {
+                if (process.env.DB_CONNECTION_STRING === undefined) {
+                    throw new Error(`DB_CONNECTION_STRING required for sqlite if sqliteConnString is not set`);
+                }
+                connString = process.env.DB_CONNECTION_STRING;
+            }
+            const filePath = connString.substr(10);
             this.sqlite = (0, better_sqlite3_1.default)(filePath);
         }
         if (this.setTables) {
@@ -563,10 +577,15 @@ function assoc_edge_table(name, global, unique_edge) {
 }
 exports.assoc_edge_table = assoc_edge_table;
 function setupSqlite(connString, tables, opts) {
-    let tdb = new TempDB(db_1.Dialect.SQLite, tables);
+    let tdb = new TempDB({
+        dialect: db_1.Dialect.SQLite,
+        tables,
+        sqliteConnString: connString,
+    });
     beforeAll(async () => {
-        process.env.DB_CONNECTION_STRING = connString;
-        (0, config_1.loadConfig)();
+        (0, config_1.loadConfig)({
+            dbConnectionString: connString,
+        });
         await tdb.beforeAll();
         const conn = db_1.default.getInstance().getConnection();
         expect(conn.db.memory).toBe(false);

package/testutils/db_mock.js

@@ -268,5 +268,3 @@ QueryRecorder.ids = [];
 // we need pkeys when storing...
 QueryRecorder.data = new Map();
 exports.QueryRecorder = QueryRecorder;
-// TODO
-process.env.DB_CONNECTION_STRING = "INVALID DATABASE";

package/tsc/move_generated.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveGenerated = void 0;
-const glob_1 = require("glob");
+const glob = __importStar(require("glob"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const typescript_1 = __importDefault(require("typescript"));
@@ -38,7 +38,7 @@ class MoveFiles {
         this.globPath = globPath;
     }
     move() {
-        const files = glob_1.glob.sync(this.globPath);
+        const files = glob.sync(this.globPath);
         moveFiles(files);
     }
 }

package/tsc/transform.d.ts

@@ -1,4 +1,4 @@
-import { IOptions } from "glob";
+import * as glob from "glob";
 import ts from "typescript";
 interface TraverseChildResponse {
     node?: ts.Node;
@@ -10,7 +10,7 @@ interface TraverseChildResponse {
 }
 export interface TransformFile {
     glob: string;
-    globOptions?: IOptions;
+    globOptions?: glob.GlobOptions;
     preprocessFile?: (contents: string, file: string, sourceFile: ts.SourceFile) => boolean;
     traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): TraverseChildResponse | undefined;
     filter?(files: string[]): string[];

package/tsc/transform.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transform = void 0;
-const glob_1 = require("glob");
+const glob = __importStar(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
@@ -40,10 +40,11 @@ function normalizePath(p) {
     return p;
 }
 function transform(transform) {
-    let files = glob_1.glob.sync(transform.glob, transform.globOptions);
+    let files = glob.sync(transform.glob, transform.globOptions ?? {});
     const target = (0, compilerOptions_1.getTargetFromCurrentDir)();
     if (transform.filter) {
-        files = transform.filter(files);
+        const f2 = files.map((f) => (typeof f === "string" ? f : f.path));
+        files = transform.filter(f2);
     }
     files.forEach((file) => {
         let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);