@aster-cloud/aster-lang-ts 0.0.5 → 0.0.7

package/dist/src/browser.d.ts

@@ -0,0 +1,168 @@
+/**
+ * @module @aster-cloud/aster-lang-ts/browser
+ *
+ * Lightweight browser/edge-compatible entry point for Aster CNL compiler.
+ * This module excludes Node.js dependencies and is suitable for:
+ * - Browser-based editors
+ * - Cloudflare Workers/Pages
+ * - Edge runtimes (Vercel Edge, Deno Deploy, etc.)
+ *
+ * **Compilation Pipeline**:
+ * ```
+ * CNL Source → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck
+ * ```
+ *
+ * @example Basic compilation
+ * ```typescript
+ * import { compile, compileWithDiagnostics } from '@aster-cloud/aster-lang-ts/browser';
+ *
+ * const source = `This module is app. To greet name String, produce String: Return "Hello, " + name.`;
+ * const result = compile(source);
+ *
+ * if (result.success) {
+ *   console.log('Compiled Core IR:', result.core);
+ * } else {
+ *   console.error('Compilation errors:', result.errors);
+ * }
+ * ```
+ */
+export { canonicalize } from './frontend/canonicalizer.js';
+export { lex } from './frontend/lexer.js';
+export { parse } from './parser.js';
+export { lowerModule } from './lower_to_core.js';
+export { createKeywordTranslator, buildKeywordTranslationIndex, buildFullTranslationIndex, translateTokens, translateTokensWithMarkers, translateToken, needsKeywordTranslation, } from './frontend/keyword-translator.js';
+export type { KeywordTranslationIndex, MarkerKeywordIndex, TranslationIndexResult, } from './frontend/keyword-translator.js';
+export { Core, Effect } from './core/core_ir.js';
+export { TokenKind, KW } from './frontend/tokens.js';
+export { Node } from './ast/ast.js';
+export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
+export type { TypeKind, FieldInfo, ParameterInfo, } from './parser/input-generator.js';
+export type * from './types.js';
+export { EN_US, ZH_CN, DE_DE, LexiconRegistry, initializeDefaultLexicons } from './config/lexicons/index.js';
+export type { Lexicon } from './config/lexicons/types.js';
+import type { Core as CoreTypes, Token, Module as AstModule } from './types.js';
+import type { Lexicon } from './config/lexicons/types.js';
+/**
+ * Compilation result with success/failure status
+ */
+export interface CompileResult {
+    /** Whether compilation succeeded */
+    success: boolean;
+    /** Compiled Core IR module (if successful) */
+    core?: CoreTypes.Module;
+    /** Parse errors (if any) */
+    parseErrors?: string[];
+    /** Lowering errors (if any) */
+    loweringErrors?: string[];
+    /** Raw tokens from lexer (only when includeIntermediates is true) */
+    tokens?: Token[];
+    /** AST from parser (only when includeIntermediates is true) */
+    ast?: AstModule;
+}
+/**
+ * Compilation options
+ */
+export interface CompileOptions {
+    /** CNL lexicon (default: EN_US). Pass a Lexicon object from the exports. */
+    lexicon?: Lexicon;
+    /** Include intermediate representations in result */
+    includeIntermediates?: boolean;
+}
+/**
+ * Compile CNL source code to Core IR
+ *
+ * This is the main compilation function for browser/edge use.
+ * It runs the full compilation pipeline without type checking
+ * (type checking requires module resolution which needs file system access).
+ *
+ * @param source - CNL source code
+ * @param options - Compilation options
+ * @returns Compilation result with Core IR or errors
+ *
+ * @example
+ * ```typescript
+ * const result = compile(`
+ *   This module is pricing.
+ *   To calculate_discount amount Number, produce Number:
+ *     If amount > 100 then Return amount * 0.1
+ *     Otherwise Return 0.
+ * `);
+ *
+ * if (result.success) {
+ *   console.log(result.core);
+ * }
+ * ```
+ */
+export declare function compile(source: string, options?: CompileOptions): CompileResult;
+/**
+ * Validate CNL source code syntax without full compilation
+ *
+ * This is a lightweight validation that only runs lexer and parser,
+ * useful for real-time editor validation.
+ *
+ * @param source - CNL source code
+ * @param lexicon - CNL lexicon (optional, defaults to EN_US)
+ * @returns Array of error messages (empty if valid)
+ */
+export declare function validateSyntax(source: string, lexicon?: Lexicon): string[];
+/**
+ * Get tokens from CNL source (for syntax highlighting)
+ *
+ * @param source - CNL source code
+ * @param lexicon - CNL lexicon (optional, defaults to EN_US)
+ * @returns Array of tokens
+ */
+export declare function tokenize(source: string, lexicon?: Lexicon): Token[];
+import type { ParameterInfo } from './parser/input-generator.js';
+/**
+ * Schema extraction result
+ */
+export interface SchemaResult {
+    /** Whether extraction succeeded */
+    success: boolean;
+    /** Module name */
+    moduleName?: string;
+    /** Function name */
+    functionName?: string;
+    /** Parameter schema */
+    parameters?: ParameterInfo[];
+    /** Error message if failed */
+    error?: string;
+}
+/**
+ * Schema extraction options
+ */
+export interface SchemaOptions {
+    /** CNL lexicon (default: EN_US) */
+    lexicon?: Lexicon;
+    /** Target function name (default: first function) */
+    functionName?: string;
+}
+/**
+ * Extract schema from CNL source code
+ *
+ * Parses CNL source and extracts parameter schema for the specified function,
+ * suitable for dynamic form generation.
+ *
+ * @param source - CNL source code
+ * @param options - Schema extraction options
+ * @returns Schema extraction result
+ *
+ * @example
+ * ```typescript
+ * const result = extractSchema(`
+ *   This module is loan.
+ *   A LoanApplication has creditScore Int, amount Float, term Int.
+ *   To evaluate application LoanApplication, produce Bool:
+ *     If application.creditScore >= 700 then Return true
+ *     Otherwise Return false.
+ * `);
+ *
+ * if (result.success) {
+ *   console.log(result.parameters);
+ *   // [{ name: 'application', type: 'LoanApplication', typeKind: 'struct', ... }]
+ * }
+ * ```
+ */
+export declare function extractSchema(source: string, options?: SchemaOptions): SchemaResult;
+//# sourceMappingURL=browser.d.ts.map

