zenstack 2.18.1 → 2.19.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 ZenStack
+Copyright (c) 2022-2025 ZenStack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/cli/config.d.ts

@@ -1,5 +1,5 @@
 import z from 'zod';
-declare const schema: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
+declare const schema: z.ZodObject<{}, z.core.$strip>;
 export type ConfigType = z.infer<typeof schema>;
 export declare let config: ConfigType;
 /**

package/cli/config.js

@@ -40,7 +40,6 @@ exports.config = void 0;
 exports.loadConfig = loadConfig;
 const fs_1 = __importDefault(require("fs"));
 const zod_1 = __importStar(require("zod"));
-const v3_1 = require("zod-validation-error/v3");
 const cli_error_1 = require("./cli-error");
 // TODO: future use
 const schema = zod_1.default.object({});
@@ -64,7 +63,7 @@ function loadConfig(filename) {
             throw new cli_error_1.CliError(`Config is not a valid JSON file: ${filename}`);
         }
         if (err instanceof zod_1.ZodError) {
-            throw new cli_error_1.CliError(`Config file ${filename} is not valid: ${(0, v3_1.fromZodError)(err)}`);
+            throw new cli_error_1.CliError(`Config file ${filename} is not valid: ${err}`);
         }
         throw new cli_error_1.CliError(`Error loading config: ${filename}`);
     }

package/cli/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,gCAkBC;AAlCD,4CAAoB;AACpB,2CAAkC;AAClC,gDAAuD;AACvD,2CAAuC;AAEvC,mBAAmB;AACnB,MAAM,MAAM,GAAG,aAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAIjB,QAAA,MAAM,GAAe,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAEjD;;;GAGG;AACH,SAAgB,UAAU,CAAC,QAAgB;IACvC,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrC,cAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,8DAA8D;IAClE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,oBAAQ,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;YAC7B,MAAM,IAAI,oBAAQ,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,GAAG,YAAY,cAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,oBAAQ,CAAC,eAAe,QAAQ,kBAAkB,IAAA,iBAAY,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,MAAM,IAAI,oBAAQ,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC;AACL,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,gCAkBC;AAjCD,4CAAoB;AACpB,2CAAkC;AAClC,2CAAuC;AAEvC,mBAAmB;AACnB,MAAM,MAAM,GAAG,aAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAIjB,QAAA,MAAM,GAAe,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAEjD;;;GAGG;AACH,SAAgB,UAAU,CAAC,QAAgB;IACvC,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrC,cAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,8DAA8D;IAClE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,oBAAQ,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;YAC7B,MAAM,IAAI,oBAAQ,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,GAAG,YAAY,cAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,oBAAQ,CAAC,eAAe,QAAQ,kBAAkB,GAAG,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,IAAI,oBAAQ,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC;AACL,CAAC"}

package/documentation-cache.d.ts

@@ -0,0 +1,48 @@
+import * as vscode from 'vscode';
+/**
+ * DocumentationCache class handles persistent caching of ZModel documentation
+ * using VS Code's globalState for cross-session persistence
+ */
+export declare class DocumentationCache implements vscode.Disposable {
+    private static readonly CACHE_DURATION_MS;
+    private static readonly CACHE_PREFIX;
+    private extensionContext;
+    private extensionVersion;
+    constructor(context: vscode.ExtensionContext);
+    /**
+     * Dispose of the cache resources (implements vscode.Disposable)
+     */
+    dispose(): void;
+    /**
+     * Get the cache prefix used for keys
+     */
+    getCachePrefix(): string;
+    /**
+     * Enable cache synchronization across machines via VS Code Settings Sync
+     */
+    private enableCacheSync;
+    /**
+     * Generate a cache key from request body with normalized content
+     */
+    private generateCacheKey;
+    /**
+     * Check if cache entry is still valid (not expired)
+     */
+    private isCacheValid;
+    /**
+     * Get cached response if available and valid
+     */
+    getCachedResponse(models: string[]): Promise<string | null>;
+    /**
+     * Cache a response for future use
+     */
+    setCachedResponse(models: string[], data: string): Promise<void>;
+    /**
+     * Clear expired cache entries from persistent storage
+     */
+    clearExpiredCache(): Promise<void>;
+    /**
+     * Clear all cache entries from persistent storage
+     */
+    clearAllCache(): Promise<void>;
+}

package/documentation-cache.js

