zenstack 1.0.0-beta.1 → 1.0.0-beta.10

package/plugins/zod/utils/schema-gen.js

@@ -0,0 +1,178 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeValidationRefinements = exports.makeFieldSchema = void 0;
+const sdk_1 = require("@zenstackhq/sdk");
+const ast_1 = require("@zenstackhq/sdk/ast");
+const upper_case_first_1 = require("upper-case-first");
+const __1 = require("..");
+const typescript_expression_transformer_1 = require("../../../utils/typescript-expression-transformer");
+function makeFieldSchema(field) {
+    var _a;
+    let schema = makeZodSchema(field);
+    for (const attr of field.attributes) {
+        const message = getAttrLiteralArg(attr, 'message');
+        const messageArg = message ? `, { message: ${JSON.stringify(message)} }` : '';
+        const messageArgFirst = message ? `{ message: ${JSON.stringify(message)} }` : '';
+        switch ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) {
+            case '@length': {
+                const min = getAttrLiteralArg(attr, 'min');
+                if (min) {
+                    schema += `.min(${min}${messageArg})`;
+                }
+                const max = getAttrLiteralArg(attr, 'max');
+                if (max) {
+                    schema += `.max(${max}${messageArg})`;
+                }
+                break;
+            }
+            case '@contains': {
+                const expr = getAttrLiteralArg(attr, 'text');
+                if (expr) {
+                    schema += `.includes(${JSON.stringify(expr)}${messageArg})`;
+                }
+                break;
+            }
+            case '@regex': {
+                const expr = getAttrLiteralArg(attr, 'regex');
+                if (expr) {
+                    schema += `.regex(new RegExp(${JSON.stringify(expr)})${messageArg})`;
+                }
+                break;
+            }
+            case '@startsWith': {
+                const text = getAttrLiteralArg(attr, 'text');
+                if (text) {
+                    schema += `.startsWith(${JSON.stringify(text)}${messageArg})`;
+                }
+                break;
+            }
+            case '@endsWith': {
+                const text = getAttrLiteralArg(attr, 'text');
+                if (text) {
+                    schema += `.endsWith(${JSON.stringify(text)}${messageArg})`;
+                }
+                break;
+            }
+            case '@email': {
+                schema += `.email(${messageArgFirst})`;
+                break;
+            }
+            case '@url': {
+                schema += `.url(${messageArgFirst})`;
+                break;
+            }
+            case '@datetime': {
+                schema += `.datetime({ offset: true${message ? ', message: ' + JSON.stringify(message) : ''} })`;
+                break;
+            }
+            case '@gt': {
+                const value = getAttrLiteralArg(attr, 'value');
+                if (value !== undefined) {
+                    schema += `.gt(${value}${messageArg})`;
+                }
+                break;
+            }
+            case '@gte': {
+                const value = getAttrLiteralArg(attr, 'value');
+                if (value !== undefined) {
+                    schema += `.gte(${value}${messageArg})`;
+                }
+                break;
+            }
+            case '@lt': {
+                const value = getAttrLiteralArg(attr, 'value');
+                if (value !== undefined) {
+                    schema += `.lt(${value}${messageArg})`;
+                }
+                break;
+            }
+            case '@lte': {
+                const value = getAttrLiteralArg(attr, 'value');
+                if (value !== undefined) {
+                    schema += `.lte(${value}${messageArg})`;
+                }
+                break;
+            }
+        }
+    }
+    if (field.type.optional) {
+        schema += '.nullish()';
+    }
+    return schema;
+}
+exports.makeFieldSchema = makeFieldSchema;
+function makeZodSchema(field) {
+    var _a, _b;
+    let schema;
+    if (((_a = field.type.reference) === null || _a === void 0 ? void 0 : _a.ref) && (0, ast_1.isEnum)((_b = field.type.reference) === null || _b === void 0 ? void 0 : _b.ref)) {
+        schema = `${(0, upper_case_first_1.upperCaseFirst)(field.type.reference.ref.name)}Schema`;
+    }
+    else {
+        switch (field.type.type) {
+            case 'Int':
+            case 'Float':
+                schema = 'z.number()';
+                break;
+            case 'Decimal':
+                schema = 'DecimalSchema';
+                break;
+            case 'BigInt':
+                schema = 'z.bigint()';
+                break;
+            case 'String':
+                schema = 'z.string()';
+                break;
+            case 'Boolean':
+                schema = 'z.boolean()';
+                break;
+            case 'DateTime':
+                schema = 'z.date()';
+                break;
+            case 'Bytes':
+                schema = 'z.union([z.string(), z.instanceof(Uint8Array)])';
+                break;
+            default:
+                schema = 'z.any()';
+                break;
+        }
+    }
+    if (field.type.array) {
+        schema = `z.array(${schema})`;
+    }
+    return schema;
+}
+function makeValidationRefinements(model) {
+    const attrs = model.attributes.filter((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@validate'; });
+    const refinements = attrs
+        .map((attr) => {
+        const valueArg = (0, sdk_1.getAttributeArg)(attr, 'value');
+        if (!valueArg) {
+            return undefined;
+        }
+        const messageArg = (0, sdk_1.getAttributeArgLiteral)(attr, 'message');
+        const message = messageArg ? `, { message: ${JSON.stringify(messageArg)} }` : '';
+        try {
+            const expr = new typescript_expression_transformer_1.TypeScriptExpressionTransformer({
+                context: sdk_1.ExpressionContext.ValidationRule,
+                fieldReferenceContext: 'value',
+            }).transform(valueArg);
+            return `.refine((value: any) => ${expr}${message})`;
+        }
+        catch (err) {
+            if (err instanceof typescript_expression_transformer_1.TypeScriptExpressionTransformerError) {
+                throw new sdk_1.PluginError(__1.name, err.message);
+            }
+            else {
+                throw err;
+            }
+        }
+    })
+        .filter((r) => !!r);
+    return refinements;
+}
+exports.makeValidationRefinements = makeValidationRefinements;
+function getAttrLiteralArg(attr, paramName) {
+    const arg = attr.args.find((arg) => { var _a; return ((_a = arg.$resolvedParam) === null || _a === void 0 ? void 0 : _a.name) === paramName; });
+    return arg && (0, sdk_1.getLiteral)(arg.value);
+}
+//# sourceMappingURL=schema-gen.js.map

package/plugins/zod/utils/schema-gen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-gen.js","sourceRoot":"","sources":["../../../../src/plugins/zod/utils/schema-gen.ts"],"names":[],"mappings":"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"}

package/res/stdlib.zmodel

@@ -49,6 +49,20 @@ enum AttributeTargetField {
     ModelField
 }
 
+/**
+ * Indicates the expression context a function can be used.
+ */
+enum ExpressionContext {
+    // used in @default
+    DefaultValue
+
+    // used in @@allow and @@deny
+    AccessPolicy
+
+    // used in @@validate
+    ValidationRule
+}
+
 /**
  * Reads value from an environment variable.
  */
@@ -59,99 +73,109 @@ function env(name: String): String {
  * Gets the current login user.
  */
 function auth(): Any {
-}
+} @@@expressionContext([AccessPolicy])
 
 /**
  * Gets current date-time (as DateTime type).
  */
 function now(): DateTime {
-}
+} @@@expressionContext([DefaultValue, AccessPolicy, ValidationRule])
 
 /**
  * Generates a globally unique identifier based on the UUID specs.
  */
 function uuid(): String {
-}
+} @@@expressionContext([DefaultValue])
 
 /**
  * Generates a globally unique identifier based on the CUID spec.
  */
 function cuid(): String {
-}
+} @@@expressionContext([DefaultValue])
 
 /**
  * Creates a sequence of integers in the underlying database and assign the incremented 
  * values to the ID values of the created records based on the sequence.
  */
 function autoincrement(): Int {
-}
+} @@@expressionContext([DefaultValue])
 
 /**
  * Represents default values that cannot be expressed in the Prisma schema (such as random()).
  */
 function dbgenerated(expr: String): Any {
-}
+} @@@expressionContext([DefaultValue])
 
 /**
  * Gets entities value before an update. Only valid when used in a "update" policy rule.
  */
 function future(): Any {
-}
+} @@@expressionContext([AccessPolicy])
 
 /**
  * If the field value contains the search string. By default, the search is case-sensitive,
  * but you can override the behavior with the "caseInSensitive" argument.
  */
 function contains(field: String, search: String, caseInSensitive: Boolean?): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value matches the search condition with [full-text-search](https://www.prisma.io/docs/concepts/components/prisma-client/full-text-search). Need to enable "fullTextSearch" preview feature to use.
  */
 function search(field: String, search: String): Boolean {
-}
+} @@@expressionContext([AccessPolicy])
 
 /**
  * If the field value starts with the search string
  */
 function startsWith(field: String, search: String): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value ends with the search string
  */
 function endsWith(field: String, search: String): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value (a list) has the given search value
  */
 function has(field: Any[], search: Any): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value (a list) has every element of the search list
  */
 function hasEvery(field: Any[], search: Any[]): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value (a list) has at least one element of the search list
  */
 function hasSome(field: Any[], search: Any[]): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * If the field value (a list) is empty
  */
 function isEmpty(field: Any[]): Boolean {
-}
+} @@@expressionContext([AccessPolicy, ValidationRule])
 
 /**
  * Marks an attribute to be only applicable to certain field types.
  */
 attribute @@@targetField(targetField: AttributeTargetField[])
 
