zenstack 0.1.0 → 0.1.1

package/out/cli/index.js

@@ -1,27 +1,4 @@
 "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;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,45 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAction = void 0;
 const commander_1 = require("commander");
 const module_1 = require("../language-server/generated/module");
 const zmodel_module_1 = require("../language-server/zmodel-module");
 const cli_util_1 = require("./cli-util");
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
-const colors_1 = __importDefault(require("colors"));
-const prisma_1 = __importDefault(require("../generator/prisma"));
-const service_1 = __importDefault(require("../generator/service"));
-const react_hooks_1 = __importDefault(require("../generator/react-hooks"));
-const next_auth_1 = __importDefault(require("../generator/next-auth"));
-const server_1 = __importDefault(require("../generator/server"));
+const generator_1 = require("../generator");
 const generateAction = (fileName, opts) => __awaiter(void 0, void 0, void 0, function* () {
     const services = (0, zmodel_module_1.createZModelServices)().ZModel;
     const model = yield (0, cli_util_1.extractAstNode)(fileName, services);
     const context = {
         schema: model,
-        outDir: path.resolve(opts.destination),
+        outDir: opts.destination || 'node_modules/.zenstack',
     };
-    if (!fs.existsSync(context.outDir)) {
-        fs.mkdirSync(context.outDir);
-    }
-    console.log(colors_1.default.bold('⌛️ Running ZenStack generators'));
-    const generators = [
-        new prisma_1.default(),
-        new service_1.default(),
-        new react_hooks_1.default(),
-        new server_1.default(),
-        new next_auth_1.default(),
-    ];
-    for (const generator of generators) {
-        yield generator.generate(context);
-    }
-    console.log(colors_1.default.green(colors_1.default.bold('👻 All generators completed successfully!')));
+    yield new generator_1.ZenStackGenerator().generate(context);
 });
 exports.generateAction = generateAction;
 function default_1() {
@@ -81,7 +34,7 @@ function default_1() {
     program
         .command('generate')
         .argument('<file>', `source file (possible file extensions: ${fileExtensions})`)
-        .option('-d, --destination <dir>', 'destination directory of generating', '.zenstack')
+        .option('-d, --destination <dir>', 'destination directory of generating')
         .description('generates JavaScript code that prints "Hello, {name}!" for each greeting in a source file')
         .action(exports.generateAction);
     program.parse(process.argv);

package/out/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAoC;AAEpC,gEAA6E;AAC7E,oEAAwE;AACxE,yCAA4C;AAE5C,2CAA6B;AAC7B,uCAAyB;AACzB,oDAA4B;AAC5B,iEAAkD;AAClD,mEAAoD;AACpD,2EAA2D;AAC3D,uEAAuD;AACvD,iEAAkD;AAE3C,MAAM,cAAc,GAAG,CAC1B,QAAgB,EAChB,IAAqB,EACR,EAAE;IACf,MAAM,QAAQ,GAAG,IAAA,oCAAoB,GAAE,CAAC,MAAM,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,IAAA,yBAAc,EAAQ,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAY;QACrB,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;KACzC,CAAC;IAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAChC;IAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAE3D,MAAM,UAAU,GAAG;QACf,IAAI,gBAAe,EAAE;QACrB,IAAI,iBAAgB,EAAE;QACtB,IAAI,qBAAmB,EAAE;QACzB,IAAI,gBAAe,EAAE;QACrB,IAAI,mBAAiB,EAAE;KAC1B,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;KACrC;IAED,OAAO,CAAC,GAAG,CACP,gBAAM,CAAC,KAAK,CAAC,gBAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC,CACzE,CAAC;AACN,CAAC,CAAA,CAAC;AAjCW,QAAA,cAAc,kBAiCzB;AAMF;IACI,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO;QACH,8DAA8D;SAC7D,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,cAAc,GAAG,+BAAsB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,OAAO;SACF,OAAO,CAAC,UAAU,CAAC;SACnB,QAAQ,CACL,QAAQ,EACR,0CAA0C,cAAc,GAAG,CAC9D;SACA,MAAM,CACH,yBAAyB,EACzB,qCAAqC,EACrC,WAAW,CACd;SACA,WAAW,CACR,2FAA2F,CAC9F;SACA,MAAM,CAAC,sBAAc,CAAC,CAAC;IAE5B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAzBD,4BAyBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AAEpC,gEAA6E;AAC7E,oEAAwE;AACxE,yCAA4C;AAE5C,4CAAiD;AAE1C,MAAM,cAAc,GAAG,CAC1B,QAAgB,EAChB,IAAqB,EACR,EAAE;IACf,MAAM,QAAQ,GAAG,IAAA,oCAAoB,GAAE,CAAC,MAAM,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,IAAA,yBAAc,EAAQ,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAY;QACrB,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,IAAI,CAAC,WAAW,IAAI,wBAAwB;KACvD,CAAC;IAEF,MAAM,IAAI,6BAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC;AAbW,QAAA,cAAc,kBAazB;AAMF;IACI,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO;QACH,8DAA8D;SAC7D,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,cAAc,GAAG,+BAAsB,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,OAAO;SACF,OAAO,CAAC,UAAU,CAAC;SACnB,QAAQ,CACL,QAAQ,EACR,0CAA0C,cAAc,GAAG,CAC9D;SACA,MAAM,CACH,yBAAyB,EACzB,qCAAqC,CACxC;SACA,WAAW,CACR,2FAA2F,CAC9F;SACA,MAAM,CAAC,sBAAc,CAAC,CAAC;IAE5B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAxBD,4BAwBC"}

package/out/cli/package.template.json

@@ -0,0 +1,10 @@
+{
+    "name": ".zenstack",
+    "version": "1.0.0",
+    "description": "ZenStack generated code",
+    "main": "service.js",
+    "types": "service.d.ts",
+    "files": ["lib"],
+    "author": "ZenStack",
+    "license": "MIT"
+}

package/out/cli/tsconfig.template.json

@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "CommonJS",
+        "lib": ["ESNext", "DOM"],
+        "sourceMap": true,
+        "outDir": "lib",
+        "strict": true,
+        "moduleResolution": "node",
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "declaration": true,
+        "resolveJsonModule": true
+    },
+    "include": ["**/*.ts"],
+    "exclude": ["lib", ".prisma", "node_modules"]
+}