@@ -0,0 +1,141 @@
+"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.DocumentationCache = void 0;
+const crypto_1 = require("crypto");
+/**
+ * DocumentationCache class handles persistent caching of ZModel documentation
+ * using VS Code's globalState for cross-session persistence
+ */
+class DocumentationCache {
+    constructor(context) {
+        this.extensionContext = context;
+        this.extensionVersion = context.extension.packageJSON.version;
+        // clear expired cache entries on initialization
+        this.clearExpiredCache();
+    }
+    /**
+     * Dispose of the cache resources (implements vscode.Disposable)
+     */
+    dispose() { }
+    /**
+     * Get the cache prefix used for keys
+     */
+    getCachePrefix() {
+        return DocumentationCache.CACHE_PREFIX;
+    }
+    /**
+     * Enable cache synchronization across machines via VS Code Settings Sync
+     */
+    enableCacheSync() {
+        const cacheKeys = this.extensionContext.globalState
+            .keys()
+            .filter((key) => key.startsWith(DocumentationCache.CACHE_PREFIX));
+        if (cacheKeys.length > 0) {
+            this.extensionContext.globalState.setKeysForSync(cacheKeys);
+        }
+    }
+    /**
+     * Generate a cache key from request body with normalized content
+     */
+    generateCacheKey(models) {
+        // Remove ALL whitespace characters from each model string for cache key generation
+        // This ensures identical content with different formatting uses the same cache
+        const normalizedModels = models.map((model) => model.replace(/\s/g, '')).sort();
+        const hash = (0, crypto_1.createHash)('sha512')
+            .update(JSON.stringify({ models: normalizedModels }))
+            .digest('hex');
+        return `${DocumentationCache.CACHE_PREFIX}${hash}`;
+    }
+    /**
+     * Check if cache entry is still valid (not expired)
+     */
+    isCacheValid(entry) {
+        return Date.now() - entry.timestamp < DocumentationCache.CACHE_DURATION_MS;
+    }
+    /**
+     * Get cached response if available and valid
+     */
+    getCachedResponse(models) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cacheKey = this.generateCacheKey(models);
+            const entry = this.extensionContext.globalState.get(cacheKey);
+            if (entry && this.isCacheValid(entry)) {
+                console.log('Using cached documentation response from persistent storage');
+                return entry.data;
+            }
+            // Clean up expired entry if it exists
+            if (entry) {
+                yield this.extensionContext.globalState.update(cacheKey, undefined);
+            }
+            return null;
+        });
+    }
+    /**
+     * Cache a response for future use
+     */
+    setCachedResponse(models, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cacheKey = this.generateCacheKey(models);
+            const cacheEntry = {
+                data,
+                timestamp: Date.now(),
+                extensionVersion: this.extensionVersion,
+            };
+            yield this.extensionContext.globalState.update(cacheKey, cacheEntry);
+            // Update sync keys to include new cache entry
+            this.enableCacheSync();
+        });
+    }
+    /**
+     * Clear expired cache entries from persistent storage
+     */
+    clearExpiredCache() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now();
+            let clearedCount = 0;
+            const allKeys = this.extensionContext.globalState.keys();
+            for (const key of allKeys) {
+                if (key.startsWith(DocumentationCache.CACHE_PREFIX)) {
+                    const entry = this.extensionContext.globalState.get(key);
+                    if ((entry === null || entry === void 0 ? void 0 : entry.extensionVersion) !== this.extensionVersion ||
+                        now - entry.timestamp >= DocumentationCache.CACHE_DURATION_MS) {
+                        yield this.extensionContext.globalState.update(key, undefined);
+                        clearedCount++;
+                    }
+                }
+            }
+            if (clearedCount > 0) {
+                console.log(`Cleared ${clearedCount} expired cache entries from persistent storage`);
+            }
+        });
+    }
+    /**
+     * Clear all cache entries from persistent storage
+     */
+    clearAllCache() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const allKeys = this.extensionContext.globalState.keys();
+            let clearedCount = 0;
+            for (const key of allKeys) {
+                if (key.startsWith(DocumentationCache.CACHE_PREFIX)) {
+                    yield this.extensionContext.globalState.update(key, undefined);
+                    clearedCount++;
+                }
+            }
+            console.log(`Cleared all cache entries from persistent storage (${clearedCount} items)`);
+        });
+    }
+}
+exports.DocumentationCache = DocumentationCache;
+DocumentationCache.CACHE_DURATION_MS = 30 * 24 * 60 * 60 * 1000; // 30 days cache duration
+DocumentationCache.CACHE_PREFIX = 'doc-cache.';
+//# sourceMappingURL=documentation-cache.js.map

package/documentation-cache.js.map

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

package/extension.d.ts

@@ -0,0 +1,4 @@
+import * as vscode from 'vscode';
+export declare function requireAuth(): Promise<vscode.AuthenticationSession | undefined>;
+export declare function activate(context: vscode.ExtensionContext): void;
+export declare function deactivate(): Thenable<void> | undefined;

