@snowtop/ent 0.1.19 → 0.1.21-test1

package/core/query_impl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildQuery = exports.getJoinPhrase = exports.reverseOrderBy = exports.getOrderByPhrase = void 0;
+exports.buildQuery = exports.getJoinInfo = exports.reverseOrderBy = exports.getOrderByPhrase = void 0;
 function getOrderByPhrase(orderby, alias) {
     return orderby
         .map((v) => {
@@ -27,34 +27,51 @@ function reverseOrderBy(orderby) {
     });
 }
 exports.reverseOrderBy = reverseOrderBy;
-function getJoinPhrase(join, clauseIdx = 1) {
-    const joinTable = join.alias
-        ? `${join.tableName} ${join.alias}`
-        : join.tableName;
-    return `${joinTable} ON ${join.clause.clause(clauseIdx)}`;
+function getJoinInfo(join, clauseIdx = 1) {
+    let valuesUsed = 0;
+    const str = join
+        .map((join) => {
+        const joinTable = join.alias
+            ? `${join.tableName} ${join.alias}`
+            : join.tableName;
+        valuesUsed += join.clause.values().length;
+        return `JOIN ${joinTable} ON ${join.clause.clause(clauseIdx)}`;
+    })
+        .join(" ");
+    return {
+        phrase: str,
+        valuesUsed,
+    };
 }
-exports.getJoinPhrase = getJoinPhrase;
+exports.getJoinInfo = getJoinInfo;
 function buildQuery(options) {
-    const fields = options.alias
-        ? options.fields.map((f) => `${options.alias}.${f}`).join(", ")
+    const fieldsAlias = options.fieldsAlias ?? options.alias;
+    const fields = fieldsAlias && !options.disableFieldsAlias
+        ? options.fields.map((f) => `${fieldsAlias}.${f}`).join(", ")
         : options.fields.join(", ");
     // always start at 1
     const parts = [];
     const tableName = options.alias
         ? `${options.tableName} AS ${options.alias}`
         : options.tableName;
-    parts.push(`SELECT ${fields} FROM ${tableName}`);
+    if (options.distinct) {
+        parts.push(`SELECT DISTINCT ${fields} FROM ${tableName}`);
+    }
+    else {
+        parts.push(`SELECT ${fields} FROM ${tableName}`);
+    }
     let whereStart = 1;
     if (options.join) {
-        parts.push(`JOIN ${getJoinPhrase(options.join, 1)}`);
-        whereStart += options.join.clause.values().length;
+        const { phrase, valuesUsed } = getJoinInfo(options.join);
+        parts.push(phrase);
+        whereStart += valuesUsed;
     }
     parts.push(`WHERE ${options.clause.clause(whereStart, options.alias)}`);
     if (options.groupby) {
         parts.push(`GROUP BY ${options.groupby}`);
     }
     if (options.orderby) {
-        parts.push(`ORDER BY ${getOrderByPhrase(options.orderby, options.alias)}`);
+        parts.push(`ORDER BY ${getOrderByPhrase(options.orderby, fieldsAlias)}`);
     }
     if (options.limit) {
         parts.push(`LIMIT ${options.limit}`);

package/graphql/query/shared_edge_connection.js

@@ -57,8 +57,7 @@ const commonTests = (opts) => {
         if (isCustomQuery(q)) {
             opts = {
                 row: contacts[idx],
-                col: "id",
-                // keys: ["id"],
+                keys: ["id"],
             };
         }
         else {
@@ -66,10 +65,8 @@ const commonTests = (opts) => {
             // is from assoc_edge table id2 field and so cursor takes it from there
             opts = {
                 row: contacts[idx],
-                col: "id",
-                cursorKey: "id2",
-                // keys: ["id2"],
-                // cursorKeys: ["id"],
+                keys: ["id2"],
+                cursorKeys: ["id"],
             };
         }
         return (0, ent_1.getCursor)(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.19",
+  "version": "0.1.21-test1",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -32,7 +32,7 @@
   "peerDependencies": {
     "@swc-node/register": "^1.6.5",
     "better-sqlite3": "^8.4.0",
-    "graphql": "^16.5.0"
+    "graphql": "^16.8.1"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {

package/scripts/fix_action_exports.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/fix_action_exports.js

@@ -0,0 +1,75 @@
+"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 });
+const ast_1 = require("../tsc/ast");
+const transform_1 = require("../tsc/transform");
+const typescript_1 = __importStar(require("typescript"));
+class FixActionExports {
+    constructor() {
+        this.glob = "src/ent/**/actions/*_action.ts";
+        this.prettierGlob = "src/ent/**/actions/*_action.ts";
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!(0, typescript_1.isClassDeclaration)(node)) {
+            return { node };
+        }
+        // only Action classes
+        if (!node.name?.text.endsWith("Action")) {
+            return { node };
+        }
+        const modifiers = typescript_1.default.canHaveModifiers(node)
+            ? typescript_1.default.getModifiers(node)
+            : undefined;
+        const exported = modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
+        const defaultExport = modifiers?.filter((mod) => mod.getText(sourceFile) === "default");
+        // for now, we're only supporting changing from default -> non-default
+        // trivial to support the other way around but don't need it yet
+        if (!exported?.length || !defaultExport?.length) {
+            return { node };
+        }
+        let classInfo = (0, ast_1.getClassInfo)(contents, sourceFile, node, {
+            hasExport: true,
+            hasDefault: false,
+        });
+        if (!classInfo) {
+            // somehow don't have classInfo, bye
+            return { node };
+        }
+        let klassContents = "";
+        for (const mm of node.members) {
+            klassContents += mm.getFullText(sourceFile);
+        }
+        return {
+            traversed: true,
+            rawString: classInfo.wrapClassContents(klassContents),
+        };
+    }
+}
+// ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/fix_action_exports.ts
+function main() {
+    const f = new FixActionExports();
+    (0, transform_1.transform)(f);
+}
+main();

package/testutils/builder.d.ts

@@ -1,4 +1,4 @@
-import { Ent, ID, Viewer, Data, EntConstructor, PrivacyPolicy } from "../core/base";
+import { Ent, ID, Viewer, Data, EntConstructor, PrivacyPolicy, LoadEntOptions } from "../core/base";
 import { Orchestrator } from "../action/orchestrator";
 import { Action, Builder, Changeset, WriteOperation, Validator, Trigger, Observer } from "../action";
 import { FieldMap, Schema } from "../schema";
@@ -15,6 +15,17 @@ export declare class BaseEnt {
     getPrivacyPolicy(): PrivacyPolicy;
     __setRawDBData(data: Data): void;
 }
+export declare class AnyEnt implements Ent {
+    viewer: Viewer;
+    readonly data: Data;
+    nodeType: string;
+    readonly id: ID;
+    constructor(viewer: Viewer, data: Data);
+    getKey(): string;
+    getPrivacyPolicy(): PrivacyPolicy;
+    __setRawDBData(data: Data): void;
+    static loaderOptions(tableName: string, fields: string[], opts?: Partial<LoadEntOptions<AnyEnt>>): LoadEntOptions<AnyEnt>;
+}
 export declare class User extends BaseEnt implements Ent {
     viewer: Viewer;
     data: Data;

package/testutils/builder.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getDbFields = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = exports.BaseEnt = void 0;
+exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getDbFields = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = exports.AnyEnt = exports.BaseEnt = void 0;
 const privacy_1 = require("../core/privacy");
 const orchestrator_1 = require("../action/orchestrator");
 const action_1 = require("../action");
@@ -35,6 +35,38 @@ class BaseEnt {
     }
 }
 exports.BaseEnt = BaseEnt;
+class AnyEnt {
+    constructor(viewer, data) {
+        this.viewer = viewer;
+        this.data = data;
+        this.nodeType = "Any";
+        this.id = data[this.getKey()];
+    }
+    getKey() {
+        return "id";
+    }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
+    __setRawDBData(data) {
+        // doesn't apply here so ignore...
+    }
+    static loaderOptions(tableName, fields, opts) {
+        return {
+            tableName,
+            fields,
+            ent: AnyEnt,
+            loaderFactory: new loaders_1.ObjectLoaderFactory({
+                tableName,
+                fields,
+                key: "id",
+            }),
+            alias: tableName[0],
+            ...opts,
+        };
+    }
+}
+exports.AnyEnt = AnyEnt;
 class User extends BaseEnt {
     constructor(viewer, data) {
         super(viewer, data);
@@ -164,7 +196,8 @@ 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/db/temp_db.js

@@ -523,7 +523,7 @@ class TempDB {
         await db_1.default.getInstance().endPool();
         // drop db
         await this.client.query(`DROP DATABASE ${this.db}`);
-        // console.log(this.db);
+        // console.debug(this.db);
         await this.client.end();
     }
     getDB() {

package/tsc/ast.d.ts

@@ -9,7 +9,10 @@ export interface ClassInfo {
     implements?: string[];
     wrapClassContents(inner: string): string;
 }
-export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
+export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration, override?: {
+    hasExport: boolean;
+    hasDefault: boolean;
+}): ClassInfo | undefined;
 type transformImportFn = (imp: string) => string;
 interface transformOpts {
     removeImports?: string[];

package/tsc/ast.js

@@ -36,7 +36,7 @@ function getPreText(fileContents, node, sourceFile) {
     return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
 }
 exports.getPreText = getPreText;
-function getClassInfo(fileContents, sourceFile, node) {
+function getClassInfo(fileContents, sourceFile, node, override) {
     let className = node.name?.text;
     let classExtends;
     let impl = [];
@@ -83,7 +83,11 @@ function getClassInfo(fileContents, sourceFile, node) {
       ${inner}
     }`;
     };
-    if (node.modifiers) {
+    if (override) {
+        hasExport = override.hasExport;
+        hasDefault = override.hasDefault;
+    }
+    else if (node.modifiers) {
         for (const mod of node.modifiers) {
             const text = mod.getText(sourceFile);
             if (text === "export") {

package/tsc/transform.js

@@ -168,7 +168,7 @@ function transform(transform) {
         }
     });
     if (transform.prettierGlob) {
-        (0, child_process_1.execSync)(`prettier ${transform.prettierGlob} --write`);
+        (0, child_process_1.spawnSync)(`prettier`, [transform.prettierGlob, "--write"]);
     }
 }
 exports.transform = transform;