package/out/generator/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GUARD_FIELD_NAME = exports.RUNTIME_PACKAGE = void 0;
+exports.RUNTIME_PACKAGE = '@zenstackhq/runtime';
+exports.GUARD_FIELD_NAME = 'zenstack_guard';
+//# sourceMappingURL=constants.js.map

package/out/generator/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/generator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,qBAAqB,CAAC;AACxC,QAAA,gBAAgB,GAAG,gBAAgB,CAAC"}

package/out/generator/index.js

@@ -0,0 +1,76 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZenStackGenerator = void 0;
+const fs = __importStar(require("fs"));
+const colors_1 = __importDefault(require("colors"));
+const prisma_1 = __importDefault(require("./prisma"));
+const service_1 = __importDefault(require("./service"));
+const react_hooks_1 = __importDefault(require("./react-hooks"));
+const next_auth_1 = __importDefault(require("./next-auth"));
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+class ZenStackGenerator {
+    generate(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!fs.existsSync(context.outDir)) {
+                fs.mkdirSync(context.outDir);
+            }
+            console.log(colors_1.default.bold('⌛️ Running ZenStack generators'));
+            const generators = [
+                new prisma_1.default(),
+                new service_1.default(),
+                new react_hooks_1.default(),
+                new next_auth_1.default(),
+            ];
+            for (const generator of generators) {
+                yield generator.generate(context);
+            }
+            // generate package.json
+            const packageJson = require(path_1.default.join(__dirname, 'package.template.json'));
+            fs.writeFileSync(path_1.default.join(context.outDir, 'package.json'), JSON.stringify(packageJson, undefined, 4));
+            // compile ts sources
+            const tsConfig = require(path_1.default.join(__dirname, 'tsconfig.template.json'));
+            fs.writeFileSync(path_1.default.join(context.outDir, 'tsconfig.json'), JSON.stringify(tsConfig, undefined, 4));
+            (0, child_process_1.execSync)(`npx tsc -p "${path_1.default.join(context.outDir, 'tsconfig.json')}"`);
+            console.log(colors_1.default.blue('  ✔️ Typescript source files transpiled'));
+            console.log(colors_1.default.green(colors_1.default.bold('👻 All generators completed successfully!')));
+        });
+    }
+}
+exports.ZenStackGenerator = ZenStackGenerator;
+//# sourceMappingURL=index.js.map