package/extension.js

@@ -0,0 +1,135 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAuth = requireAuth;
+exports.activate = activate;
+exports.deactivate = deactivate;
+const vscode = __importStar(require("vscode"));
+const path = __importStar(require("path"));
+const node_1 = require("vscode-languageclient/node");
+const zenstack_auth_provider_1 = require("./zenstack-auth-provider");
+const documentation_cache_1 = require("./documentation-cache");
+const zmodel_preview_1 = require("./zmodel-preview");
+const release_notes_manager_1 = require("./release-notes-manager");
+// Global variables
+let client;
+// Utility to require authentication when needed
+function requireAuth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        let session;
+        session = yield vscode.authentication.getSession(zenstack_auth_provider_1.AUTH_PROVIDER_ID, [], { createIfNone: false });
+        if (!session) {
+            const signIn = 'Sign in';
+            const selection = yield vscode.window.showWarningMessage('Please sign in to use this feature', signIn);
+            if (selection === signIn) {
+                try {
+                    session = yield vscode.authentication.getSession(zenstack_auth_provider_1.AUTH_PROVIDER_ID, [], { createIfNone: true });
+                    if (session) {
+                        vscode.window.showInformationMessage('ZenStack sign-in successful!');
+                    }
+                }
+                catch (e) {
+                    vscode.window.showErrorMessage('ZenStack sign-in failed: ' + (e instanceof Error ? e.message : String(e)));
+                }
+            }
+        }
+        return session;
+    });
+}
+// This function is called when the extension is activated.
+function activate(context) {
+    // Initialize and register the ZenStack authentication provider
+    context.subscriptions.push(new zenstack_auth_provider_1.ZenStackAuthenticationProvider(context));
+    // Start language client
+    client = startLanguageClient(context);
+    const documentationCache = new documentation_cache_1.DocumentationCache(context);
+    context.subscriptions.push(documentationCache);
+    context.subscriptions.push(new zmodel_preview_1.ZModelPreview(context, client, documentationCache));
+    context.subscriptions.push(new release_notes_manager_1.ReleaseNotesManager(context));
+}
+// This function is called when the extension is deactivated.
+function deactivate() {
+    if (client) {
+        return client.stop();
+    }
+    return undefined;
+}
+function startLanguageClient(context) {
+    const serverModule = context.asAbsolutePath(path.join('bundle', 'language-server', 'main'));
+    // The debug options for the server
+    // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging.
+    // By setting `process.env.DEBUG_BREAK` to a truthy value, the language server will wait until a debugger is attached.
+    const debugOptions = {
+        execArgv: [
+            '--nolazy',
+            `--inspect${process.env.DEBUG_BREAK ? '-brk' : ''}=${process.env.DEBUG_SOCKET || '6009'}`,
+        ],
+    };
+    // If the extension is launched in debug mode then the debug server options are used
+    // Otherwise the run options are used
+    const serverOptions = {
+        run: { module: serverModule, transport: node_1.TransportKind.ipc },
+        debug: {
+            module: serverModule,
+            transport: node_1.TransportKind.ipc,
+            options: debugOptions,
+        },
+    };
+    const fileSystemWatcher = vscode.workspace.createFileSystemWatcher('**/*.zmodel');
+    context.subscriptions.push(fileSystemWatcher);
+    // Options to control the language client
+    const clientOptions = {
+        documentSelector: [{ scheme: 'file', language: 'zmodel' }],
+        synchronize: {
+            // Notify the server about file changes to files contained in the workspace
+            fileEvents: fileSystemWatcher,
+        },
+    };
+    // Create the language client and start the client.
+    const client = new node_1.LanguageClient('zmodel', 'ZenStack Model', serverOptions, clientOptions);
+    // Start the client. This will also launch the server
+    void client.start();
+    return client;
+}
+//# sourceMappingURL=extension.js.map

package/extension.js.map

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

package/language-server/main.js

@@ -1,13 +1,62 @@
 "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 });
 const langium_1 = require("langium");
 const node_1 = require("langium/node");
 const node_2 = require("vscode-languageserver/node");
+const vscode_uri_1 = require("vscode-uri");
 const zmodel_module_1 = require("./zmodel-module");
+const cli_util_1 = require("../cli/cli-util");
 // Create a connection to the client
 const connection = (0, node_2.createConnection)(node_2.ProposedFeatures.all);
 // Inject the shared services and language-specific services
 const { shared } = (0, zmodel_module_1.createZModelServices)(Object.assign({ connection }, node_1.NodeFileSystem));
