address pr comments

Author: ymc9

packages/cli/src/actions/action-utils.ts

@@ -1,13 +1,10 @@
-import { loadDocument, type ZModelServices } from '@zenstackhq/language';
-import { isDataSource, isPlugin, Model } from '@zenstackhq/language/ast';
-import { getLiteral } from '@zenstackhq/language/utils';
+import { loadDocument } from '@zenstackhq/language';
+import { isDataSource } from '@zenstackhq/language/ast';
 import { PrismaSchemaGenerator } from '@zenstackhq/sdk';
 import colors from 'colors';
 import fs from 'node:fs';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { CliError } from '../cli-error';
-import { PLUGIN_MODULE_NAME } from '../constants';
 
 export function getSchemaFile(file?: string) {
     if (file) {
@@ -50,63 +47,6 @@ export async function loadSchemaDocument(schemaFile: string) {
     return loadResult.model;
 }
 
-export async function getPluginDocuments(services: ZModelServices, fileName: string): Promise<string[]> {
-    // parse the user document (without validation)
-    const parseResult = services.parser.LangiumParser.parse(fs.readFileSync(fileName, { encoding: 'utf-8' }));
-    const parsed = parseResult.value as Model;
-
-    // balk if there are syntax errors
-    if (parseResult.lexerErrors.length > 0 || parseResult.parserErrors.length > 0) {
-        return [];
-    }
-
-    // traverse plugins and collect "plugin.zmodel" documents
-    const result: string[] = [];
-    for (const decl of parsed.declarations.filter(isPlugin)) {
-        const providerField = decl.fields.find((f) => f.name === 'provider');
-        if (!providerField) {
-            continue;
-        }
-
-        const provider = getLiteral<string>(providerField.value);
-        if (!provider) {
-            continue;
-        }
-
-        let pluginModelFile: string | undefined;
-
-        // first try to treat provider as a path
-        let providerPath = path.resolve(path.dirname(fileName), provider);
-        if (fs.existsSync(providerPath)) {
-            if (fs.statSync(providerPath).isDirectory()) {
-                providerPath = path.join(providerPath, 'index.js');
-            }
-
-            // try plugin.zmodel next to the provider file
-            pluginModelFile = path.resolve(path.dirname(providerPath), PLUGIN_MODULE_NAME);
-            if (!fs.existsSync(pluginModelFile)) {
-                // try to find upwards
-                pluginModelFile = findUp([PLUGIN_MODULE_NAME], path.dirname(providerPath));
-            }
-        }
-
-        if (!pluginModelFile) {
-            // try loading it as a ESM module
-            try {
-                const resolvedUrl = import.meta.resolve(`${provider}/${PLUGIN_MODULE_NAME}`);
-                pluginModelFile = fileURLToPath(resolvedUrl);
-            } catch {
-                // noop
-            }
-        }
-
-        if (pluginModelFile && fs.existsSync(pluginModelFile)) {
-            result.push(pluginModelFile);
-        }
-    }
-    return result;
-}
-
 export function handleSubProcessError(err: unknown) {
     if (err instanceof Error && 'status' in err && typeof err.status === 'number') {
         process.exit(err.status);

packages/language/src/document.ts

@@ -2,7 +2,7 @@ import { isAstNode, URI, type AstNode, type LangiumDocument, type LangiumDocumen
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { isDataSource, Model } from './ast';
+import { isDataSource, type Model } from './ast';
 import { STD_LIB_MODULE_NAME } from './constants';
 import { createZModelServices } from './module';
 import { getDataModelAndTypeDefs, getDocument, hasAttribute, resolveImport, resolveTransitiveImports } from './utils';

packages/language/src/module.ts

@@ -10,7 +10,7 @@ import {
 import { NodeFileSystem } from 'langium/node';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { Model } from './ast';
+import type { Model } from './ast';
 import { ZModelGeneratedModule, ZModelGeneratedSharedModule, ZModelLanguageMetaData } from './generated/module';
 import { getPluginDocuments } from './utils';
 import { registerValidationChecks, ZModelValidator } from './validator';

packages/language/src/utils.ts

@@ -1,7 +1,8 @@
 import { AstUtils, URI, type AstNode, type LangiumDocument, type LangiumDocuments, type Reference } from 'langium';
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { PLUGIN_MODULE_NAME, STD_LIB_MODULE_NAME, type ExpressionContext } from './constants';
 import {
     isArrayExpr,
@@ -607,17 +608,22 @@ export function getPluginDocuments(model: Model, schemaPath: string): string[] {
         }
 
         if (!pluginModelFile) {
-            try {
-                if (typeof import.meta.resolve === 'function') {
+            if (typeof import.meta.resolve === 'function') {
+                try {
                     // try loading as a ESM module
                     const resolvedUrl = import.meta.resolve(`${provider}/${PLUGIN_MODULE_NAME}`);
                     pluginModelFile = fileURLToPath(resolvedUrl);
-                } else {
-                    // try loading as a CJS module
-                    pluginModelFile = require.resolve(`${provider}/${PLUGIN_MODULE_NAME}`, {
-                        paths: [path.dirname(schemaPath)],
-                    });
+                } catch {
+                    // noop
                 }
+            }
+        }
+
+        if (!pluginModelFile) {
+            // try loading as a CJS module
+            try {
+                const require = createRequire(pathToFileURL(schemaPath));
+                pluginModelFile = require.resolve(`${provider}/${PLUGIN_MODULE_NAME}`);
             } catch {
                 // noop
             }

samples/blog/zenstack/schema.zmodel

@@ -10,7 +10,7 @@ enum Role {
 }
 
 plugin policy {
-    // due to pnpm layout we can't directly usage package name here
+    // due to pnpm layout we can't directly use package name here
     provider = '../node_modules/@zenstackhq/plugin-policy/dist/index.js'
 }