zenstack 1.0.0-alpha.99 → 1.0.0-beta.10

package/cli/plugin-runner.js

@@ -13,17 +13,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginRunner = void 0;
-const internals_1 = require("@prisma/internals");
 const ast_1 = require("@zenstackhq/language/ast");
 const sdk_1 = require("@zenstackhq/sdk");
 const colors_1 = __importDefault(require("colors"));
 const fs_1 = __importDefault(require("fs"));
 const ora_1 = __importDefault(require("ora"));
 const path_1 = __importDefault(require("path"));
+const plugin_utils_1 = require("../plugins/plugin-utils");
 const telemetry_1 = __importDefault(require("../telemetry"));
+const version_utils_1 = require("../utils/version-utils");
 const config_1 = require("./config");
 /**
- * ZenStack code generator
+ * ZenStack plugin runner
  */
 class PluginRunner {
     /**
@@ -31,82 +32,138 @@ class PluginRunner {
      */
     run(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            const version = require('../package.json').version;
+            const version = (0, version_utils_1.getVersion)();
             console.log(colors_1.default.bold(`⌛️ ZenStack CLI v${version}, running plugins`));
+            (0, plugin_utils_1.ensureDefaultOutputFolder)();
             const plugins = [];
             const pluginDecls = context.schema.declarations.filter((d) => (0, ast_1.isPlugin)(d));
-            const prereqPlugins = ['@core/prisma', '@core/model-meta', '@core/access-policy'];
-            const allPluginProviders = prereqPlugins.concat(pluginDecls
-                .map((p) => this.getPluginProvider(p))
-                .filter((p) => !!p && !prereqPlugins.includes(p)));
-            let prismaOutput = './prisma/schema.prisma';
-            for (const pluginProvider of allPluginProviders) {
-                const plugin = pluginDecls.find((p) => this.getPluginProvider(p) === pluginProvider);
-                if (plugin) {
-                    const options = { schemaPath: context.schemaPath };
-                    plugin.fields.forEach((f) => {
-                        var _a;
-                        const value = (_a = (0, sdk_1.getLiteral)(f.value)) !== null && _a !== void 0 ? _a : (0, sdk_1.getLiteralArray)(f.value);
-                        if (value === undefined) {
-                            throw new sdk_1.PluginError(`Invalid plugin value for ${f.name}`);
-                        }
-                        options[f.name] = value;
-                    });
-                    const pluginModulePath = this.getPluginModulePath(pluginProvider);
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    let pluginModule;
-                    try {
-                        pluginModule = require(pluginModulePath);
-                    }
-                    catch (err) {
-                        console.error(`Unable to load plugin module ${pluginProvider}: ${pluginModulePath}, ${err}`);
-                        throw new sdk_1.PluginError(`Unable to load plugin module ${pluginProvider}`);
+            let prismaOutput = (0, sdk_1.resolvePath)('./prisma/schema.prisma', { schemaPath: context.schemaPath, name: '' });
+            for (const pluginDecl of pluginDecls) {
+                const pluginProvider = this.getPluginProvider(pluginDecl);
+                if (!pluginProvider) {
+                    console.error(`Plugin ${pluginDecl.name} has invalid provider option`);
+                    throw new sdk_1.PluginError('', `Plugin ${pluginDecl.name} has invalid provider option`);
+                }
+                const pluginModulePath = this.getPluginModulePath(pluginProvider);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                let pluginModule;
+                try {
+                    pluginModule = require(pluginModulePath);
+                }
+                catch (err) {
+                    console.error(`Unable to load plugin module ${pluginProvider}: ${pluginModulePath}, ${err}`);
+                    throw new sdk_1.PluginError('', `Unable to load plugin module ${pluginProvider}`);
+                }
+                if (!pluginModule.default || typeof pluginModule.default !== 'function') {
+                    console.error(`Plugin provider ${pluginProvider} is missing a default function export`);
+                    throw new sdk_1.PluginError('', `Plugin provider ${pluginProvider} is missing a default function export`);
+                }
+                const dependencies = this.getPluginDependencies(pluginModule);
+                const pluginName = this.getPluginName(pluginModule, pluginProvider);
+                const options = { schemaPath: context.schemaPath, name: pluginName };
+                pluginDecl.fields.forEach((f) => {
+                    var _a;
+                    const value = (_a = (0, sdk_1.getLiteral)(f.value)) !== null && _a !== void 0 ? _a : (0, sdk_1.getLiteralArray)(f.value);
+                    if (value === undefined) {
+                        throw new sdk_1.PluginError(pluginName, `Invalid option value for ${f.name}`);
                     }
-                    if (!pluginModule.default || typeof pluginModule.default !== 'function') {
-                        console.error(`Plugin provider ${pluginProvider} is missing a default function export`);
-                        throw new sdk_1.PluginError(`Plugin provider ${pluginProvider} is missing a default function export`);
+                    options[f.name] = value;
+                });
+                plugins.push({
+                    name: pluginName,
+                    provider: pluginProvider,
+                    dependencies,
+                    options,
+                    run: pluginModule.default,
+                    module: pluginModule,
+                });
+                if (pluginProvider === '@core/prisma' && typeof options.output === 'string') {
+                    // record custom prisma output path
+                    prismaOutput = (0, sdk_1.resolvePath)(options.output, options);
+                }
+            }
+            // make sure prerequisites are included
+            const corePlugins = [
+                { provider: '@core/prisma' },
+                { provider: '@core/model-meta' },
+                { provider: '@core/access-policy' },
+            ];
+            if ((0, sdk_1.getDataModels)(context.schema).some((model) => (0, sdk_1.hasValidationAttributes)(model))) {
+                // '@core/zod' plugin is auto-enabled if there're validation rules
+                corePlugins.push({ provider: '@core/zod', options: { modelOnly: true } });
+            }
+            // core plugins introduced by dependencies
+            plugins
+                .flatMap((p) => p.dependencies)
+                .forEach((dep) => {
+                if (dep.startsWith('@core/')) {
+                    const existing = corePlugins.find((p) => p.provider === dep);
+                    if (existing) {
+                        // reset options to default
+                        existing.options = undefined;
                     }
-                    plugins.push({
-                        name: this.getPluginName(pluginModule, pluginProvider),
-                        provider: pluginProvider,
-                        run: pluginModule.default,
-                        options,
-                    });
-                    if (pluginProvider === '@core/prisma' && options.output) {
-                        // record custom prisma output path
-                        prismaOutput = options.output;
+                    else {
+                        // add core dependency
+                        corePlugins.push({ provider: dep });
                     }
                 }
+            });
+            for (const corePlugin of corePlugins.reverse()) {
+                const existingIdx = plugins.findIndex((p) => p.provider === corePlugin.provider);
+                if (existingIdx >= 0) {
+                    // shift the plugin to the front
+                    const existing = plugins[existingIdx];
+                    plugins.splice(existingIdx, 1);
+                    plugins.unshift(existing);
+                }
                 else {
-                    // synthesize a plugin
-                    const pluginModule = require(this.getPluginModulePath(pluginProvider));
-                    plugins.push({
-                        name: this.getPluginName(pluginModule, pluginProvider),
-                        provider: pluginProvider,
+                    // synthesize a plugin and insert front
+                    const pluginModule = require(this.getPluginModulePath(corePlugin.provider));
+                    const pluginName = this.getPluginName(pluginModule, corePlugin.provider);
+                    plugins.unshift({
+                        name: pluginName,
+                        provider: corePlugin.provider,
+                        dependencies: [],
+                        options: Object.assign({ schemaPath: context.schemaPath, name: pluginName }, corePlugin.options),
                         run: pluginModule.default,
-                        options: { schemaPath: context.schemaPath },
+                        module: pluginModule,
                     });
                 }
             }
+            // check dependencies
+            for (const plugin of plugins) {
+                for (const dep of plugin.dependencies) {
+                    if (!plugins.find((p) => p.provider === dep)) {
+                        console.error(`Plugin ${plugin.provider} depends on "${dep}" but it's not declared`);
+                        throw new sdk_1.PluginError(plugin.name, `Plugin ${plugin.provider} depends on "${dep}" but it's not declared`);
+                    }
+                }
+            }
             const warnings = [];
             let dmmf = undefined;
             for (const { name, provider, run, options } of plugins) {
+                // const start = Date.now();
                 yield this.runPlugin(name, run, context, options, dmmf, warnings);
+                // console.log(`✅ Plugin ${colors.bold(name)} (${provider}) completed in ${Date.now() - start}ms`);
                 if (provider === '@core/prisma') {
                     // load prisma DMMF
-                    dmmf = yield (0, internals_1.getDMMF)({
+                    dmmf = yield (0, sdk_1.getDMMF)({
                         datamodel: fs_1.default.readFileSync(prismaOutput, { encoding: 'utf-8' }),
                     });
                 }
             }
             console.log(colors_1.default.green(colors_1.default.bold('\n👻 All plugins completed successfully!')));
             warnings.forEach((w) => console.warn(colors_1.default.yellow(w)));
+            console.log(`Don't forget to restart your dev server to let the changes take effect.`);
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getPluginName(pluginModule, pluginProvider) {
         return typeof pluginModule.name === 'string' ? pluginModule.name : pluginProvider;
     }
+    getPluginDependencies(pluginModule) {
+        return Array.isArray(pluginModule.dependencies) ? pluginModule.dependencies : [];
+    }
     getPluginProvider(plugin) {
         const providerField = plugin.fields.find((f) => f.name === 'provider');
         return (0, sdk_1.getLiteral)(providerField === null || providerField === void 0 ? void 0 : providerField.value);
@@ -117,6 +174,7 @@ class PluginRunner {
             try {
                 yield telemetry_1.default.trackSpan('cli:plugin:start', 'cli:plugin:complete', 'cli:plugin:error', {
                     plugin: name,
+                    options,
                 }, () => __awaiter(this, void 0, void 0, function* () {
                     let result = run(context.schema, options, dmmf, config_1.config);
                     if (result instanceof Promise) {

package/cli/plugin-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-runner.js","sourceRoot":"","sources":["../../src/cli/plugin-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,iDAA4C;AAC5C,kDAA4D;AAC5D,yCAA0G;AAC1G,oDAA4B;AAC5B,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,6DAAqC;AAErC,qCAAkC;AAElC;;GAEG;AACH,MAAa,YAAY;IACrB;;OAEG;IACG,GAAG,CAAC,OAAgB;;YACtB,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,mBAAmB,CAAC,CAAC,CAAC;YAEzE,MAAM,OAAO,GAKR,EAAE,CAAC;YAER,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,IAAA,cAAQ,EAAC,CAAC,CAAC,CAAC,CAAC;YACxF,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;YAClF,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAC3C,WAAW;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;iBACrC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACrE,CAAC;YACF,IAAI,YAAY,GAAG,wBAAwB,CAAC;YAE5C,KAAK,MAAM,cAAc,IAAI,kBAAkB,EAAE;gBAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC;gBACrF,IAAI,MAAM,EAAE;oBACR,MAAM,OAAO,GAAkB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;oBAElE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;wBACxB,MAAM,KAAK,GAAG,MAAA,IAAA,gBAAU,EAAC,CAAC,CAAC,KAAK,CAAC,mCAAI,IAAA,qBAAe,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC;wBAC9D,IAAI,KAAK,KAAK,SAAS,EAAE;4BACrB,MAAM,IAAI,iBAAW,CAAC,4BAA4B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;yBAC/D;wBACD,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;oBAC5B,CAAC,CAAC,CAAC;oBAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;oBAClE,8DAA8D;oBAC9D,IAAI,YAAiB,CAAC;oBACtB,IAAI;wBACA,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;qBAC5C;oBAAC,OAAO,GAAG,EAAE;wBACV,OAAO,CAAC,KAAK,CAAC,gCAAgC,cAAc,KAAK,gBAAgB,KAAK,GAAG,EAAE,CAAC,CAAC;wBAC7F,MAAM,IAAI,iBAAW,CAAC,gCAAgC,cAAc,EAAE,CAAC,CAAC;qBAC3E;oBAED,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,OAAO,YAAY,CAAC,OAAO,KAAK,UAAU,EAAE;wBACrE,OAAO,CAAC,KAAK,CAAC,mBAAmB,cAAc,uCAAuC,CAAC,CAAC;wBACxF,MAAM,IAAI,iBAAW,CAAC,mBAAmB,cAAc,uCAAuC,CAAC,CAAC;qBACnG;oBACD,OAAO,CAAC,IAAI,CAAC;wBACT,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,cAAc,CAAC;wBACtD,QAAQ,EAAE,cAAc;wBACxB,GAAG,EAAE,YAAY,CAAC,OAAyB;wBAC3C,OAAO;qBACV,CAAC,CAAC;oBAEH,IAAI,cAAc,KAAK,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE;wBACrD,mCAAmC;wBACnC,YAAY,GAAG,OAAO,CAAC,MAAgB,CAAC;qBAC3C;iBACJ;qBAAM;oBACH,sBAAsB;oBACtB,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC;oBACvE,OAAO,CAAC,IAAI,CAAC;wBACT,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,cAAc,CAAC;wBACtD,QAAQ,EAAE,cAAc;wBACxB,GAAG,EAAE,YAAY,CAAC,OAAO;wBACzB,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;qBAC9C,CAAC,CAAC;iBACN;aACJ;YAED,MAAM,QAAQ,GAAa,EAAE,CAAC;YAE9B,IAAI,IAAI,GAA8B,SAAS,CAAC;YAChD,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE;gBACpD,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAClE,IAAI,QAAQ,KAAK,cAAc,EAAE;oBAC7B,mBAAmB;oBACnB,IAAI,GAAG,MAAM,IAAA,mBAAO,EAAC;wBACjB,SAAS,EAAE,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;qBAClE,CAAC,CAAC;iBACN;aACJ;YAED,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,KAAK,CAAC,gBAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC,CAAC,CAAC;YAEnF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC;KAAA;IAED,8DAA8D;IACtD,aAAa,CAAC,YAAiB,EAAE,cAAsB;QAC3D,OAAO,OAAO,YAAY,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAE,YAAY,CAAC,IAAe,CAAC,CAAC,CAAC,cAAc,CAAC;IAClG,CAAC;IAEO,iBAAiB,CAAC,MAAc;QACpC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QACvE,OAAO,IAAA,gBAAU,EAAS,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAEa,SAAS,CACnB,IAAY,EACZ,GAAmB,EACnB,OAAgB,EAChB,OAAsB,EACtB,IAA+B,EAC/B,QAAkB;;YAElB,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,kBAAkB,gBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YACnE,IAAI;gBACA,MAAM,mBAAS,CAAC,SAAS,CACrB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB;oBACI,MAAM,EAAE,IAAI;iBACf,EACD,GAAS,EAAE;oBACP,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,eAAM,CAAC,CAAC;oBACxD,IAAI,MAAM,YAAY,OAAO,EAAE;wBAC3B,MAAM,GAAG,MAAM,MAAM,CAAC;qBACzB;oBACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBACvB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;qBAC5B;gBACL,CAAC,CAAA,CACJ,CAAC;gBACF,OAAO,CAAC,OAAO,EAAE,CAAC;aACrB;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC;KAAA;IAEO,mBAAmB,CAAC,QAAgB;QACxC,IAAI,gBAAgB,GAAG,QAAQ,CAAC;QAChC,IAAI,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YACvC,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SAC7F;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;AA/ID,oCA+IC"}
+{"version":3,"file":"plugin-runner.js","sourceRoot":"","sources":["../../src/cli/plugin-runner.ts"],"names":[],"mappings":"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"}

package/language-server/constants.d.ts

@@ -20,7 +20,3 @@ export declare const PLUGIN_MODULE_NAME = "plugin.zmodel";
 export declare enum IssueCodes {
     MissingOppositeRelation = "miss-opposite-relation"
 }
-/**
- * Filter operation function names (mapped to Prisma filter operators)
- */
-export declare const FILTER_OPERATOR_FUNCTIONS: string[];

package/language-server/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FILTER_OPERATOR_FUNCTIONS = exports.IssueCodes = exports.PLUGIN_MODULE_NAME = exports.STD_LIB_MODULE_NAME = exports.SCALAR_TYPES = exports.SUPPORTED_PROVIDERS = void 0;
+exports.IssueCodes = exports.PLUGIN_MODULE_NAME = exports.STD_LIB_MODULE_NAME = exports.SCALAR_TYPES = exports.SUPPORTED_PROVIDERS = void 0;
 /**
  * Supported Prisma db providers
  */
@@ -24,17 +24,4 @@ var IssueCodes;
 (function (IssueCodes) {
     IssueCodes["MissingOppositeRelation"] = "miss-opposite-relation";
 })(IssueCodes = exports.IssueCodes || (exports.IssueCodes = {}));
-/**
- * Filter operation function names (mapped to Prisma filter operators)
- */
-exports.FILTER_OPERATOR_FUNCTIONS = [
-    'contains',
-    'search',
-    'startsWith',
-    'endsWith',
-    'has',
-    'hasEvery',
-    'hasSome',
-    'isEmpty',
-];
 //# sourceMappingURL=constants.js.map

package/language-server/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/language-server/constants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,mBAAmB,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAEjG;;GAEG;AACU,QAAA,YAAY,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAE5G;;GAEG;AACU,QAAA,mBAAmB,GAAG,eAAe,CAAC;AAEnD;;GAEG;AACU,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAElD;;GAEG;AACH,IAAY,UAEX;AAFD,WAAY,UAAU;IAClB,gEAAkD,CAAA;AACtD,CAAC,EAFW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAErB;AAED;;GAEG;AACU,QAAA,yBAAyB,GAAG;IACrC,UAAU;IACV,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,KAAK;IACL,UAAU;IACV,SAAS;IACT,SAAS;CACZ,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/language-server/constants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,mBAAmB,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAEjG;;GAEG;AACU,QAAA,YAAY,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAE5G;;GAEG;AACU,QAAA,mBAAmB,GAAG,eAAe,CAAC;AAEnD;;GAEG;AACU,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAElD;;GAEG;AACH,IAAY,UAEX;AAFD,WAAY,UAAU;IAClB,gEAAkD,CAAA;AACtD,CAAC,EAFW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAErB"}

package/language-server/utils.d.ts

@@ -1,5 +1,5 @@
-import { AstNode } from 'langium';
 import { DataModel, DataModelField, Model } from '@zenstackhq/language/ast';
+import { AstNode } from 'langium';
 /**
  * Gets the toplevel Model containing the given node.
  */
@@ -8,10 +8,6 @@ export declare function getContainingModel(node: AstNode | undefined): Model | n
  * Returns if the given node is declared in stdlib.
  */
 export declare function isFromStdlib(node: AstNode): boolean;
-/**
- * Gets id fields declared at the data model level
- */
-export declare function getIdFields(model: DataModel): DataModelField[];
 /**
  * Gets lists of unique fields declared at the data model level
  */

package/language-server/utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniqueFields = exports.getIdFields = exports.isFromStdlib = exports.getContainingModel = void 0;
-const constants_1 = require("./constants");
+exports.getUniqueFields = exports.isFromStdlib = exports.getContainingModel = void 0;
 const ast_1 = require("@zenstackhq/language/ast");
 const sdk_1 = require("@zenstackhq/sdk");
+const constants_1 = require("./constants");
 /**
  * Gets the toplevel Model containing the given node.
  */
@@ -22,28 +22,11 @@ function isFromStdlib(node) {
     return !!model && !!model.$document && model.$document.uri.path.endsWith(constants_1.STD_LIB_MODULE_NAME);
 }
 exports.isFromStdlib = isFromStdlib;
-/**
- * Gets id fields declared at the data model level
- */
-function getIdFields(model) {
-    const idAttr = model.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@id'; });
-    if (!idAttr) {
-        return [];
-    }
-    const fieldsArg = idAttr.args.find((a) => { var _a; return ((_a = a.$resolvedParam) === null || _a === void 0 ? void 0 : _a.name) === 'fields'; });
-    if (!fieldsArg || !(0, ast_1.isArrayExpr)(fieldsArg.value)) {
-        return [];
-    }
-    return fieldsArg.value.items
-        .filter((item) => (0, ast_1.isReferenceExpr)(item))
-        .map((item) => (0, sdk_1.resolved)(item.target));
-}
-exports.getIdFields = getIdFields;
 /**
  * Gets lists of unique fields declared at the data model level
  */
 function getUniqueFields(model) {
-    const uniqueAttrs = model.attributes.filter((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@unique'; });
+    const uniqueAttrs = model.attributes.filter((attr) => { var _a, _b; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@@unique' || ((_b = attr.decl.ref) === null || _b === void 0 ? void 0 : _b.name) === '@@id'; });
     return uniqueAttrs.map((uniqueAttr) => {
         const fieldsArg = uniqueAttr.args.find((a) => { var _a; return ((_a = a.$resolvedParam) === null || _a === void 0 ? void 0 : _a.name) === 'fields'; });
         if (!fieldsArg || !(0, ast_1.isArrayExpr)(fieldsArg.value)) {

package/language-server/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/language-server/utils.ts"],"names":[],"mappings":";;;AACA,2CAAkD;AAClD,kDAQkC;AAClC,yCAA2C;AAE3C;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAyB;IACxD,IAAI,CAAC,IAAI,EAAE;QACP,OAAO,IAAI,CAAC;KACf;IACD,OAAO,IAAA,aAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACtE,CAAC;AALD,gDAKC;AAED;;GAEG;AACH,SAAgB,YAAY,CAAC,IAAa;IACtC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,+BAAmB,CAAC,CAAC;AAClG,CAAC;AAHD,oCAGC;AAED;;GAEG;AACH,SAAgB,WAAW,CAAC,KAAgB;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,0CAAE,IAAI,MAAK,MAAM,CAAA,EAAA,CAAC,CAAC;IAC/E,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,EAAE,CAAC;KACb;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,cAAc,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAAC,CAAC;IAC/E,IAAI,CAAC,SAAS,IAAI,CAAC,IAAA,iBAAW,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QAC7C,OAAO,EAAE,CAAC;KACb;IAED,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK;SACvB,MAAM,CAAC,CAAC,IAAI,EAAyB,EAAE,CAAC,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC;SAC9D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAQ,EAAC,IAAI,CAAC,MAAM,CAAmB,CAAC,CAAC;AAChE,CAAC;AAbD,kCAaC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,KAAgB;IAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,0CAAE,IAAI,MAAK,UAAU,CAAA,EAAA,CAAC,CAAC;IAC1F,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,cAAc,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAAC,CAAC;QACnF,IAAI,CAAC,SAAS,IAAI,CAAC,IAAA,iBAAW,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC7C,OAAO,EAAE,CAAC;SACb;QAED,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK;aACvB,MAAM,CAAC,CAAC,IAAI,EAAyB,EAAE,CAAC,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAQ,EAAC,IAAI,CAAC,MAAM,CAAmB,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACP,CAAC;AAZD,0CAYC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/language-server/utils.ts"],"names":[],"mappings":";;;AAAA,kDAQkC;AAClC,yCAA2C;AAE3C,2CAAkD;AAElD;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAyB;IACxD,IAAI,CAAC,IAAI,EAAE;QACP,OAAO,IAAI,CAAC;KACf;IACD,OAAO,IAAA,aAAO,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACtE,CAAC;AALD,gDAKC;AAED;;GAEG;AACH,SAAgB,YAAY,CAAC,IAAa;IACtC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,+BAAmB,CAAC,CAAC;AAClG,CAAC;AAHD,oCAGC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,KAAgB;IAC5C,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CACvC,CAAC,IAAI,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,0CAAE,IAAI,MAAK,UAAU,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,0CAAE,IAAI,MAAK,MAAM,CAAA,EAAA,CACjF,CAAC;IACF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,cAAc,0CAAE,IAAI,MAAK,QAAQ,CAAA,EAAA,CAAC,CAAC;QACnF,IAAI,CAAC,SAAS,IAAI,CAAC,IAAA,iBAAW,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC7C,OAAO,EAAE,CAAC;SACb;QAED,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK;aACvB,MAAM,CAAC,CAAC,IAAI,EAAyB,EAAE,CAAC,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAQ,EAAC,IAAI,CAAC,MAAM,CAAmB,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACP,CAAC;AAdD,0CAcC"}

package/language-server/validator/datamodel-validator.d.ts

@@ -12,4 +12,11 @@ export default class DataModelValidator implements AstValidator<DataModel> {
     private parseRelation;
     private isSelfRelation;
     private validateRelationField;
+    private validateBaseAbstractModel;
+}
+export interface MissingOppositeRelationData {
+    relationDataModelName: string;
+    relationFieldName: string;
+    relationFieldDocUri: string;
+    dataModelName: string;
 }

package/language-server/validator/datamodel-validator.js

@@ -2,6 +2,7 @@
 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 constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
@@ -10,19 +11,25 @@ const utils_2 = require("./utils");
  */
 class DataModelValidator {
     validate(dm, accept) {
-        (0, utils_2.validateDuplicatedDeclarations)(dm.fields, accept);
+        this.validateBaseAbstractModel(dm, accept);
+        (0, utils_2.validateDuplicatedDeclarations)(dm.$resolvedFields, accept);
         this.validateAttributes(dm, accept);
         this.validateFields(dm, accept);
     }
     validateFields(dm, accept) {
-        const idFields = dm.fields.filter((f) => f.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@id'; }));
-        const modelLevelIds = (0, utils_1.getIdFields)(dm);
-        if (idFields.length === 0 && modelLevelIds.length === 0) {
+        const idFields = dm.$resolvedFields.filter((f) => f.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@id'; }));
+        const uniqueFields = dm.$resolvedFields.filter((f) => f.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@unique'; }));
+        const modelLevelIds = (0, sdk_1.getModelIdFields)(dm);
+        const modelUniqueFields = (0, sdk_1.getModelUniqueFields)(dm);
+        if (idFields.length === 0 &&
+            modelLevelIds.length === 0 &&
+            uniqueFields.length === 0 &&
+            modelUniqueFields.length === 0) {
             const { allows, denies, hasFieldValidation } = (0, sdk_1.analyzePolicies)(dm);
             if (allows.length > 0 || denies.length > 0 || hasFieldValidation) {
                 // TODO: relax this requirement to require only @unique fields
                 // when access policies or field valdaition is used, require an @id field
-                accept('error', 'Model must include a field with @id attribute or a model-level @@id attribute', {
+                accept('error', 'Model must include a field with @id or @unique attribute, or a model-level @@id or @@unique attribute to use access policies', {
                     node: dm,
                 });
             }
@@ -49,16 +56,22 @@ class DataModelValidator {
             });
         }
         dm.fields.forEach((field) => this.validateField(field, accept));
+        if (!dm.isAbstract) {
+            dm.$resolvedFields
+                .filter((x) => { var _a; return (0, ast_1.isDataModel)((_a = x.type.reference) === null || _a === void 0 ? void 0 : _a.ref); })
+                .forEach((y) => {
+                this.validateRelationField(y, accept);
+            });
+        }
     }
     validateField(field, accept) {
-        var _a;
         if (field.type.array && field.type.optional) {
             accept('error', 'Optional lists are not supported. Use either `Type[]` or `Type?`', { node: field.type });
         }
-        field.attributes.forEach((attr) => (0, utils_2.validateAttributeApplication)(attr, accept));
-        if ((0, ast_1.isDataModel)((_a = field.type.reference) === null || _a === void 0 ? void 0 : _a.ref)) {
-            this.validateRelationField(field, accept);
+        if (field.type.unsupported && typeof field.type.unsupported.value.value !== 'string') {
+            accept('error', 'Unsupported type argument must be a string literal', { node: field.type.unsupported });
         }
+        field.attributes.forEach((attr) => (0, utils_2.validateAttributeApplication)(attr, accept));
     }
     validateAttributes(dm, accept) {
         dm.attributes.forEach((attr) => {
@@ -148,7 +161,7 @@ class DataModelValidator {
         return { attr: relAttr, name, fields, references, valid };
     }
     isSelfRelation(field, relationName) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (((_a = field.type.reference) === null || _a === void 0 ? void 0 : _a.ref) === field.$container) {
             // field directly references back to its type
             return true;
@@ -156,15 +169,16 @@ class DataModelValidator {
         if (relationName) {
             // field's relation points to another type, and that type's opposite relation field
             // points back
-            const oppositeModelFields = (_c = (_b = field.type.reference) === null || _b === void 0 ? void 0 : _b.ref) === null || _c === void 0 ? void 0 : _c.fields;
-            if (oppositeModelFields) {
+            const oppositeModel = (_b = field.type.reference) === null || _b === void 0 ? void 0 : _b.ref;
+            if (oppositeModel) {
+                const oppositeModelFields = oppositeModel.$resolvedFields;
                 for (const oppositeField of oppositeModelFields) {
                     // find the opposite relation with the matching name
                     const relAttr = oppositeField.attributes.find((a) => { var _a; return ((_a = a.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@relation'; });
                     if (relAttr) {
                         const relNameExpr = relAttr.args.find((a) => !a.name || a.name === 'name');
                         const relName = (0, sdk_1.getLiteral)(relNameExpr === null || relNameExpr === void 0 ? void 0 : relNameExpr.value);
-                        if (relName === relationName && ((_d = oppositeField.type.reference) === null || _d === void 0 ? void 0 : _d.ref) === field.$container) {
+                        if (relName === relationName && ((_c = oppositeField.type.reference) === null || _c === void 0 ? void 0 : _c.ref) === field.$container) {
                             // found an opposite relation field that points back to this field's type
                             return true;
                         }
@@ -175,24 +189,49 @@ class DataModelValidator {
         return false;
     }
     validateRelationField(field, accept) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const thisRelation = this.parseRelation(field, accept);
         if (!thisRelation.valid) {
             return;
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const oppositeModel = field.type.reference.ref;
-        let oppositeFields = oppositeModel.fields.filter((f) => { var _a; return ((_a = f.type.reference) === null || _a === void 0 ? void 0 : _a.ref) === field.$container; });
+        // Use name because the current document might be updated
+        let oppositeFields = oppositeModel.$resolvedFields.filter((f) => { var _a, _b; return ((_b = (_a = f.type.reference) === null || _a === void 0 ? void 0 : _a.ref) === null || _b === void 0 ? void 0 : _b.name) === field.$container.name; });
         oppositeFields = oppositeFields.filter((f) => {
             const fieldRel = this.parseRelation(f);
             return fieldRel.valid && fieldRel.name === thisRelation.name;
         });
         if (oppositeFields.length === 0) {
-            accept('error', `The relation field "${field.name}" on model "${field.$container.name}" is missing an opposite relation field on model "${oppositeModel.name}"`, { node: field, code: constants_1.IssueCodes.MissingOppositeRelation });
+            const node = field.$isInherited ? field.$container : field;
+            const info = { node, code: constants_1.IssueCodes.MissingOppositeRelation };
+            let relationFieldDocUri;
+            let relationDataModelName;
+            if (field.$isInherited) {
+                info.property = 'name';
+                const container = field.$container;
+                const abstractContainer = (_a = container.superTypes.find((x) => { var _a; return (_a = x.ref) === null || _a === void 0 ? void 0 : _a.fields.find((f) => f.name === field.name); })) === null || _a === void 0 ? void 0 : _a.ref;
+                relationFieldDocUri = (0, langium_1.getDocument)(abstractContainer).textDocument.uri;
+                relationDataModelName = abstractContainer.name;
+            }
+            else {
+                relationFieldDocUri = (0, langium_1.getDocument)(field).textDocument.uri;
+                relationDataModelName = field.$container.name;
+            }
+            const data = {
+                relationFieldName: field.name,
+                relationDataModelName,
+                relationFieldDocUri,
+                dataModelName: field.$container.name,
+            };
+            info.data = data;
+            accept('error', `The relation field "${field.name}" on model "${field.$container.name}" is missing an opposite relation field on model "${oppositeModel.name}"`, info);
             return;
         }
         else if (oppositeFields.length > 1) {
-            oppositeFields.forEach((f) => {
+            oppositeFields
+                .filter((x) => !x.$isInherited)
+                .forEach((f) => {
                 if (this.isSelfRelation(f)) {
                     // self relations are partial
                     // https://www.prisma.io/docs/concepts/components/prisma-schema/relations/self-relations
@@ -206,7 +245,7 @@ class DataModelValidator {
         const oppositeField = oppositeFields[0];
         const oppositeRelation = this.parseRelation(oppositeField);
         let relationOwner;
-        if (((_a = thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.references) === null || _a === void 0 ? void 0 : _a.length) && ((_b = thisRelation.fields) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (((_b = thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.references) === null || _b === void 0 ? void 0 : _b.length) && ((_c = thisRelation.fields) === null || _c === void 0 ? void 0 : _c.length)) {
             if ((oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.references) || (oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.fields)) {
                 accept('error', '"fields" and "references" must be provided only on one side of relation field', {
                     node: oppositeField,
@@ -217,7 +256,7 @@ class DataModelValidator {
                 relationOwner = oppositeField;
             }
         }
-        else if (((_c = oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.references) === null || _c === void 0 ? void 0 : _c.length) && ((_d = oppositeRelation.fields) === null || _d === void 0 ? void 0 : _d.length)) {
+        else if (((_d = oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.references) === null || _d === void 0 ? void 0 : _d.length) && ((_e = oppositeRelation.fields) === null || _e === void 0 ? void 0 : _e.length)) {
             if ((thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.references) || (thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.fields)) {
                 accept('error', '"fields" and "references" must be provided only on one side of relation field', {
                     node: field,
@@ -261,10 +300,10 @@ class DataModelValidator {
             // UserData.userId field needs to be @unique
             const containingModel = field.$container;
             const uniqueFieldList = (0, utils_1.getUniqueFields)(containingModel);
-            (_e = thisRelation.fields) === null || _e === void 0 ? void 0 : _e.forEach((ref) => {
+            (_f = thisRelation.fields) === null || _f === void 0 ? void 0 : _f.forEach((ref) => {
                 const refField = ref.target.ref;
                 if (refField) {
-                    if (refField.attributes.find((a) => { var _a; return ((_a = a.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@unique'; })) {
+                    if (refField.attributes.find((a) => { var _a, _b; return ((_a = a.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@id' || ((_b = a.decl.ref) === null || _b === void 0 ? void 0 : _b.name) === '@unique'; })) {
                         return;
                     }
                     if (uniqueFieldList.some((list) => list.includes(refField))) {
@@ -275,6 +314,17 @@ class DataModelValidator {
             });
         }
     }
+    validateBaseAbstractModel(model, accept) {
+        model.superTypes.forEach((superType, index) => {
+            var _a;
+            if (!((_a = superType.ref) === null || _a === void 0 ? void 0 : _a.isAbstract))
+                accept('error', `Model ${superType.$refText} cannot be extended because it's not abstract`, {
+                    node: model,
+                    property: 'superTypes',
+                    index,
+                });
+        });
+    }
 }
 exports.default = DataModelValidator;
 //# sourceMappingURL=datamodel-validator.js.map