+// Add custom LSP request handlers
+connection.onRequest('zenstack/getAllImportedZModelURIs', (params) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const uri = vscode_uri_1.URI.parse(params.textDocument.uri);
+        const document = shared.workspace.LangiumDocuments.getOrCreateDocument(uri);
+        // Ensure the document is parsed and built
+        if (!document.parseResult) {
+            yield shared.workspace.DocumentBuilder.build([document]);
+        }
+        // #region merge imported documents
+        const langiumDocuments = shared.workspace.LangiumDocuments;
+        // load all imports
+        const importedURIs = (0, cli_util_1.eagerLoadAllImports)(document, langiumDocuments);
+        const importedDocuments = importedURIs.map((uri) => langiumDocuments.getOrCreateDocument(uri));
+        // build the document together with standard library, plugin modules, and imported documents
+        yield shared.workspace.DocumentBuilder.build([document, ...importedDocuments], {
+            validationChecks: 'all',
+        });
+        const hasSyntaxErrors = [uri, ...importedURIs].some((uri) => {
+            var _a;
+            const doc = langiumDocuments.getOrCreateDocument(uri);
+            return (doc.parseResult.lexerErrors.length > 0 ||
+                doc.parseResult.parserErrors.length > 0 ||
+                ((_a = doc.diagnostics) === null || _a === void 0 ? void 0 : _a.some((e) => e.severity === 1)));
+        });
+        return {
+            hasSyntaxErrors,
+            importedURIs,
+        };
+    }
+    catch (error) {
+        console.error('Error getting imported ZModel file:', error);
+        return {
+            hasSyntaxErrors: true,
+            importedURIs: [],
+        };
+    }
+}));
 // Start the language server with the shared services
 (0, langium_1.startLanguageServer)(shared);
 //# sourceMappingURL=main.js.map

package/language-server/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/language-server/main.ts"],"names":[],"mappings":";;AAAA,qCAA8C;AAC9C,uCAA8C;AAC9C,qDAAgF;AAChF,mDAAuD;AAEvD,oCAAoC;AACpC,MAAM,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;AAE1D,4DAA4D;AAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oCAAoB,kBAAG,UAAU,IAAK,qBAAc,EAAG,CAAC;AAE3E,qDAAqD;AACrD,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/language-server/main.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAA8C;AAC9C,uCAA8C;AAC9C,qDAAgF;AAChF,2CAAiC;AACjC,mDAAuD;AACvD,8CAAsD;AAEtD,oCAAoC;AACpC,MAAM,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;AAE1D,4DAA4D;AAC5D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oCAAoB,kBAAG,UAAU,IAAK,qBAAc,EAAG,CAAC;AAE3E,kCAAkC;AAClC,UAAU,CAAC,SAAS,CAAC,mCAAmC,EAAE,CAAO,MAAyC,EAAE,EAAE;IAC1G,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAE5E,0CAA0C;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,mCAAmC;QACnC,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAE3D,mBAAmB;QACnB,MAAM,YAAY,GAAG,IAAA,8BAAmB,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAErE,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/F,4FAA4F;QAC5F,MAAM,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,GAAG,iBAAiB,CAAC,EAAE;YAC3E,gBAAgB,EAAE,KAAK;SAC1B,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;;YACxD,MAAM,GAAG,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YACtD,OAAO,CACH,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;gBACtC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;iBACvC,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAA,CACjD,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,eAAe;YACf,YAAY;SACf,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO;YACH,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,EAAE;SACnB,CAAC;IACN,CAAC;AACL,CAAC,CAAA,CAAC,CAAC;AAEH,qDAAqD;AACrD,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "publisher": "zenstack",
   "displayName": "ZenStack Language Tools",
   "description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
-  "version": "2.18.1",
+  "version": "2.19.0",
   "author": {
     "name": "ZenStack Team"
   },
@@ -27,7 +27,7 @@
     "linkDirectory": true
   },
   "engines": {
-    "vscode": "^1.63.0"
+    "vscode": "^1.99.3"
   },
   "categories": [
     "Programming Languages"
@@ -64,13 +64,68 @@
           "type": "boolean",
           "default": true,
           "description": "Use Prisma style indentation."
+        },
+        "zenstack.searchForExtensions": {
+          "type": "boolean",
+          "default": true,
+          "description": "Search for Mermaid extensions when viewing Mermaid source."
         }
       }
