zenstack 0.6.0-pre.9 → 1.0.0-alpha.101

package/language-server/zmodel-module.d.ts

@@ -0,0 +1,41 @@
+import { DefaultSharedModuleContext, LangiumDefaultSharedServices, LangiumServices, LangiumSharedServices, Module, PartialLangiumServices } from 'langium';
+import { ZModelValidator } from './validator/zmodel-validator';
+/**
+ * Declaration of custom services - add your own service classes here.
+ */
+export declare type ZModelAddedServices = {
+    validation: {
+        ZModelValidator: ZModelValidator;
+    };
+};
+/**
+ * Union of Langium default services and your custom services - use this as constructor parameter
+ * of custom service classes.
+ */
+export declare type ZModelServices = LangiumServices & ZModelAddedServices;
+/**
+ * Dependency injection module that overrides Langium default services and contributes the
+ * declared custom services. The Langium defaults can be partially specified to override only
+ * selected services, while the custom services must be fully specified.
+ */
+export declare const ZModelModule: Module<ZModelServices, PartialLangiumServices & ZModelAddedServices>;
+export declare function createSharedModule(context: DefaultSharedModuleContext): Module<LangiumSharedServices, LangiumDefaultSharedServices>;
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ *
+ * @param context Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+export declare function createZModelServices(context: DefaultSharedModuleContext): {
+    shared: LangiumSharedServices;
+    ZModel: ZModelServices;
+};

package/language-server/zmodel-module.js

@@ -0,0 +1,80 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createZModelServices = exports.createSharedModule = exports.ZModelModule = void 0;
+const module_1 = require("@zenstackhq/language/module");
+const langium_1 = require("langium");
+const vscode_languageserver_1 = require("vscode-languageserver");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const zmodel_validator_1 = require("./validator/zmodel-validator");
+const zmodel_code_action_1 = require("./zmodel-code-action");
+const zmodel_formatter_1 = require("./zmodel-formatter");
+const zmodel_linker_1 = require("./zmodel-linker");
+const zmodel_scope_1 = require("./zmodel-scope");
+const zmodel_workspace_manager_1 = __importDefault(require("./zmodel-workspace-manager"));
+/**
+ * Dependency injection module that overrides Langium default services and contributes the
+ * declared custom services. The Langium defaults can be partially specified to override only
+ * selected services, while the custom services must be fully specified.
+ */
+exports.ZModelModule = {
+    references: {
+        ScopeComputation: (services) => new zmodel_scope_1.ZModelScopeComputation(services),
+        Linker: (services) => new zmodel_linker_1.ZModelLinker(services),
+    },
+    validation: {
+        ValidationRegistry: (services) => new zmodel_validator_1.ZModelValidationRegistry(services),
+        ZModelValidator: () => new zmodel_validator_1.ZModelValidator(),
+    },
+    lsp: {
+        Formatter: () => new zmodel_formatter_1.ZModelFormatter(),
+        CodeActionProvider: (services) => new zmodel_code_action_1.ZModelCodeActionProvider(services),
+    },
+};
+// this duplicates createDefaultSharedModule except that a custom WorkspaceManager is used
+function createSharedModule(context) {
+    return {
+        ServiceRegistry: () => new langium_1.DefaultServiceRegistry(),
+        lsp: {
+            Connection: () => context.connection,
+            LanguageServer: (services) => new langium_1.DefaultLanguageServer(services),
+        },
+        workspace: {
+            LangiumDocuments: (services) => new langium_1.DefaultLangiumDocuments(services),
+            LangiumDocumentFactory: (services) => new langium_1.DefaultLangiumDocumentFactory(services),
+            DocumentBuilder: (services) => new langium_1.DefaultDocumentBuilder(services),
+            TextDocuments: () => new vscode_languageserver_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument),
+            IndexManager: (services) => new langium_1.DefaultIndexManager(services),
+            WorkspaceManager: (services) => new zmodel_workspace_manager_1.default(services),
+            FileSystemProvider: (services) => context.fileSystemProvider(services),
+            MutexLock: () => new langium_1.MutexLock(),
+            ConfigurationProvider: (services) => new langium_1.DefaultConfigurationProvider(services),
+        },
+    };
+}
+exports.createSharedModule = createSharedModule;
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ *
+ * @param context Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+function createZModelServices(context) {
+    const shared = (0, langium_1.inject)(createSharedModule(context), module_1.ZModelGeneratedSharedModule);
+    const ZModel = (0, langium_1.inject)((0, langium_1.createDefaultModule)({ shared }), module_1.ZModelGeneratedModule, exports.ZModelModule);
+    shared.ServiceRegistry.register(ZModel);
+    return { shared, ZModel };
+}
+exports.createZModelServices = createZModelServices;
+//# sourceMappingURL=zmodel-module.js.map