package/out/generator/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyB;AACzB,oDAA4B;AAC5B,sDAAuC;AACvC,wDAAyC;AACzC,gEAAgD;AAChD,4DAA4C;AAC5C,gDAAwB;AACxB,iDAAyC;AAEzC,MAAa,iBAAiB;IACpB,QAAQ,CAAC,OAAgB;;YAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAChC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAChC;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAE3D,MAAM,UAAU,GAAG;gBACf,IAAI,gBAAe,EAAE;gBACrB,IAAI,iBAAgB,EAAE;gBACtB,IAAI,qBAAmB,EAAE;gBACzB,IAAI,mBAAiB,EAAE;aAC1B,CAAC;YAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAChC,MAAM,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aACrC;YAED,wBAAwB;YACxB,MAAM,WAAW,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CACjC,SAAS,EACT,uBAAuB,CAC1B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,EACzC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAC5C,CAAC;YAEF,qBAAqB;YACrB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CAC9B,SAAS,EACT,wBAAwB,CAC3B,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CACzC,CAAC;YAEF,IAAA,wBAAQ,EAAC,eAAe,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,CAAC;YAEpE,OAAO,CAAC,GAAG,CACP,gBAAM,CAAC,KAAK,CACR,gBAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAC3D,CACJ,CAAC;QACN,CAAC;KAAA;CACJ;AAhDD,8CAgDC"}

package/out/generator/next-auth/index.js

