zenstack 1.0.0 → 1.0.1

package/language-server/zmodel-scope.js

@@ -0,0 +1,100 @@
+"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.ZModelScopeProvider = exports.ZModelScopeComputation = void 0;
+const ast_1 = require("@zenstackhq/language/ast");
+const langium_1 = require("langium");
+const ast_utils_1 = require("../utils/ast-utils");
+const constants_1 = require("./constants");
+/**
+ * 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;
+        });
+    }
+    computeLocalScopes(document, cancelToken) {
+        const result = super.computeLocalScopes(document, cancelToken);
+        //the $resolvedFields would be used in Linking stage for all the documents
+        //so we need to set it at the end of the scope computation
+        this.resolveBaseModels(document);
+        return result;
+    }
+    resolveBaseModels(document) {
+        const model = document.parseResult.value;
+        model.declarations.forEach((decl) => {
+            if (decl.$type === 'DataModel') {
+                const dataModel = decl;
+                dataModel.$resolvedFields = [...dataModel.fields];
+                dataModel.superTypes.forEach((superType) => {
+                    const superTypeDecl = superType.ref;
+                    if (superTypeDecl) {
+                        superTypeDecl.fields.forEach((field) => {
+                            const cloneField = Object.assign({}, field);
+                            cloneField.$isInherited = true;
+                            const mutable = cloneField;
+                            // update container
+                            mutable.$container = dataModel;
+                            dataModel.$resolvedFields.push(cloneField);
+                        });
+                    }
+                });
+            }
+        });
+    }
+}
+exports.ZModelScopeComputation = ZModelScopeComputation;
+class ZModelScopeProvider extends langium_1.DefaultScopeProvider {
+    constructor(services) {
+        super(services);
+    }
+    getGlobalScope(referenceType, context) {
+        const model = (0, langium_1.getContainerOfType)(context.container, ast_1.isModel);
+        if (!model) {
+            return langium_1.EMPTY_SCOPE;
+        }
+        const importedUris = (0, langium_1.stream)(model.imports).map(ast_utils_1.resolveImportUri).nonNullable();
+        const importedElements = this.indexManager.allElements(referenceType).filter((des) => {
+            var _a;
+            // allow current document
+            return (0, langium_1.equalURI)(des.documentUri, (_a = model.$document) === null || _a === void 0 ? void 0 : _a.uri) ||
+                // allow stdlib
+                des.documentUri.path.endsWith(constants_1.STD_LIB_MODULE_NAME) ||
+                // allow plugin models
+                des.documentUri.path.endsWith(constants_1.PLUGIN_MODULE_NAME) ||
+                // allow imported documents
+                importedUris.some((importedUri) => (des.documentUri, importedUri));
+        });
+        return new langium_1.StreamScope(importedElements);
+    }
+}
+exports.ZModelScopeProvider = ZModelScopeProvider;
+//# 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":"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"}

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

@@ -1,13 +1,145 @@
 {
   "name": "zenstack",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
+  "publisher": "zenstack",
+  "displayName": "ZenStack Language Tools",
+  "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
+  "version": "1.0.1",
+  "author": {
+    "name": "ZenStack Team"
+  },
+  "homepage": "https://zenstack.dev",
+  "license": "MIT",
+  "keywords": [
+    "fullstack",
+    "react",
+    "typescript",
+    "data modeling"
+  ],
+  "preview": false,
+  "icon": "asset/logo-256-bg.png",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zenstackhq/zenstack"
+  },
+  "publishConfig": {
+    "directory": "dist",
+    "linkDirectory": true
+  },
+  "engines": {
+    "vscode": "^1.56.0"
+  },
+  "categories": [
+    "Programming Languages"
+  ],
+  "contributes": {
+    "languages": [
+      {
+        "id": "zmodel",
+        "aliases": [
+          "ZenStack Model",
+          "zmodel"
+        ],
+        "extensions": [
+          ".zmodel"
+        ],
+        "configuration": "./language-configuration.json",
+        "icon": {
+          "light": "./asset/logo-light-256.png",
+          "dark": "./asset/logo-dark-256.png"
+        }
+      }
+    ],
+    "grammars": [
+      {
+        "language": "zmodel",
+        "scopeName": "source.zmodel",
+        "path": "./syntaxes/zmodel.tmLanguage.json"
+      }
+    ]
+  },
+  "activationEvents": [
+    "onLanguage:zmodel"
+  ],
+  "bin": {
+    "zenstack": "bin/cli"
+  },
+  "main": "./bundle/extension.js",
+  "dependencies": {
+    "@paralleldrive/cuid2": "^2.2.0",
+    "@prisma/generator-helper": "^5.0.0",
+    "async-exit-hook": "^2.0.1",
+    "change-case": "^4.1.2",
+    "colors": "1.4.0",
+    "commander": "^8.3.0",
+    "get-latest-version": "^5.0.1",
+    "langium": "1.2.0",
+    "lower-case-first": "^2.0.2",
+    "mixpanel": "^0.17.0",
+    "node-machine-id": "^1.1.12",
+    "ora": "^5.4.1",
+    "pluralize": "^8.0.0",
+    "promisify": "^0.0.3",
+    "semver": "^7.3.8",
+    "sleep-promise": "^9.1.0",
+    "strip-color": "^0.1.0",
+    "tiny-invariant": "^1.3.1",
+    "ts-morph": "^16.0.0",
+    "ts-pattern": "^4.3.0",
+    "upper-case-first": "^2.0.2",
+    "uuid": "^9.0.0",
+    "vscode-jsonrpc": "^8.0.2",
+    "vscode-languageclient": "^8.0.2",
+    "vscode-languageserver": "^8.0.2",
+    "vscode-languageserver-textdocument": "^1.0.7",
+    "vscode-uri": "^3.0.6",
+    "zod": "3.21.1",
+    "zod-validation-error": "^0.2.1",
+    "@zenstackhq/language": "1.0.0",
+    "@zenstackhq/sdk": "1.0.0"
+  },
+  "devDependencies": {
+    "@prisma/client": "^4.8.0",
+    "@types/async-exit-hook": "^2.0.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.0.0",
+    "@types/pluralize": "^0.0.29",
+    "@types/semver": "^7.3.13",
+    "@types/strip-color": "^0.1.0",
+    "@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",
+    "@vscode/vsce": "^2.19.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.5.0",
+    "prisma": "^4.8.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",
+    "typescript": "^4.8.4",
+    "vitest": "^0.29.7",
+    "@zenstackhq/runtime": "1.0.0"
+  },
   "scripts": {
-    "build": "pnpm -r build",
-    "test": "pnpm -r test"
+    "vscode:publish": "vsce publish --no-dependencies",
+    "vscode:prepublish": "pnpm bundle",
+    "vscode:package": "vsce package --no-dependencies",
+    "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 && pnpm pack dist --pack-destination '../../../.build'",
+    "bundle": "pnpm clean && pnpm lint && node build/bundle.js --minify",
+    "watch": "tsc --watch",
+    "lint": "eslint src tests --ext ts",
+    "test": "ZENSTACK_TEST=1 jest",
+    "publish-dev": "pnpm publish --registry http://localhost:4873",
+    "postinstall": "node bin/post-install.js"
   }
 }

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

@@ -0,0 +1,46 @@
+import { Expression } from '@zenstackhq/language/ast';
+import { CodeBlockWriter } from 'ts-morph';
+export declare const TRUE = "{ AND: [] }";
+export declare const FALSE = "{ OR: [] }";
+/**
+ * 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 requireIdFields;
+    private equivalentRefs;
+    private writeFieldReference;
+    private isAuthOrAuthMemberAccess;
+    private writeOperator;
+    private writeFieldCondition;
+    private block;
+    private isModelTyped;
+    private mapOperator;
+    private negateOperator;
+    private writeLogical;
+    private writeUnary;
+    private writeLiteral;
+    private writeInvocation;
+}