package/language-server/zmodel-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-module.js","sourceRoot":"","sources":["../../src/language-server/zmodel-module.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiG;AACjG,qCAiBiB;AACjB,iEAAsD;AACtD,2FAAkE;AAClE,mEAAyF;AACzF,6DAAgE;AAChE,yDAAqD;AACrD,mDAA+C;AAC/C,iDAAwD;AACxD,0FAAgE;AAiBhE;;;;GAIG;AACU,QAAA,YAAY,GAAyE;IAC9F,UAAU,EAAE;QACR,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,qCAAsB,CAAC,QAAQ,CAAC;QACpE,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,4BAAY,CAAC,QAAQ,CAAC;KACnD;IACD,UAAU,EAAE;QACR,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,2CAAwB,CAAC,QAAQ,CAAC;QACxE,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;KAC/C;IACD,GAAG,EAAE;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;QACtC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,6CAAwB,CAAC,QAAQ,CAAC;KAC3E;CACJ,CAAC;AAEF,0FAA0F;AAC1F,SAAgB,kBAAkB,CAC9B,OAAmC;IAEnC,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,gCAAsB,EAAE;QACnD,GAAG,EAAE;YACD,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU;YACpC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,+BAAqB,CAAC,QAAQ,CAAC;SACpE;QACD,SAAS,EAAE;YACP,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,iCAAuB,CAAC,QAAQ,CAAC;YACrE,sBAAsB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,QAAQ,CAAC;YACjF,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,gCAAsB,CAAC,QAAQ,CAAC;YACnE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,qCAAa,CAAC,iDAAY,CAAC;YACpD,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,6BAAmB,CAAC,QAAQ,CAAC;YAC7D,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,kCAAsB,CAAC,QAAQ,CAAC;YACpE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC;YACtE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,mBAAS,EAAE;YAChC,qBAAqB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,sCAA4B,CAAC,QAAQ,CAAC;SAClF;KACJ,CAAC;AACN,CAAC;AArBD,gDAqBC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,oBAAoB,CAAC,OAAmC;IAIpE,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,oCAA2B,CAAC,CAAC;IAEhF,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,IAAA,6BAAmB,EAAC,EAAE,MAAM,EAAE,CAAC,EAAE,8BAAqB,EAAE,oBAAY,CAAC,CAAC;IAC5F,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AATD,oDASC"}

package/language-server/zmodel-scope.d.ts

@@ -0,0 +1,10 @@
+import { AstNode, AstNodeDescription, DefaultScopeComputation, LangiumDocument, LangiumServices } from 'langium';
+import { CancellationToken } from 'vscode-jsonrpc';
+/**
+ * Custom Langium ScopeComputation implementation which adds enum fields into global scope
+ */
+export declare class ZModelScopeComputation extends DefaultScopeComputation {
+    private readonly services;
+    constructor(services: LangiumServices);
+    computeExports(document: LangiumDocument<AstNode>, cancelToken?: CancellationToken | undefined): Promise<AstNodeDescription[]>;
+}

package/language-server/zmodel-scope.js

@@ -0,0 +1,44 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZModelScopeComputation = void 0;
+const ast_1 = require("@zenstackhq/language/ast");
+const langium_1 = require("langium");
+/**
+ * Custom Langium ScopeComputation implementation which adds enum fields into global scope
+ */
+class ZModelScopeComputation extends langium_1.DefaultScopeComputation {
+    constructor(services) {
+        super(services);
+        this.services = services;
+    }
+    computeExports(document, cancelToken) {
+        const _super = Object.create(null, {
+            computeExports: { get: () => super.computeExports }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield _super.computeExports.call(this, document, cancelToken);
+            // add enum fields so they can be globally resolved across modules
+            for (const node of (0, langium_1.streamAllContents)(document.parseResult.value)) {
+                if (cancelToken) {
+                    yield (0, langium_1.interruptAndCheck)(cancelToken);
+                }
+                if ((0, ast_1.isEnumField)(node)) {
+                    const desc = this.services.workspace.AstNodeDescriptionProvider.createDescription(node, node.name, document);
+                    result.push(desc);
+                }
+            }
+            return result;
+        });
+    }
+}
+exports.ZModelScopeComputation = ZModelScopeComputation;
+//# sourceMappingURL=zmodel-scope.js.map

