diff --git a/package-lock.json b/package-lock.json index dffedc9..c9bd06a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rimmel", - "version": "1.4.5-rc3", + "version": "1.5.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rimmel", - "version": "1.4.5-rc3", + "version": "1.5.2", "license": "MIT", "devDependencies": { "@rollup/plugin-commonjs": "^25.0.7", @@ -30,7 +30,7 @@ "vite": "^5.4.9" }, "peerDependencies": { - "rxjs": ">=5.5.0 || >=6.0.0 || >=7.0.0 || ^8.0.0-alpha.0" + "rxjs": ">=5.5.0 || >=6.0.0 || >=7.0.0 || >=8.0.0-0 <8.0.0" } }, "node_modules/@babel/code-frame": { diff --git a/src/parser/parser.test.ts b/src/parser/parser.test.ts index ca02078..b25bc7f 100644 --- a/src/parser/parser.test.ts +++ b/src/parser/parser.test.ts @@ -602,4 +602,4 @@ describe('Parser', () => { describe('Plain Objects', () => { }); -}); +}); \ No newline at end of file diff --git a/src/parser/parser.ts b/src/parser/parser.ts index 05e7bb7..cde8775 100644 --- a/src/parser/parser.ts +++ b/src/parser/parser.ts @@ -283,17 +283,12 @@ export function rml(strings: TemplateStringsArray, ...expressions: RMLTemplateEx ; } else if(/>?\s*[^<]*$/m.test(string) && /^\s*[^<]*\s*/, ` ${RESOLVE_ATTRIBUTE}="${ref}">`) +ref; - acc += (existingRef?string:string.replace(/\s*>(?=[^<]*$)/, ` ${RESOLVE_ATTRIBUTE}="${ref}">`)) +INTERACTIVE_NODE_START +(initialValue ?? '') +INTERACTIVE_NODE_END; - + acc += string + `` + (initialValue ?? '') + ''; } else { - acc = accPlusString; + // Handle non-future expressions in plain text or other contexts + acc = accPlusString + (expression ?? ''); } } @@ -302,4 +297,4 @@ export function rml(strings: TemplateStringsArray, ...expressions: RMLTemplateEx acc += strings[strlen]; return acc; -} +} \ No newline at end of file