ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Add svelte as a view engine to swaf #33

Merged
ashpie merged 97 commits from svelte into develop 2021-11-09 19:31:22 +01:00
Conversation 0 Commits 97 Files Changed 199 +17 -13
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13bd933b0b - Show all commits

19
src/components/FormHelperComponent.ts
View File

@ -1,8 +1,18 @@
import {Router} from "express"; import {Router} from "express";
import ApplicationComponent from "../ApplicationComponent.js"; import ApplicationComponent from "../ApplicationComponent.js";
import FrontendToolsComponent from "./FrontendToolsComponent.js";
export default class FormHelperComponent extends ApplicationComponent { export default class FormHelperComponent extends ApplicationComponent {
public async init(): Promise<void> {
const globals = this.getApp().asOptional(FrontendToolsComponent)?.getGlobals();
if (globals) {
globals.set('validation', () => ({}));
globals.set('previousFormData', () => ({}));
}
}
public async initRoutes(router: Router): Promise<void> { public async initRoutes(router: Router): Promise<void> {
router.use((req, res, next) => { router.use((req, res, next) => {
let _validation: unknown | null; let _validation: unknown | null;
@ -24,15 +34,6 @@ export default class FormHelperComponent extends ApplicationComponent {
return _previousFormData; return _previousFormData;
}; };
let _formPrefix: string | null;
res.locals.getFormPrefix = () => {
return _formPrefix;
};
res.locals.setFormPrefix = (formPrefix: string) => {
_formPrefix = formPrefix;
return '';
};
next(); next();
}); });

9
src/frontend/SvelteViewEngine.ts
View File

@ -242,8 +242,8 @@ export default class SvelteViewEngine extends ViewEngine {
} }
let backendCall = output.substring(startIndex, endIndex); let backendCall = output.substring(startIndex, endIndex);
if (backendCall.match(/([^()]+)\((.+?)\)/)) { if (backendCall.match(/([^()]+)\((.*?)\)/)) {
backendCall = backendCall.replace(/([^()]+)\((.+?)\)/, "'$1', `[$2]`"); backendCall = backendCall.replace(/([^()]+)\((.*?)\)/, "'$1', `[$2]`");
} else { } else {
backendCall = backendCall.replace(/([^()]+)(\(\))?/, "'$1'"); backendCall = backendCall.replace(/([^()]+)(\(\))?/, "'$1'");
} }
@ -309,7 +309,10 @@ export default class SvelteViewEngine extends ViewEngine {
if (arg.startsWith("'")) return '"' + arg.substring(1, arg.length - 1) + '"'; if (arg.startsWith("'")) return '"' + arg.substring(1, arg.length - 1) + '"';
return arg; return arg;
}) })
.map(arg => Function(`"use strict";const $locals = arguments[0];return (${arg});`)(locals)); // Uses named parameter locals .filter(arg => arg.length > 0)
.map(arg => {
return Function(`"use strict";const $locals = arguments[0];return (${arg});`)(locals);
}); // Uses named parameter locals
const f = locals[key]; const f = locals[key];
if (typeof f !== 'function') throw new Error(key + ' is not a function.'); if (typeof f !== 'function') throw new Error(key + ' is not a function.');