package/language-server/zmodel-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAuD;AACvD,qCAQiB;AAGjB;;GAEG;AACH,MAAa,sBAAuB,SAAQ,iCAAuB;IAC/D,YAA6B,QAAyB;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;QADS,aAAQ,GAAR,QAAQ,CAAiB;IAEtD,CAAC;IAEK,cAAc,CAChB,QAAkC,EAClC,WAA2C;;;;;YAE3C,MAAM,MAAM,GAAG,MAAM,OAAM,cAAc,YAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEjE,kEAAkE;YAClE,KAAK,MAAM,IAAI,IAAI,IAAA,2BAAiB,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBAC9D,IAAI,WAAW,EAAE;oBACb,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;iBACxC;gBACD,IAAI,IAAA,iBAAW,EAAC,IAAI,CAAC,EAAE;oBACnB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAAC,iBAAiB,CAC7E,IAAI,EACJ,IAAI,CAAC,IAAI,EACT,QAAQ,CACX,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;aACJ;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA5BD,wDA4BC"}

package/language-server/zmodel-workspace-manager.d.ts

@@ -0,0 +1,12 @@
+import { DefaultWorkspaceManager, LangiumDocument } from 'langium';
+import { CancellationToken, WorkspaceFolder } from 'vscode-languageserver';
+import { URI } from 'vscode-uri';
+/**
+ * Custom Langium WorkspaceManager implementation which automatically loads stdlib.zmodel
+ */
+export default class ZModelWorkspaceManager extends DefaultWorkspaceManager {
+    pluginModels: Set<string>;
+    protected loadAdditionalDocuments(_folders: WorkspaceFolder[], _collector: (document: LangiumDocument) => void): Promise<void>;
+    initializeWorkspace(folders: WorkspaceFolder[], cancelToken?: CancellationToken): Promise<void>;
+    protected loadPluginModels(workspaceFolder: WorkspaceFolder, folderPath: URI, pluginModels: Set<string>, collector: (document: LangiumDocument) => void): Promise<void>;
+}

package/language-server/zmodel-workspace-manager.js