-    }
+    },
+    "menus": {
+      "editor/title": [
+        {
+          "command": "zenstack.preview-zmodel",
+          "when": "editorLangId == zmodel",
+          "group": "navigation"
+        }
+      ],
+      "commandPalette": [
+        {
+          "command": "zenstack.preview-zmodel",
+          "when": "editorLangId == zmodel"
+        },
+        {
+          "command": "zenstack.clear-documentation-cache"
+        },
+        {
+          "command": "zenstack.logout"
+        }
+      ]
+    },
+    "commands": [
+      {
+        "command": "zenstack.preview-zmodel",
+        "title": "ZenStack: Preview ZModel Documentation",
+        "icon": "$(preview)"
+      },
+      {
+        "command": "zenstack.clear-documentation-cache",
+        "title": "ZenStack: Clear Documentation Cache",
+        "icon": "$(trash)"
+      },
+      {
+        "command": "zenstack.logout",
+        "title": "ZenStack: Logout",
+        "icon": "$(log-out)"
+      }
+    ],
+    "keybindings": [
+      {
+        "command": "zenstack.preview-zmodel",
+        "key": "ctrl+shift+v",
+        "mac": "cmd+shift+v",
+        "when": "editorLangId == zmodel"
+      }
+    ]
+  },
+  "activationEvents": [],
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": true
+    },
+    "virtualWorkspaces": true
   },
-  "activationEvents": [
-    "onLanguage:zmodel"
-  ],
   "bin": {
     "zenstack": "bin/cli"
   },
@@ -98,22 +153,22 @@
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-uri": "^3.0.6",
     "zod-validation-error": "^4.0.0",
-    "@zenstackhq/language": "2.18.1",
-    "@zenstackhq/sdk": "2.18.1"
+    "@zenstackhq/sdk": "2.19.0",
+    "@zenstackhq/language": "2.19.0"
   },
   "peerDependencies": {
-    "prisma": "5.0.0 - 6.14.x",
-    "zod": "^3.25.0"
+    "prisma": "5.0.0 - 6.16.x",
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@prisma/client": "6.14.x",
+    "@prisma/client": "6.16.x",
     "@types/async-exit-hook": "^2.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",
+    "@types/vscode": "^1.99.3",
     "@vscode/vsce": "^3.5.0",
     "dotenv": "^16.0.3",
     "esbuild": "^0.24.0",
@@ -121,7 +176,7 @@
     "tmp": "^0.2.1",
     "tsc-alias": "^1.7.0",
     "vitest": "^0.29.7",
-    "@zenstackhq/runtime": "2.18.1"
+    "@zenstackhq/runtime": "2.19.0"
   },
   "scripts": {
     "vscode:publish": "vsce publish --no-dependencies",

package/plugins/enhancer/enhance/index.js

@@ -350,13 +350,14 @@ export type Enhanced<Client> =
     }
     getLogicalDMMF(logicalPrismaFile) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const dmmf = yield (0, prisma_1.getDMMF)({ datamodel: fs_1.default.readFileSync(logicalPrismaFile, { encoding: 'utf-8' }) });
             // make necessary fixes
             // fields that use `auth()` in `@default` are not handled by Prisma so in the DMMF
             // they may be incorrectly represented as required, we need to fix that for input types
             // also, if a FK field is of such case, its corresponding relation field should be optional
             const createInputPattern = new RegExp(`^(.+?)(Unchecked)?Create.*Input$`);
-            for (const inputType of dmmf.schema.inputObjectTypes.prisma) {
+            for (const inputType of (_a = dmmf.schema.inputObjectTypes.prisma) !== null && _a !== void 0 ? _a : []) {
                 const match = inputType.name.match(createInputPattern);
                 const modelName = this.resolveName(match === null || match === void 0 ? void 0 : match[1]);
                 if (modelName) {
@@ -475,7 +476,7 @@ export type Enhanced<Client> =
                 if (!ts_morph_1.Node.isSyntaxList(syntaxList)) {
                     throw new sdk_1.PluginError(__1.name, `Unexpected syntax list structure in ${fileName}`);
                 }
-                const statements = ['import $Types = runtime.Types;'];
+                const statements = [];
                 // Add import for json-types if this model has JSON type fields
                 const modelWithJsonFields = this.modelsWithJsonTypeFields.find((m) => m.name === d.name);
                 if (modelWithJsonFields) {
@@ -791,7 +792,7 @@ export type Enhanced<Client> =
             // Check if the field in the source is optional (has a `?`)
             const isOptionalInSource = new RegExp(`(${field.name}\\?\\s*):`).test(source);
             if (isOptionalInSource) {
-                replaceValue += ' | $Types.Skip';
+                replaceValue += ' | runtime.Types.Skip';
             }
             return source.replace(new RegExp(`(${field.name}\\??\\s*):[^\\n]+`), replaceValue);
         };