@valtzu/codemirror-lang-el 1.0.0 → 1.2.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+1.2
+---
+
+* Add support for typed arrays
+* Add Codex CLI and Docker Compose integration
+
+1.1
+---
+
+* Lint right-side argument type for `in` operator
+* Fix `undefined` in completion keyword tooltip (#19)
+
 1.0
 ---
 

package/README.md

@@ -36,6 +36,16 @@
 
 ### Installation
 
+#### Web Component
+
+If you're using Bootstrap UI, check the [Web Component](https://github.com/valtzu/symfony-expression-editor) to hide all CodeMirror stuff.
+
+```html
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
+<script type="module" src="https://esm.sh/symfony-expression-editor"></script>
+<textarea class="form-control" is="expression-editor" rows="1">'foobar' starts with 'foo'</textarea>
+```
+
 #### Symfony AssetMapper
 
 ```
@@ -62,7 +72,7 @@ See [CONFIGURATION.md](CONFIGURATION.md)
 
 ### Example
 
-[Live demo](https://jsfiddle.net/turse2xq/)
+[Live demo](https://jsfiddle.net/32ybaetz/)
 
 ```html
 <div id="editor"></div>
@@ -108,6 +118,15 @@ See [CONFIGURATION.md](CONFIGURATION.md)
 </script>
 ```
 
+### Using OpenAI codex
+
+Create `.env` file with
+```
+OPENAI_API_KEY="..."
+```
+
+Then use `docker compose run --rm codex` to develop with AI.
+
 ### Contributing
 
 Contributions are welcome.

package/dist/index.cjs

@@ -46,6 +46,8 @@ exports.ELScalar = void 0;
     ELScalar["String"] = "string";
     /** Equivalent to PHP `null` */
     ELScalar["Null"] = "null";
+    /** Equivalent to PHP `array` */
+    ELScalar["Array"] = "array";
     /** Equivalent to PHP `mixed` */
     ELScalar["Any"] = "any";
 })(exports.ELScalar || (exports.ELScalar = {}));
@@ -77,9 +79,12 @@ const createInfoElement = (html) => {
     return dom;
 };
 const createCompletionInfoElement = (html) => {
+    if (!html) {
+        return undefined;
+    }
     const dom = document.createElement("div");
     dom.innerHTML = html;
-    return dom;
+    return { dom };
 };
 function resolveFunctionDefinition(node, state, config) {
     var _a;
@@ -149,6 +154,18 @@ function resolveTypes(state, node, config) {
             (_d = (_c = resolveIdentifier((_a = node.lastChild) === null || _a === void 0 ? void 0 : _a.type.id, varName, (_b = config.types) === null || _b === void 0 ? void 0 : _b[baseType])) === null || _c === void 0 ? void 0 : _c.returnType) === null || _d === void 0 ? void 0 : _d.forEach((x) => types.add(x));
         });
     }
+    // Array indexing: for typed arrays (e.g. Foo[]) return element type, for generic arrays return any
+    else if (node.type.is(ArrayAccess) && node.firstChild) {
+        const left = node.firstChild.node;
+        resolveTypes(state, left, config).forEach(baseType => {
+            if (baseType.endsWith('[]')) {
+                types.add(baseType.slice(0, -2));
+            }
+            else if (baseType === exports.ELScalar.Array) {
+                types.add(exports.ELScalar.Any);
+            }
+        });
+    }
     else if (node.type.is(Application) && node.firstChild) {
         resolveTypes(state, node.firstChild, config).forEach(x => types.add(x));
     }
@@ -282,6 +299,19 @@ const expressionLanguageLinterSource = (state) => {
                     diagnostics.push({ from, to, severity: 'error', message: `${node.node.name} <code>${identifier}</code> not found` });
                 }
                 break;
+            case BinaryExpression:
+                const operatorNode = node.node.getChild(OperatorKeyword);
+                if (operatorNode) {
+                    const operator = state.sliceDoc(operatorNode.from, operatorNode.to);
+                    if (operator === 'in') {
+                        const rightArgument = node.node.lastChild;
+                        const types = resolveTypes(state, rightArgument, config);
+                        if (!types.has(exports.ELScalar.Array)) {
+                            diagnostics.push({ from: rightArgument.from, to: rightArgument.to, severity: 'error', message: `<code>${exports.ELScalar.Array}</code> expected, got <code>${[...types].join('|')}</code>` });
+                        }
+                    }
+                }
+                break;
         }
         if (identifier && ((_f = node.node.parent) === null || _f === void 0 ? void 0 : _f.type.isError)) {
             diagnostics.push({ from, to, severity: 'error', message: `Unexpected identifier <code>${identifier}</code>` });
@@ -313,7 +343,7 @@ const autocompleteFunction = (x) => {
             view.dispatch(Object.assign(Object.assign({}, autocomplete.insertCompletionText(view.state, `${x.name}()`, from, to)), { selection: { anchor: from + x.name.length + (((_b = (_a = x.args) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 ? 1 : 2) } }));
         },
         detail: (_c = x.returnType) === null || _c === void 0 ? void 0 : _c.join('|'),
-        info: () => ({ dom: createCompletionInfoElement(x.info) }),
+        info: () => createCompletionInfoElement(x.info),
         type: "function",
     });
 };
@@ -322,7 +352,7 @@ const autocompleteIdentifier = (x) => {
     return ({
         label: x.name,
         apply: x.name,
-        info: () => ({ dom: createCompletionInfoElement(x.info) }),
+        info: () => createCompletionInfoElement(x.info),
         detail: x.detail || ((_a = x.type) === null || _a === void 0 ? void 0 : _a.join('|')),
         type: 'variable',
     });
@@ -335,7 +365,7 @@ function completeOperatorKeyword(state, config, tree, from, to, explicit) {
         options: (_a = keywords.map(({ name, info, detail }) => ({
             label: name,
             apply: `${name} `,
-            info: () => ({ dom: createCompletionInfoElement(info) }),
+            info: () => createCompletionInfoElement(info),
             detail,
             type: "keyword"
         }))) !== null && _a !== void 0 ? _a : [],

package/dist/index.d.cts

@@ -66,6 +66,8 @@ declare enum ELScalar {
     String = "string",
     /** Equivalent to PHP `null` */
     Null = "null",
+    /** Equivalent to PHP `array` */
+    Array = "array",
     /** Equivalent to PHP `mixed` */
     Any = "any"
 }
@@ -78,14 +80,18 @@ declare function expressionLanguageCompletion(context: CompletionContext): Compl
 
 declare const complete_d_expressionLanguageCompletion: typeof expressionLanguageCompletion;
 declare namespace complete_d {
-  export { complete_d_expressionLanguageCompletion as expressionLanguageCompletion };
+  export {
+    complete_d_expressionLanguageCompletion as expressionLanguageCompletion,
+  };
 }
 
 declare const expressionLanguageLinter: _codemirror_state.Extension;
 
 declare const linter_d_expressionLanguageLinter: typeof expressionLanguageLinter;
 declare namespace linter_d {
-  export { linter_d_expressionLanguageLinter as expressionLanguageLinter };
+  export {
+    linter_d_expressionLanguageLinter as expressionLanguageLinter,
+  };
 }
 
 declare const Function: number;
@@ -94,7 +100,9 @@ declare const Property: number;
 declare const Variable: number;
 
 declare const createInfoElement: (html: string) => HTMLDivElement;
-declare const createCompletionInfoElement: (html: string) => HTMLDivElement;
+declare const createCompletionInfoElement: (html: string) => {
+    dom: HTMLDivElement;
+} | undefined;
 declare function resolveFunctionDefinition(node: SyntaxNode | null, state: EditorState, config: ExpressionLanguageConfig): ELFunction | undefined;
 declare const resolveIdentifier: (nodeTypeId: typeof Method | typeof Property | typeof Function | typeof Variable, identifier?: string, config?: {
     identifiers?: ELIdentifier[];
@@ -112,7 +120,15 @@ declare const utils_d_resolveFunctionDefinition: typeof resolveFunctionDefinitio
 declare const utils_d_resolveIdentifier: typeof resolveIdentifier;
 declare const utils_d_resolveTypes: typeof resolveTypes;
 declare namespace utils_d {
-  export { utils_d_createCompletionInfoElement as createCompletionInfoElement, utils_d_createInfoElement as createInfoElement, utils_d_getExpressionLanguageConfig as getExpressionLanguageConfig, utils_d_keywords as keywords, utils_d_resolveFunctionDefinition as resolveFunctionDefinition, utils_d_resolveIdentifier as resolveIdentifier, utils_d_resolveTypes as resolveTypes };
+  export {
+    utils_d_createCompletionInfoElement as createCompletionInfoElement,
+    utils_d_createInfoElement as createInfoElement,
+    utils_d_getExpressionLanguageConfig as getExpressionLanguageConfig,
+    utils_d_keywords as keywords,
+    utils_d_resolveFunctionDefinition as resolveFunctionDefinition,
+    utils_d_resolveIdentifier as resolveIdentifier,
+    utils_d_resolveTypes as resolveTypes,
+  };
 }
 
 declare const cursorTooltipField: StateField<readonly Tooltip[]>;
@@ -123,10 +139,14 @@ declare const keywordTooltip: _codemirror_state.Extension & {
 declare const tooltip_d_cursorTooltipField: typeof cursorTooltipField;
 declare const tooltip_d_keywordTooltip: typeof keywordTooltip;
 declare namespace tooltip_d {
-  export { tooltip_d_cursorTooltipField as cursorTooltipField, tooltip_d_keywordTooltip as keywordTooltip };
+  export {
+    tooltip_d_cursorTooltipField as cursorTooltipField,
+    tooltip_d_keywordTooltip as keywordTooltip,
+  };
 }
 
 declare const ELLanguage: LRLanguage;
 declare function expressionlanguage(config?: ExpressionLanguageConfig, extensions?: Extension[]): LanguageSupport;
 
-export { type ELFunction, type ELIdentifier, type ELKeyword, ELLanguage, type ELParameter, ELScalar, type ELType, type ELTypeName, type ExpressionLanguageConfig, complete_d as _complete, linter_d as _linter, tooltip_d as _tooltip, utils_d as _utils, expressionlanguage };
+export { ELLanguage, ELScalar, complete_d as _complete, linter_d as _linter, tooltip_d as _tooltip, utils_d as _utils, expressionlanguage };
+export type { ELFunction, ELIdentifier, ELKeyword, ELParameter, ELType, ELTypeName, ExpressionLanguageConfig };

package/dist/index.d.ts

@@ -66,6 +66,8 @@ declare enum ELScalar {
     String = "string",
     /** Equivalent to PHP `null` */
     Null = "null",
+    /** Equivalent to PHP `array` */
+    Array = "array",
     /** Equivalent to PHP `mixed` */
     Any = "any"
 }
@@ -78,14 +80,18 @@ declare function expressionLanguageCompletion(context: CompletionContext): Compl
 
 declare const complete_d_expressionLanguageCompletion: typeof expressionLanguageCompletion;
 declare namespace complete_d {
-  export { complete_d_expressionLanguageCompletion as expressionLanguageCompletion };
+  export {
+    complete_d_expressionLanguageCompletion as expressionLanguageCompletion,
+  };
 }
 
 declare const expressionLanguageLinter: _codemirror_state.Extension;
 
 declare const linter_d_expressionLanguageLinter: typeof expressionLanguageLinter;
 declare namespace linter_d {
-  export { linter_d_expressionLanguageLinter as expressionLanguageLinter };
+  export {
+    linter_d_expressionLanguageLinter as expressionLanguageLinter,
+  };
 }
 
 declare const Function: number;
@@ -94,7 +100,9 @@ declare const Property: number;
 declare const Variable: number;
 
 declare const createInfoElement: (html: string) => HTMLDivElement;
-declare const createCompletionInfoElement: (html: string) => HTMLDivElement;
+declare const createCompletionInfoElement: (html: string) => {
+    dom: HTMLDivElement;
+} | undefined;
 declare function resolveFunctionDefinition(node: SyntaxNode | null, state: EditorState, config: ExpressionLanguageConfig): ELFunction | undefined;
 declare const resolveIdentifier: (nodeTypeId: typeof Method | typeof Property | typeof Function | typeof Variable, identifier?: string, config?: {
     identifiers?: ELIdentifier[];
@@ -112,7 +120,15 @@ declare const utils_d_resolveFunctionDefinition: typeof resolveFunctionDefinitio
 declare const utils_d_resolveIdentifier: typeof resolveIdentifier;
 declare const utils_d_resolveTypes: typeof resolveTypes;
 declare namespace utils_d {
-  export { utils_d_createCompletionInfoElement as createCompletionInfoElement, utils_d_createInfoElement as createInfoElement, utils_d_getExpressionLanguageConfig as getExpressionLanguageConfig, utils_d_keywords as keywords, utils_d_resolveFunctionDefinition as resolveFunctionDefinition, utils_d_resolveIdentifier as resolveIdentifier, utils_d_resolveTypes as resolveTypes };
+  export {
+    utils_d_createCompletionInfoElement as createCompletionInfoElement,
+    utils_d_createInfoElement as createInfoElement,
+    utils_d_getExpressionLanguageConfig as getExpressionLanguageConfig,
+    utils_d_keywords as keywords,
+    utils_d_resolveFunctionDefinition as resolveFunctionDefinition,
+    utils_d_resolveIdentifier as resolveIdentifier,
+    utils_d_resolveTypes as resolveTypes,
+  };
 }
 
 declare const cursorTooltipField: StateField<readonly Tooltip[]>;
@@ -123,10 +139,14 @@ declare const keywordTooltip: _codemirror_state.Extension & {
 declare const tooltip_d_cursorTooltipField: typeof cursorTooltipField;
 declare const tooltip_d_keywordTooltip: typeof keywordTooltip;
 declare namespace tooltip_d {
-  export { tooltip_d_cursorTooltipField as cursorTooltipField, tooltip_d_keywordTooltip as keywordTooltip };
+  export {
+    tooltip_d_cursorTooltipField as cursorTooltipField,
+    tooltip_d_keywordTooltip as keywordTooltip,
+  };
 }
 
 declare const ELLanguage: LRLanguage;
 declare function expressionlanguage(config?: ExpressionLanguageConfig, extensions?: Extension[]): LanguageSupport;
 
-export { type ELFunction, type ELIdentifier, type ELKeyword, ELLanguage, type ELParameter, ELScalar, type ELType, type ELTypeName, type ExpressionLanguageConfig, complete_d as _complete, linter_d as _linter, tooltip_d as _tooltip, utils_d as _utils, expressionlanguage };
+export { ELLanguage, ELScalar, complete_d as _complete, linter_d as _linter, tooltip_d as _tooltip, utils_d as _utils, expressionlanguage };
+export type { ELFunction, ELIdentifier, ELKeyword, ELParameter, ELType, ELTypeName, ExpressionLanguageConfig };

package/dist/index.js

@@ -43,6 +43,8 @@ var ELScalar = /*@__PURE__*/(function (ELScalar) {
     ELScalar["String"] = "string";
     /** Equivalent to PHP `null` */
     ELScalar["Null"] = "null";
+    /** Equivalent to PHP `array` */
+    ELScalar["Array"] = "array";
     /** Equivalent to PHP `mixed` */
     ELScalar["Any"] = "any";
 return ELScalar})(ELScalar || (ELScalar = {}));
@@ -74,9 +76,12 @@ const createInfoElement = (html) => {
     return dom;
 };
 const createCompletionInfoElement = (html) => {
+    if (!html) {
+        return undefined;
+    }
     const dom = document.createElement("div");
     dom.innerHTML = html;
-    return dom;
+    return { dom };
 };
 function resolveFunctionDefinition(node, state, config) {
     var _a;
@@ -146,6 +151,18 @@ function resolveTypes(state, node, config) {
             (_d = (_c = resolveIdentifier((_a = node.lastChild) === null || _a === void 0 ? void 0 : _a.type.id, varName, (_b = config.types) === null || _b === void 0 ? void 0 : _b[baseType])) === null || _c === void 0 ? void 0 : _c.returnType) === null || _d === void 0 ? void 0 : _d.forEach((x) => types.add(x));
         });
     }
+    // Array indexing: for typed arrays (e.g. Foo[]) return element type, for generic arrays return any
+    else if (node.type.is(ArrayAccess) && node.firstChild) {
+        const left = node.firstChild.node;
+        resolveTypes(state, left, config).forEach(baseType => {
+            if (baseType.endsWith('[]')) {
+                types.add(baseType.slice(0, -2));
+            }
+            else if (baseType === ELScalar.Array) {
+                types.add(ELScalar.Any);
+            }
+        });
+    }
     else if (node.type.is(Application) && node.firstChild) {
         resolveTypes(state, node.firstChild, config).forEach(x => types.add(x));
     }
@@ -279,6 +296,19 @@ const expressionLanguageLinterSource = (state) => {
                     diagnostics.push({ from, to, severity: 'error', message: `${node.node.name} <code>${identifier}</code> not found` });
                 }
                 break;
+            case BinaryExpression:
+                const operatorNode = node.node.getChild(OperatorKeyword);
+                if (operatorNode) {
+                    const operator = state.sliceDoc(operatorNode.from, operatorNode.to);
+                    if (operator === 'in') {
+                        const rightArgument = node.node.lastChild;
+                        const types = resolveTypes(state, rightArgument, config);
+                        if (!types.has(ELScalar.Array)) {
+                            diagnostics.push({ from: rightArgument.from, to: rightArgument.to, severity: 'error', message: `<code>${ELScalar.Array}</code> expected, got <code>${[...types].join('|')}</code>` });
+                        }
+                    }
+                }
+                break;
         }
         if (identifier && ((_f = node.node.parent) === null || _f === void 0 ? void 0 : _f.type.isError)) {
             diagnostics.push({ from, to, severity: 'error', message: `Unexpected identifier <code>${identifier}</code>` });
@@ -310,7 +340,7 @@ const autocompleteFunction = (x) => {
             view.dispatch(Object.assign(Object.assign({}, insertCompletionText(view.state, `${x.name}()`, from, to)), { selection: { anchor: from + x.name.length + (((_b = (_a = x.args) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 ? 1 : 2) } }));
         },
         detail: (_c = x.returnType) === null || _c === void 0 ? void 0 : _c.join('|'),
-        info: () => ({ dom: createCompletionInfoElement(x.info) }),
+        info: () => createCompletionInfoElement(x.info),
         type: "function",
     });
 };
@@ -319,7 +349,7 @@ const autocompleteIdentifier = (x) => {
     return ({
         label: x.name,
         apply: x.name,
-        info: () => ({ dom: createCompletionInfoElement(x.info) }),
+        info: () => createCompletionInfoElement(x.info),
         detail: x.detail || ((_a = x.type) === null || _a === void 0 ? void 0 : _a.join('|')),
         type: 'variable',
     });
@@ -332,7 +362,7 @@ function completeOperatorKeyword(state, config, tree, from, to, explicit) {
         options: (_a = keywords.map(({ name, info, detail }) => ({
             label: name,
             apply: `${name} `,
-            info: () => ({ dom: createCompletionInfoElement(info) }),
+            info: () => createCompletionInfoElement(info),
             detail,
             type: "keyword"
         }))) !== null && _a !== void 0 ? _a : [],

package/package.json

@@ -39,5 +39,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.0"
+  "version": "1.2.0"
 }