@@ -0,0 +1,138 @@
+"use strict";
+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 });
+const ast_1 = require("@zenstackhq/language/ast");
+const sdk_1 = require("@zenstackhq/sdk");
+const langium_1 = require("langium");
+const path_1 = __importDefault(require("path"));
+const vscode_languageserver_1 = require("vscode-languageserver");
+const vscode_uri_1 = require("vscode-uri");
+const constants_1 = require("./constants");
+/**
+ * Custom Langium WorkspaceManager implementation which automatically loads stdlib.zmodel
+ */
+class ZModelWorkspaceManager extends langium_1.DefaultWorkspaceManager {
+    constructor() {
+        super(...arguments);
+        this.pluginModels = new Set();
+    }
+    loadAdditionalDocuments(_folders, _collector) {
+        const _super = Object.create(null, {
+            loadAdditionalDocuments: { get: () => super.loadAdditionalDocuments }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.loadAdditionalDocuments.call(this, _folders, _collector);
+            const stdLibUri = vscode_uri_1.URI.file(path_1.default.join(__dirname, '../res', constants_1.STD_LIB_MODULE_NAME));
+            console.log(`Adding stdlib document from ${stdLibUri}`);
+            const stdlib = this.langiumDocuments.getOrCreateDocument(stdLibUri);
+            _collector(stdlib);
+        });
+    }
+    initializeWorkspace(folders, cancelToken = vscode_languageserver_1.CancellationToken.None) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileExtensions = this.serviceRegistry.all.flatMap((e) => e.LanguageMetaData.fileExtensions);
+            const documents = [];
+            const collector = (document) => {
+                documents.push(document);
+                if (!this.langiumDocuments.hasDocument(document.uri)) {
+                    this.langiumDocuments.addDocument(document);
+                }
+            };
+            yield this.loadAdditionalDocuments(folders, collector);
+            yield Promise.all(folders
+                .map((wf) => [wf, this.getRootFolder(wf)])
+                .map((entry) => __awaiter(this, void 0, void 0, function* () { return this.traverseFolder(...entry, fileExtensions, collector); })));
+            // find plugin models
+            documents.forEach((doc) => {
+                const parsed = doc.parseResult.value;
+                parsed.declarations.forEach((decl) => {
+                    if ((0, ast_1.isPlugin)(decl)) {
+                        const providerField = decl.fields.find((f) => f.name === 'provider');
+                        if (providerField) {
+                            const provider = (0, sdk_1.getLiteral)(providerField.value);
+                            if (provider) {
+                                this.pluginModels.add(provider);
+                            }
+                        }
+                    }
+                });
+            });
+            if (this.pluginModels.size > 0) {
+                console.log(`Used plugin documents: ${Array.from(this.pluginModels)}`);
+                // the loaded plugin models would be removed from the set
+                const unLoadedPluginModels = new Set(this.pluginModels);
+                yield Promise.all(folders
+                    .map((wf) => [wf, this.getRootFolder(wf)])
+                    .map((entry) => __awaiter(this, void 0, void 0, function* () { return this.loadPluginModels(...entry, unLoadedPluginModels, collector); })));
+                if (unLoadedPluginModels.size > 0) {
+                    console.warn(`The following plugin documents could not be loaded: ${Array.from(unLoadedPluginModels)}`);
+                }
+            }
+            // Only after creating all documents do we check whether we need to cancel the initialization
+            // The document builder will later pick up on all unprocessed documents
+            yield (0, langium_1.interruptAndCheck)(cancelToken);
+            yield this.documentBuilder.build(documents, undefined, cancelToken);
+        });
+    }
+    loadPluginModels(workspaceFolder, folderPath, pluginModels, collector) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const content = yield (yield this.fileSystemProvider.readDirectory(folderPath)).sort((a, b) => {
+                // make sure the node_moudules folder is always the first one to be checked
+                // so it could be early exited if the plugin is found
+                if (a.isDirectory && b.isDirectory) {
+                    const aName = vscode_uri_1.Utils.basename(a.uri);
+                    if (aName === 'node_modules') {
+                        return -1;
+                    }
+                    else {
+                        return 1;
+                    }
+                }
+                else {
+                    return 0;
+                }
+            });
+            for (const entry of content) {
+                if (entry.isDirectory) {
+                    const name = vscode_uri_1.Utils.basename(entry.uri);
+                    if (name === 'node_modules') {
+                        for (const plugin of Array.from(pluginModels)) {
+                            const path = vscode_uri_1.Utils.joinPath(entry.uri, plugin, constants_1.PLUGIN_MODULE_NAME);
+                            try {
+                                this.fileSystemProvider.readFileSync(path);
+                                const document = this.langiumDocuments.getOrCreateDocument(path);
+                                collector(document);
+                                console.log(`Adding plugin document from ${path.path}`);
+                                pluginModels.delete(plugin);
+                                // early exit if all plugins are loaded
+                                if (pluginModels.size === 0) {
+                                    return;
+                                }
+                            }
+                            catch (_a) {
+                                // no-op. The module might be found in another node_modules folder
+                                // will show the warning message eventually if not found
+                            }
+                        }
+                    }
+                    else {
+                        yield this.loadPluginModels(workspaceFolder, entry.uri, pluginModels, collector);
+                    }
+                }
+            }
+        });
+    }
+}
+exports.default = ZModelWorkspaceManager;
+//# sourceMappingURL=zmodel-workspace-manager.js.map

package/language-server/zmodel-workspace-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-workspace-manager.js","sourceRoot":"","sources":["../../src/language-server/zmodel-workspace-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-  "version": "0.6.0-pre.9",
+  "version": "1.0.0-alpha.101",
   "author": {
     "name": "ZenStack Team"
   },
@@ -15,14 +15,14 @@
     "typescript",
     "data modeling"
   ],