package/dist/src/browser.d.ts.map

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

package/dist/src/browser.js

@@ -0,0 +1,311 @@
+/**
+ * @module @aster-cloud/aster-lang-ts/browser
+ *
+ * Lightweight browser/edge-compatible entry point for Aster CNL compiler.
+ * This module excludes Node.js dependencies and is suitable for:
+ * - Browser-based editors
+ * - Cloudflare Workers/Pages
+ * - Edge runtimes (Vercel Edge, Deno Deploy, etc.)
+ *
+ * **Compilation Pipeline**:
+ * ```
+ * CNL Source → canonicalize → lex → parse → AST → lowerModule → Core IR → typecheck
+ * ```
+ *
+ * @example Basic compilation
+ * ```typescript
+ * import { compile, compileWithDiagnostics } from '@aster-cloud/aster-lang-ts/browser';
+ *
+ * const source = `This module is app. To greet name String, produce String: Return "Hello, " + name.`;
+ * const result = compile(source);
+ *
+ * if (result.success) {
+ *   console.log('Compiled Core IR:', result.core);
+ * } else {
+ *   console.error('Compilation errors:', result.errors);
+ * }
+ * ```
+ */
+// Core compilation pipeline functions
+export { canonicalize } from './frontend/canonicalizer.js';
+export { lex } from './frontend/lexer.js';
+export { parse } from './parser.js';
+export { lowerModule } from './lower_to_core.js';
+// Keyword translation (multi-language CNL support)
+export { createKeywordTranslator, buildKeywordTranslationIndex, buildFullTranslationIndex, translateTokens, translateTokensWithMarkers, translateToken, needsKeywordTranslation, } from './frontend/keyword-translator.js';
+// Core types and enums
+export { Core, Effect } from './core/core_ir.js';
+export { TokenKind, KW } from './frontend/tokens.js';
+export { Node } from './ast/ast.js';
+// Input value generation (for policy execution)
+export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
+// Lexicons for multi-language support
+export { EN_US, ZH_CN, DE_DE, LexiconRegistry, initializeDefaultLexicons } from './config/lexicons/index.js';
+// ============================================================================
+// High-level compilation API (browser-friendly)
+// ============================================================================
+import { canonicalize } from './frontend/canonicalizer.js';
+import { lex } from './frontend/lexer.js';
+import { parse } from './parser.js';
+import { lowerModule } from './lower_to_core.js';
+/**
+ * Compile CNL source code to Core IR
+ *
+ * This is the main compilation function for browser/edge use.
+ * It runs the full compilation pipeline without type checking
+ * (type checking requires module resolution which needs file system access).
+ *
+ * @param source - CNL source code
+ * @param options - Compilation options
+ * @returns Compilation result with Core IR or errors
+ *
+ * @example
+ * ```typescript
+ * const result = compile(`
+ *   This module is pricing.
+ *   To calculate_discount amount Number, produce Number:
+ *     If amount > 100 then Return amount * 0.1
+ *     Otherwise Return 0.
+ * `);
+ *
+ * if (result.success) {
+ *   console.log(result.core);
+ * }
+ * ```
+ */
+export function compile(source, options) {
+    try {
+        // Step 1: Canonicalize source
+        const canonical = canonicalize(source);
+        // Step 2: Lexical analysis
+        const tokens = lex(canonical, options?.lexicon);
+        // Step 3: Parse to AST
+        const ast = parse(tokens);
+        // Check for parse errors
+        if ('error' in ast || !ast) {
+            const result = {
+                success: false,
+                parseErrors: ['error' in ast ? ast.error : 'Parse failed'],
+            };
+            if (options?.includeIntermediates) {
+                result.tokens = tokens;
+            }
+            return result;
+        }
+        // Step 4: Lower to Core IR
+        const core = lowerModule(ast);
+        const result = {
+            success: true,
+            core,
+        };
+        if (options?.includeIntermediates) {
+            result.tokens = tokens;
+            result.ast = ast;
+        }
+        return result;
+    }
+    catch (error) {
+        return {
+            success: false,
+            loweringErrors: [error instanceof Error ? error.message : String(error)],
+        };
+    }
+}
+/**
+ * Validate CNL source code syntax without full compilation
+ *
+ * This is a lightweight validation that only runs lexer and parser,
+ * useful for real-time editor validation.
+ *
+ * @param source - CNL source code
+ * @param lexicon - CNL lexicon (optional, defaults to EN_US)
+ * @returns Array of error messages (empty if valid)
+ */
+export function validateSyntax(source, lexicon) {
+    try {
+        const canonical = canonicalize(source);
+        const tokens = lex(canonical, lexicon);
+        const ast = parse(tokens);
+        if ('error' in ast) {
+            return [ast.error];
+        }
+        return [];
+    }
+    catch (error) {
+        return [error instanceof Error ? error.message : String(error)];
+    }
+}
+/**
+ * Get tokens from CNL source (for syntax highlighting)
+ *
+ * @param source - CNL source code
+ * @param lexicon - CNL lexicon (optional, defaults to EN_US)
+ * @returns Array of tokens
+ */
+export function tokenize(source, lexicon) {
+    const canonical = canonicalize(source);
+    return lex(canonical, lexicon);
+}
+/**
+ * Convert AST Type to type kind
+ */
+function getTypeKind(type) {
+    if (!type || typeof type !== 'object' || !('kind' in type)) {
+        return 'unknown';
+    }
+    switch (type.kind) {
+        case 'TypeName': {
+            const name = type.name.toLowerCase();
+            if (['int', 'float', 'double', 'number', 'bool', 'boolean', 'text', 'string', 'datetime', 'date', 'time'].includes(name)) {
+                return 'primitive';
+            }
+            // Custom type names are typically structs
+            return 'struct';
+        }
+        case 'List':
+            return 'list';
+        case 'Map':
+            return 'map';
+        case 'Option':
+        case 'Maybe':
+            return 'option';
+        case 'Result':
+            return 'result';
+        case 'FuncType':
+            return 'function';
+        default:
+            return 'unknown';
+    }
+}
+/**
+ * Convert AST Type to display string
+ */
+function typeToString(type) {
+    if (!type || typeof type !== 'object' || !('kind' in type)) {
+        return 'Unknown';
+    }
+    switch (type.kind) {
+        case 'TypeName':
+            return type.name;
+        case 'List':
+            return `List<${typeToString(type.type)}>`;
+        case 'Map':
+            return `Map<${typeToString(type.key)}, ${typeToString(type.val)}>`;
+        case 'Option':
+            return `Option<${typeToString(type.type)}>`;
+        case 'Maybe':
+            return `Maybe<${typeToString(type.type)}>`;
+        case 'Result':
+            return `Result<${typeToString(type.ok)}, ${typeToString(type.err)}>`;
+        default:
+            return 'Unknown';
+    }
+}
+/**
+ * Extract schema from CNL source code
+ *
+ * Parses CNL source and extracts parameter schema for the specified function,
+ * suitable for dynamic form generation.
+ *
+ * @param source - CNL source code
+ * @param options - Schema extraction options
+ * @returns Schema extraction result
+ *
+ * @example
+ * ```typescript
+ * const result = extractSchema(`
+ *   This module is loan.
+ *   A LoanApplication has creditScore Int, amount Float, term Int.
+ *   To evaluate application LoanApplication, produce Bool:
+ *     If application.creditScore >= 700 then Return true
+ *     Otherwise Return false.
+ * `);
+ *
+ * if (result.success) {
+ *   console.log(result.parameters);
+ *   // [{ name: 'application', type: 'LoanApplication', typeKind: 'struct', ... }]
+ * }
+ * ```
+ */
+export function extractSchema(source, options) {
+    try {
+        // Parse to AST
+        const canonical = canonicalize(source);
+        const tokens = lex(canonical, options?.lexicon);
+        const ast = parse(tokens);
+        if ('error' in ast || !ast) {
+            return {
+                success: false,
+                error: 'error' in ast ? ast.error : 'Parse failed',
+            };
+        }
+        const module = ast;
+        const moduleName = module.name ?? 'unknown';
+        // Find all Data declarations (for struct field resolution)
+        const dataDecls = new Map();
+        for (const decl of module.decls) {
+            if (decl.kind === 'Data') {
+                const data = decl;
+                const fields = data.fields.map((f) => ({
+                    name: f.name,
+                    type: typeToString(f.type),
+                    typeKind: getTypeKind(f.type),
+                }));
+                dataDecls.set(data.name, fields);
+            }
+        }
+        // Find the target function
+        const funcs = module.decls.filter((d) => d.kind === 'Func');
+        if (funcs.length === 0) {
+            return {
+                success: false,
+                error: 'No functions found in module',
+            };
+        }
+        const targetFuncName = options?.functionName;
+        const func = targetFuncName
+            ? funcs.find((f) => f.name === targetFuncName)
+            : funcs[0];
+        if (!func) {
+            return {
+                success: false,
+                error: targetFuncName
+                    ? `Function '${targetFuncName}' not found`
+                    : 'No functions found in module',
+            };
+        }
+        // Extract parameters
+        const parameters = func.params.map((param, index) => {
+            const typeName = typeToString(param.type);
+            const typeKind = getTypeKind(param.type);
+            // Resolve struct fields if applicable
+            const fields = typeKind === 'struct' && dataDecls.has(typeName)
+                ? dataDecls.get(typeName)
+                : undefined;
+            const result = {
+                name: param.name,
+                type: typeName,
+                typeKind,
+                optional: false, // Parameters don't have optional field in AST
+                position: index,
+            };
+            if (fields) {
+                result.fields = fields;
+            }
+            return result;
+        });
+        return {
+            success: true,
+            moduleName,
+            functionName: func.name,
+            parameters,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+//# sourceMappingURL=browser.js.map

package/dist/src/browser.js.map

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

package/dist/src/index.d.ts

@@ -34,5 +34,7 @@ export { TokenKind, KW } from './frontend/tokens.js';
 export { Node } from './ast/ast.js';
 export { typecheckModule, typecheckModuleWithCapabilities, loadImportedEffects, } from './typecheck.js';
 export type { TypecheckDiagnostic, TypecheckOptions } from './typecheck.js';
+export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
+export type { TypeKind, FieldInfo, ParameterInfo, } from './parser/input-generator.js';
 export type * from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAG5E,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EACV,QAAQ,EACR,SAAS,EACT,aAAa,GACd,MAAM,6BAA6B,CAAC;AAGrC,mBAAmB,YAAY,CAAC"}

package/dist/src/index.js

@@ -36,4 +36,6 @@ export { TokenKind, KW } from './frontend/tokens.js';
 export { Node } from './ast/ast.js';
 // 类型检查
 export { typecheckModule, typecheckModuleWithCapabilities, loadImportedEffects, } from './typecheck.js';
+// 输入值生成器（用于策略执行时自动生成示例输入）
+export { generateFieldValue, generateInputValues, getFieldValueHint, } from './parser/input-generator.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,UAAU;AACV,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,oBAAoB;AACpB,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAO1C,UAAU;AACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO;AACP,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,UAAU;AACV,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,oBAAoB;AACpB,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAO1C,UAAU;AACV,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO;AACP,OAAO,EACL,eAAe,EACf,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAGxB,0BAA0B;AAC1B,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,6BAA6B,CAAC"}

package/dist/src/parser/constraint-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint-parser.d.ts","sourceRoot":"","sources":["../../../src/parser/constraint-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,UAAU,EAA0D,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACnH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;CAC5B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,KAAK,KAAK,GACzC,iBAAiB,CA2BnB;AAqKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAClE,IAAI,EAAE,IAAI,GACT,UAAU,GAAG,IAAI,CAuBnB"}
+{"version":3,"file":"constraint-parser.d.ts","sourceRoot":"","sources":["../../../src/parser/constraint-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,UAAU,EAA0D,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACnH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC;CAC5B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,KAAK,KAAK,GACzC,iBAAiB,CA4BnB;AAqOD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAClE,IAAI,EAAE,IAAI,GACT,UAAU,GAAG,IAAI,CAuBnB"}

package/dist/src/parser/constraint-parser.js

@@ -25,10 +25,11 @@ export function parseConstraints(ctx, error) {
         }
         constraints.push(constraint.constraint);
         lastToken = constraint.endToken;
-        // 检查是否有 'and' 连接更多约束（仅在约束之间）
-        // 注意：不要消费字段之间的 'and'
+        // 检查是否还有后续约束
         if (isConstraintKeyword(ctx)) {
-            // 有更多约束，继续循环
+            continue;
+        }
+        if (skipConstraintConnector(ctx)) {
             continue;
         }
         break;
@@ -42,15 +43,67 @@ export function parseConstraints(ctx, error) {
  * 检查当前位置是否是约束关键词
  */
 function isConstraintKeyword(ctx) {
-    if (!ctx.at(TokenKind.IDENT)) {
+    return isConstraintToken(ctx.peek());
+}
+function isConstraintToken(token) {
+    if (!token)
+        return false;
+    if (token.kind !== TokenKind.IDENT &&
+        token.kind !== TokenKind.TYPE_IDENT &&
+        token.kind !== TokenKind.KEYWORD) {
         return false;
     }
-    const value = (ctx.peek().value || '').toLowerCase();
+    const value = (token.value || '').toLowerCase();
     return (value === KW.REQUIRED ||
         value === KW.BETWEEN ||
         value === KW.MATCHING ||
-        value === 'at' // 用于 'at least' / 'at most'
-    );
+        value === 'at');
+}
+/**
+ * 获取下一个非布局 token（跳过换行/缩进），便于判断连接词后的 token 类型
+ */
+function nextSignificantToken(ctx, startIndex) {
+    let idx = startIndex;
+    while (idx < ctx.tokens.length) {
+        const token = ctx.tokens[idx];
+        if (token.kind === TokenKind.NEWLINE ||
+            token.kind === TokenKind.INDENT ||
+            token.kind === TokenKind.DEDENT) {
+            idx++;
+            continue;
+        }
+        return token;
+    }
+    return null;
+}
+/**
+ * 跳过约束之间的连接符（',' 或 'and'）
+ */
+function skipConstraintConnector(ctx) {
+    const current = ctx.peek();
+    if (current.kind === TokenKind.COMMA) {
+        const nextToken = nextSignificantToken(ctx, ctx.index + 1);
+        if (isConstraintToken(nextToken ?? undefined)) {
+            ctx.next(); // consume comma
+            ctx.consumeNewlines();
+            ctx.consumeIndent();
+            return true;
+        }
+        return false;
+    }
+    if ((current.kind === TokenKind.IDENT ||
+        current.kind === TokenKind.TYPE_IDENT ||
+        current.kind === TokenKind.KEYWORD) &&
+        (current.value || '').toLowerCase() === KW.AND) {
+        const nextToken = nextSignificantToken(ctx, ctx.index + 1);
+        if (isConstraintToken(nextToken ?? undefined)) {
+            ctx.nextWord(); // consume 'and'
+            ctx.consumeNewlines();
+            ctx.consumeIndent();
+            return true;
+        }
+    }
+    return false;
 }
 /**
  * 尝试解析单个约束
@@ -58,10 +111,11 @@ function isConstraintKeyword(ctx) {
  * @returns 解析的约束，如果当前位置不是约束则返回 null
  */
 function tryParseConstraint(ctx, error) {
-    if (!ctx.at(TokenKind.IDENT)) {
+    const startToken = ctx.peek();
+    if (!isConstraintToken(startToken)) {
         return null;
     }
-    const value = (ctx.peek().value || '').toLowerCase();
+    const value = (startToken.value || '').toLowerCase();
     // 'required' - 必填约束
     if (value === KW.REQUIRED) {
         const startTok = ctx.next();