@@ -54,9 +54,9 @@ class NextAuthGenerator {
     }
     generateAdapter(project, context) {
         const content = `
-        import { ZenStackService } from '../service';
+        import { ZenStackService } from '..';
         import { Adapter } from 'next-auth/adapters';
-        import { Prisma } from '@zenstack/.prisma';
+        import { Prisma } from '../.prisma';
         
         export function NextAuthAdapter(service: ZenStackService): Adapter {
             const db = service.db;
@@ -118,7 +118,7 @@ class NextAuthGenerator {
     }
     generateAuthorize(project, context) {
         const content = `
-        import { ZenStackService } from '../service';
+        import { ZenStackService } from '..';
         import { hash, compare } from 'bcryptjs';
         
         async function hashPassword(password: string) {

package/out/generator/package.template.json

@@ -0,0 +1,9 @@
+{
+    "name": ".zenstack",
+    "version": "1.0.0",
+    "description": "ZenStack generated code",
+    "main": "index.js",
+    "types": "index.d.ts",
+    "author": "ZenStack",
+    "license": "MIT"
+}

package/out/generator/prisma/expression-writer.js

@@ -0,0 +1,287 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ast_1 = require("../../language-server/generated/ast");
+const types_1 = require("../types");
+const plain_expression_builder_1 = __importDefault(require("./plain-expression-builder"));
+const AUX_GUARD_FIELD = 'zenstack_guard';
+class ExpressionWriter {
+    constructor(writer) {
+        this.writer = writer;
+        this.plainExprBuilder = new plain_expression_builder_1.default();
+    }
+    write(expr) {
+        const _write = () => {
+            switch (expr.$type) {
+                case ast_1.LiteralExpr:
+                    this.writeLiteral(expr);
+                    break;
+                case ast_1.UnaryExpr:
+                    this.writeUnary(expr);
+                    break;
+                case ast_1.BinaryExpr:
+                    this.writeBinary(expr);
+                    break;
+                case ast_1.ReferenceExpr:
+                    this.writeReference(expr);
+                    break;
+                case ast_1.MemberAccessExpr:
+                    this.writeMemberAccess(expr);
+                    break;
+                default:
+                    throw new Error(`Not implemented: ${expr.$type}`);
+            }
+        };
+        this.block(_write);
+    }
+    writeReference(expr) {
+        if ((0, ast_1.isEnumField)(expr.target.ref)) {
+            throw new Error('We should never get here');
+        }
+        else {
+            this.writer.write(`${expr.target.ref.name}: true`);
+        }
+    }
+    writeMemberAccess(expr) {
+        this.writeFieldCondition(expr.operand, () => {
+            this.block(() => {
+                var _a;
+                this.writer.write(`${(_a = expr.member.ref) === null || _a === void 0 ? void 0 : _a.name}: true`);
+            });
+        }, 'is');
+    }
+    writeExprList(exprs) {
+        this.writer.writeLine('[');
+        for (let i = 0; i < exprs.length; i++) {
+            this.write(exprs[i]);
+            if (i !== exprs.length - 1) {
+                this.writer.writeLine(',');
+            }
+        }
+        this.writer.writeLine(']');
+    }
+    writeBinary(expr) {
+        switch (expr.operator) {
+            case '&&':
+            case '||':
+                this.writeLogical(expr, expr.operator);
+                break;
+            case '==':
+            case '!=':
+            case '>':
+            case '>=':
+            case '<':
+            case '<=':
+                this.writeComparison(expr, expr.operator);
+                break;
+            case '?':
+            case '!':
+            case '^':
+                this.writeCollectionPredicate(expr, expr.operator);
+                break;
+        }
+    }
+    writeCollectionPredicate(expr, operator) {
+        this.writeFieldCondition(expr.left, () => {
+            this.write(expr.right);
+        }, operator === '?' ? 'some' : operator === '!' ? 'every' : 'none');
+    }
+    isFieldAccess(expr) {
+        if ((0, ast_1.isThisExpr)(expr)) {
+            return true;
+        }
+        if ((0, ast_1.isMemberAccessExpr)(expr)) {
+            return this.isFieldAccess(expr.operand);
+        }
+        if ((0, ast_1.isReferenceExpr)(expr) && (0, ast_1.isDataModelField)(expr.target.ref)) {
+            return true;
+        }
+        return false;
+    }
+    guard(write) {
+        this.writer.write(`${AUX_GUARD_FIELD}: `);
+        write();
+    }
+    plain(expr) {
+        this.writer.write(this.plainExprBuilder.build(expr));
+    }
+    writeComparison(expr, operator) {
+        const leftIsFieldAccess = this.isFieldAccess(expr.left);
+        const rightIsFieldAccess = this.isFieldAccess(expr.right);
+        if (leftIsFieldAccess && rightIsFieldAccess) {
+            throw new types_1.GeneratorError(`Comparison between fields are not supported yet`);
+        }
+        if (!leftIsFieldAccess && !rightIsFieldAccess) {
+            // compile down to a plain expression
+            this.guard(() => {
+                this.plain(expr.left);
+                this.writer.write(' ' + operator + ' ');
+                this.plain(expr.right);
+            });
+            return;
+        }
+        let fieldAccess;
+        let operand;
+        if (leftIsFieldAccess) {
+            fieldAccess = expr.left;
+            operand = expr.right;
+        }
+        else {
+            fieldAccess = expr.right;
+            operand = expr.left;
+            operator = this.negateOperator(operator);
+        }
+        this.writeFieldCondition(fieldAccess, () => {
+            this.block(() => {
+                if (this.isModelTyped(fieldAccess)) {
+                    // comparing with an object, conver to "id" comparison instead
+                    this.writer.write('id: ');
+                    this.block(() => {
+                        this.writeOperator(operator, () => {
+                            this.plain(operand);
+                            this.writer.write('?.id');
+                        });
+                    });
+                }
+                else {
+                    this.writeOperator(operator, () => {
+                        this.plain(operand);
+                    });
+                }
+            }, 
+            // "this" expression is compiled away (to .id access), so we should
+            // avoid generating a new layer
+            !(0, ast_1.isThisExpr)(fieldAccess));
+        }, 'is');
+    }
+    writeOperator(operator, writeOperand) {
+        if (operator === '!=') {
+            // wrap a 'not'
+            this.writer.write('not: ');
+            this.block(() => {
+                this.writeOperator('==', writeOperand);
+            });
+        }
+        else {
+            this.writer.write(`${this.mapOperator(operator)}: `);
+            writeOperand();
+        }
+    }
+    writeFieldCondition(fieldAccess, writeCondition, relationOp) {
+        var _a, _b;
+        let selector;
+        let operand;
+        if ((0, ast_1.isThisExpr)(fieldAccess)) {
+            // pass on
+            writeCondition();
+            return;
+        }
+        else if ((0, ast_1.isReferenceExpr)(fieldAccess)) {
+            selector = (_a = fieldAccess.target.ref) === null || _a === void 0 ? void 0 : _a.name;
+        }
+        else if ((0, ast_1.isMemberAccessExpr)(fieldAccess)) {
+            selector = (_b = fieldAccess.member.ref) === null || _b === void 0 ? void 0 : _b.name;
+            operand = fieldAccess.operand;
+        }
+        else {
+            throw new types_1.GeneratorError(`Unsupported expression type: ${fieldAccess.$type}`);
+        }
+        if (operand) {
+            // member access expression
+            this.writeFieldCondition(operand, () => {
+                this.block(() => {
+                    this.writer.write(selector + ': ');
+                    if (this.isModelTyped(fieldAccess)) {
+                        // expression is resolved to a model, generate relation query
+                        this.block(() => {
+                            this.writer.write(`${relationOp}: `);
+                            writeCondition();
+                        });
+                    }
+                    else {
+                        // generate plain query
+                        writeCondition();
+                    }
+                }, 
+                // if operand is "this", it doesn't really generate a new layer of query,
+                // so we should avoid generating a new block
+                !(0, ast_1.isThisExpr)(operand));
+            }, 'is');
+        }
+        else if (this.isModelTyped(fieldAccess)) {
+            // reference resolved to a model, generate relation query
+            this.writer.write(selector + ': ');
+            this.block(() => {
+                this.writer.write(`${relationOp}: `);
+                writeCondition();
+            });
+        }
+        else {
+            // generate a plain query
+            this.writer.write(selector + ': ');
+            writeCondition();
+        }
+    }
+    block(write, condition = true) {
+        if (condition) {
+            this.writer.block(write);
+        }
+        else {
+            write();
+        }
+    }
+    isModelTyped(expr) {
+        var _a;
+        return (0, ast_1.isDataModel)((_a = expr.$resolvedType) === null || _a === void 0 ? void 0 : _a.decl);
+    }
+    mapOperator(operator) {
+        switch (operator) {
+            case '==':
+                return 'equals';
+            case '!=':
+                throw new Error('Operation != should have been compiled away');
+            case '>':
+                return 'gt';
+            case '>=':
+                return 'ge';
+            case '<':
+                return 'lt';
+            case '<=':
+                return 'le';
+        }
+    }
+    negateOperator(operator) {
+        switch (operator) {
+            case '>':
+                return '<=';
+            case '<':
+                return '>=';
+            case '>=':
+                return '<';
+            case '<=':
+                return '>';
+            default:
+                return operator;
+        }
+    }
+    writeLogical(expr, operator) {
+        this.writer.writeLine(`${operator === '&&' ? 'AND' : 'OR'}: `);
+        this.writeExprList([expr.left, expr.right]);
+    }
+    writeUnary(expr) {
+        if (expr.operator !== '!') {
+            throw new types_1.GeneratorError(`Unary operator "${expr.operator}" is not supported`);
+        }
+        this.writer.writeLine('NOT: ');
+        this.write(expr.operand);
+    }
+    writeLiteral(expr) {
+        this.guard(() => {
+            this.plain(expr);
+        });
+    }
+}
+exports.default = ExpressionWriter;
+//# sourceMappingURL=expression-writer.js.map

package/out/generator/prisma/expression-writer.js.map

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