+/**
+ * Marks an attribute to be used for data validation.
+ */
+attribute @@@validation()
+
+/**
+ * Indicates the expression context a function can be used.
+ */
+attribute @@@expressionContext(_ context: ExpressionContext[])
+
 /**
  * Indicates an attribute is directly supported by the Prisma schema.
  */
@@ -351,60 +375,109 @@ attribute @password(saltLength: Int?, salt: String?) @@@targetField([StringField
  */
 attribute @omit()
 
+//////////////////////////////////////////////
+// Begin validation attributes and functions
+//////////////////////////////////////////////
+
 /**
  * Validates length of a string field.
  */
-attribute @length(_ min: Int?, _ max: Int?) @@@targetField([StringField])
+attribute @length(_ min: Int?, _ max: Int?, _ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
- * Validates a string field value matches a regex.
+ * Validates a string field value starts with the given text.
  */
-attribute @regex(_ regex: String) @@@targetField([StringField])
+attribute @startsWith(_ text: String, _ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
- * Validates a string field value starts with the given text.
+ * Validates a string field value ends with the given text.
  */
-attribute @startsWith(_ text: String) @@@targetField([StringField])
+attribute @endsWith(_ text: String, _ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
- * Validates a string field value ends with the given text.
+ * Validates a string field value contains the given text.
+ */
+attribute @contains(_ text: String, _ message: String?) @@@targetField([StringField]) @@@validation
+
+/**
+ * Validates a string field value matches a regex.
  */
-attribute @endsWith(_ text: String) @@@targetField([StringField])
+attribute @regex(_ regex: String, _ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
  * Validates a string field value is a valid email address.
  */
-attribute @email() @@@targetField([StringField])
+attribute @email(_ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
  * Validates a string field value is a valid ISO datetime.
  */
-attribute @datetime() @@@targetField([StringField])
+attribute @datetime(_ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
  * Validates a string field value is a valid url.
  */
-attribute @url() @@@targetField([StringField])
+attribute @url(_ message: String?) @@@targetField([StringField]) @@@validation
 
 /**
  * Validates a number field is greater than the given value.
  */
-attribute @gt(_ value: Int) @@@targetField([IntField, FloatField, DecimalField])
+attribute @gt(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
 
 /**
  * Validates a number field is greater than or equal to the given value.
  */
-attribute @gte(_ value: Int) @@@targetField([IntField, FloatField, DecimalField])
+attribute @gte(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
 
 /**
  * Validates a number field is less than the given value.
  */
-attribute @lt(_ value: Int) @@@targetField([IntField, FloatField, DecimalField])
+attribute @lt(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
 
 /**
  * Validates a number field is less than or equal to the given value.
  */
-attribute @lte(_ value: Int) @@@targetField([IntField, FloatField, DecimalField])
+attribute @lte(_ value: Int, _ message: String?) @@@targetField([IntField, FloatField, DecimalField]) @@@validation
+
+/**
+ * Validates the entity with a complex condition.
+ */
+attribute @@validate(_ value: Boolean, _ message: String?) @@@validation
+
+/**
+ * Validates length of a string field.
+ */
+function length(field: String, min: Int, max: Int?): Boolean {
+} @@@expressionContext([ValidationRule])
+
+
+/**
+ * Validates a string field value matches a regex.
+ */
+function regex(field: String, regex: String): Boolean {
+} @@@expressionContext([ValidationRule])
+
+/**
+ * Validates a string field value is a valid email address.
+ */
+function email(field: String): Boolean {
+} @@@expressionContext([ValidationRule])
+
+/**
+ * Validates a string field value is a valid ISO datetime.
+ */
+function datetime(field: String): Boolean {
+} @@@expressionContext([ValidationRule])
+
+/**
+ * Validates a string field value is a valid url.
+ */
+function url(field: String): Boolean {
+} @@@expressionContext([ValidationRule])
+
+//////////////////////////////////////////////
+// End validation attributes and functions
+//////////////////////////////////////////////
 
 /**
  * A utility attribute to allow passthrough of arbitrary attribute text to the generated Prisma schema.

package/telemetry.d.ts

@@ -11,6 +11,7 @@ export declare class Telemetry {
     private readonly sessionid;
     private readonly _os;
     private readonly version;
+    private readonly prismaVersion;
     private exitWait;
     constructor();
     track(event: TelemetryEvents, properties?: Record<string, unknown>): void;

package/telemetry.js

@@ -46,6 +46,7 @@ const sleep_promise_1 = __importDefault(require("sleep-promise"));
 const cli_error_1 = require("./cli/cli-error");
 const constants_1 = require("./constants");
 const version_utils_1 = require("./utils/version-utils");
+const sdk_1 = require("@zenstackhq/sdk");
 /**
  * Utility class for sending telemetry
  */
@@ -55,6 +56,7 @@ class Telemetry {
         this.sessionid = (0, cuid2_1.createId)();
         this._os = os.platform();
         this.version = (0, version_utils_1.getVersion)();
+        this.prismaVersion = (0, sdk_1.getPrismaVersion)();
         this.exitWait = 200;
         if (process.env.DO_NOT_TRACK !== '1' && constants_1.TELEMETRY_TRACKING_TOKEN) {
             this.mixpanel = (0, mixpanel_1.init)(constants_1.TELEMETRY_TRACKING_TOKEN, {
@@ -98,7 +100,7 @@ class Telemetry {
     }
     track(event, properties = {}) {
         if (this.mixpanel) {
-            const payload = Object.assign({ distinct_id: this.hostId, session: this.sessionid, time: new Date(), $os: this._os, nodeVersion: process.version, version: this.version }, properties);
+            const payload = Object.assign({ distinct_id: this.hostId, session: this.sessionid, time: new Date(), $os: this._os, nodeVersion: process.version, version: this.version, prismaVersion: this.prismaVersion }, properties);
             this.mixpanel.track(event, payload);
         }
     }

package/telemetry.js.map

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

package/utils/ast-utils.d.ts

@@ -1,23 +1,10 @@
-import { DataModel, DataModelAttribute, DataModelField, Expression, Model, ModelImport } from '@zenstackhq/language/ast';
+import { DataModel, DataModelField, Expression, Model, ModelImport } from '@zenstackhq/language/ast';
 import { AstNode, LangiumDocuments } from 'langium';
 import { URI } from 'vscode-uri';
 export declare function extractDataModelsWithAllowRules(model: Model): DataModel[];
-export declare function analyzePolicies(dataModel: DataModel): {
-    allows: DataModelAttribute[];
-    denies: DataModelAttribute[];
-    create: boolean | undefined;
-    read: boolean | undefined;
-    update: boolean | undefined;
-    delete: boolean | undefined;
-    allowAll: boolean;
-    denyAll: boolean;
-    hasFieldValidation: boolean;
-};
 export declare function mergeBaseModel(model: Model): void;
-export declare const VALIDATION_ATTRIBUTES: string[];
 export declare function getIdFields(dataModel: DataModel): DataModelField[];
 export declare function isAuthInvocation(node: AstNode): boolean;
-export declare function isEnumFieldReference(expr: Expression): boolean;
 export declare function getDataModelFieldReference(expr: Expression): DataModelField | undefined;
 export declare function resolveImportUri(imp: ModelImport): URI | undefined;
 export declare function resolveTransitiveImports(documents: LangiumDocuments, model: Model): Model[];

package/utils/ast-utils.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllDeclarationsFromImports = exports.resolveImport = exports.resolveTransitiveImports = exports.resolveImportUri = exports.getDataModelFieldReference = exports.isEnumFieldReference = exports.isAuthInvocation = exports.getIdFields = exports.VALIDATION_ATTRIBUTES = exports.mergeBaseModel = exports.analyzePolicies = exports.extractDataModelsWithAllowRules = void 0;
+exports.getAllDeclarationsFromImports = exports.resolveImport = exports.resolveTransitiveImports = exports.resolveImportUri = exports.getDataModelFieldReference = exports.isAuthInvocation = exports.getIdFields = exports.mergeBaseModel = exports.extractDataModelsWithAllowRules = void 0;
 const ast_1 = require("@zenstackhq/language/ast");
-const sdk_1 = require("@zenstackhq/sdk");
 const langium_1 = require("langium");
 const vscode_uri_1 = require("vscode-uri");
 const utils_1 = require("../language-server/utils");
@@ -10,36 +9,17 @@ function extractDataModelsWithAllowRules(model) {
     return model.declarations.filter((d) => (0, ast_1.isDataModel)(d) && d.attributes.some((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@allow'; }));
 }
 exports.extractDataModelsWithAllowRules = extractDataModelsWithAllowRules;
-function analyzePolicies(dataModel) {
-    const allows = dataModel.attributes.filter((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@allow'; });
-    const denies = dataModel.attributes.filter((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@deny'; });
-    const create = toStaticPolicy('create', allows, denies);
-    const read = toStaticPolicy('read', allows, denies);
-    const update = toStaticPolicy('update', allows, denies);
-    const del = toStaticPolicy('delete', allows, denies);
-    const hasFieldValidation = dataModel.$resolvedFields.some((field) => field.attributes.some((attr) => exports.VALIDATION_ATTRIBUTES.includes(attr.decl.$refText)));
-    return {
-        allows,
-        denies,
-        create,
-        read,
-        update,
-        delete: del,
-        allowAll: create === true && read === true && update === true && del === true,
-        denyAll: create === false && read === false && update === false && del === false,
-        hasFieldValidation,
-    };
-}
-exports.analyzePolicies = analyzePolicies;
 function mergeBaseModel(model) {
     model.declarations
         .filter((x) => x.$type === 'DataModel')
         .forEach((decl) => {
         const dataModel = decl;
         dataModel.fields = dataModel.superTypes
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             .flatMap((superType) => updateContainer(superType.ref.fields, dataModel))
             .concat(dataModel.fields);
         dataModel.attributes = dataModel.superTypes
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             .flatMap((superType) => updateContainer(superType.ref.attributes, dataModel))
             .concat(dataModel.attributes);
     });
@@ -56,50 +36,6 @@ function updateContainer(nodes, container) {
         return mutable;
     });
 }
-function toStaticPolicy(operation, allows, denies) {
-    const filteredDenies = forOperation(operation, denies);
-    if (filteredDenies.some((rule) => (0, sdk_1.getLiteral)(rule.args[1].value) === true)) {
-        // any constant true deny rule
-        return false;
-    }
-    const filteredAllows = forOperation(operation, allows);
-    if (filteredAllows.length === 0) {
-        // no allow rule
-        return false;
-    }
-    if (filteredDenies.length === 0 &&
-        filteredAllows.some((rule) => (0, sdk_1.getLiteral)(rule.args[1].value) === true)) {
-        // any constant true allow rule
-        return true;
-    }
-    return undefined;
-}
-function forOperation(operation, rules) {
-    return rules.filter((rule) => {
-        const ops = (0, sdk_1.getLiteral)(rule.args[0].value);
-        if (!ops) {
-            return false;
-        }
-        if (ops === 'all') {
-            return true;
-        }
-        const splitOps = ops.split(',').map((p) => p.trim());
-        return splitOps.includes(operation);
-    });
-}
-exports.VALIDATION_ATTRIBUTES = [
-    '@length',
-    '@regex',
-    '@startsWith',
-    '@endsWith',
-    '@email',
-    '@url',
-    '@datetime',
-    '@gt',
-    '@gte',
-    '@lt',
-    '@lte',
-];
 function getIdFields(dataModel) {
     const fieldLevelId = dataModel.$resolvedFields.find((f) => f.attributes.some((attr) => attr.decl.$refText === '@id'));
     if (fieldLevelId) {
@@ -127,10 +63,6 @@ function isAuthInvocation(node) {
     return (0, ast_1.isInvocationExpr)(node) && ((_a = node.function.ref) === null || _a === void 0 ? void 0 : _a.name) === 'auth' && (0, utils_1.isFromStdlib)(node.function.ref);
 }
 exports.isAuthInvocation = isAuthInvocation;
-function isEnumFieldReference(expr) {
-    return (0, ast_1.isReferenceExpr)(expr) && (0, ast_1.isEnumField)(expr.target.ref);
-}
-exports.isEnumFieldReference = isEnumFieldReference;
 function getDataModelFieldReference(expr) {
     if ((0, ast_1.isReferenceExpr)(expr) && (0, ast_1.isDataModelField)(expr.target.ref)) {
         return expr.target.ref;