-  "preview": true,
+  "preview": false,
   "icon": "asset/logo-256-bg.png",
   "repository": {
     "type": "git",
     "url": "https://github.com/zenstackhq/zenstack"
   },
   "publishConfig": {
-    "directory": "bundle",
+    "directory": "dist",
     "linkDirectory": true
   },
   "engines": {
@@ -63,23 +63,27 @@
   "bin": {
     "zenstack": "bin/cli"
   },
-  "main": "./extension.js",
+  "main": "./bundle/extension.js",
+  "peerDependencies": {
+    "prisma": "^4.0.0"
+  },
   "dependencies": {
-    "@prisma/generator-helper": "^4.7.1",
-    "@prisma/internals": "^4.7.1",
+    "@prisma/generator-helper": "^4.0.0",
+    "@prisma/internals": "^4.0.0",
     "async-exit-hook": "^2.0.1",
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",
     "colors": "1.4.0",
     "commander": "^8.3.0",
     "cuid": "^2.1.8",
-    "langium": "^0.5.0",
+    "get-latest-version": "^5.0.1",
+    "langium": "1.1.0",
     "mixpanel": "^0.17.0",
     "node-machine-id": "^1.1.12",
-    "ora": "^6.1.2",
+    "ora": "^5.4.1",
     "pluralize": "^8.0.0",
-    "prisma": "~4.7.0",
     "promisify": "^0.0.3",
+    "semver": "^7.3.8",
     "sleep-promise": "^9.1.0",
     "ts-morph": "^16.0.0",
     "uuid": "^9.0.0",
@@ -89,46 +93,50 @@
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-uri": "^3.0.6",
     "zod": "^3.19.1",
-    "@zenstackhq/language": "0.6.0-pre.2",
-    "@zenstackhq/runtime": "0.6.0-pre.2",
-    "@zenstackhq/sdk": "0.6.0-pre.2"
+    "zod-validation-error": "^0.2.1",
+    "@zenstackhq/language": "1.0.0-alpha.101",
+    "@zenstackhq/sdk": "1.0.0-alpha.101"
   },
   "devDependencies": {
     "@types/async-exit-hook": "^2.0.0",
     "@types/jest": "^29.2.0",
     "@types/node": "^14.18.32",
     "@types/pluralize": "^0.0.29",
+    "@types/semver": "^7.3.13",
     "@types/tmp": "^0.2.3",
     "@types/uuid": "^8.3.4",
     "@types/vscode": "^1.56.0",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
     "concurrently": "^7.4.0",
+    "copyfiles": "^2.4.1",
     "dotenv": "^16.0.3",
     "esbuild": "^0.15.12",
     "eslint": "^8.27.0",
+    "eslint-plugin-jest": "^27.1.7",
     "jest": "^29.2.1",
-    "langium-cli": "^0.5.0",
+    "prisma": "^4.0.0",
+    "renamer": "^4.0.0",
     "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.7.0",
-    "tsconfig-paths-jest": "^0.0.1",
     "typescript": "^4.8.4",
-    "vsce": "^2.13.0"
+    "vitest": "^0.29.7",
+    "vsce": "^2.13.0",
+    "@zenstackhq/runtime": "1.0.0-alpha.101",
+    "@zenstackhq/testtools": "1.0.0-alpha.101"
   },
   "scripts": {
     "vscode:publish": "vsce publish --no-dependencies",
-    "vscode:prepublish": "cp ../../README.md ./ && pnpm lint && pnpm build",
+    "vscode:prepublish": "pnpm bundle",
     "vscode:package": "vsce package --no-dependencies",
-    "clean": "rimraf bundle",
-    "build": "pnpm lint && pnpm bundle && tsc --emitDeclarationOnly --declaration ",
-    "bundle": "pnpm clean && node build/bundle.js --minify",
-    "watch": "node build/bundle.js --watch",
-    "ts:watch": "tsc --watch --noEmit",
-    "tsc-alias:watch": "tsc-alias --watch",
-    "lint": "eslint src --ext ts",
+    "clean": "rimraf bundle dist",
+    "build": "pnpm clean && pnpm lint && tsc && copyfiles -F \"bin/*\" dist && copyfiles ./README-global.md ./LICENSE ./package.json dist && renamer --replace \"README.md\" dist/README-global.md && copyfiles -u 1 \"src/res/*\" dist && node build/post-build.js",
+    "bundle": "pnpm clean && pnpm lint && node build/bundle.js --minify",
+    "watch": "tsc --watch",
+    "lint": "eslint src tests --ext ts",
     "test": "jest",
     "publish-dev": "pnpm publish --tag dev",
     "postinstall": "node bin/post-install.js"

package/plugins/access-policy/expression-writer.d.ts

@@ -0,0 +1,41 @@
+import { Expression } from '@zenstackhq/language/ast';
+import { CodeBlockWriter } from 'ts-morph';
+/**
+ * Utility for writing ZModel expression as Prisma query argument objects into a ts-morph writer
+ */
+export declare class ExpressionWriter {
+    private readonly writer;
+    private readonly isPostGuard;
+    private readonly plainExprBuilder;
+    /**
+     * Constructs a new ExpressionWriter
+     *
+     * @param isPostGuard indicates if we're writing for post-update conditions
+     */
+    constructor(writer: CodeBlockWriter, isPostGuard?: boolean);
+    /**
+     * Writes the given ZModel expression.
+     */
+    write(expr: Expression): void;
+    private writeReference;
+    private writeMemberAccess;
+    private writeExprList;
+    private writeBinary;
+    private writeIn;
+    private writeCollectionPredicate;
+    private isFieldAccess;
+    private guard;
+    private plain;
+    private writeComparison;
+    private isAuthOrAuthMemberAccess;
+    private writeOperator;
+    private writeFieldCondition;
+    private block;
+    private isModelTyped;
+    private mapOperator;
+    private negateOperator;
+    private writeLogical;
+    private writeUnary;
+    private writeLiteral;
+    private writeInvocation;
+}