8000 Add namespace support to `source` function by willrowe · Pull Request #823 · twigjs/twig.js · GitHub
[go: up one dir, main page]
Skip to content

Add namespace support to source function #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 2, 2022
Merged

Add namespace support to source function #823

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaa1a29
Fix wiki URL
willrowe Aug 30, 2022
44a9a31
Add `expandNamespace` function to replace namespace references with t…
willrowe Aug 30, 2022
c5cd6c4
Call `expandNamesapce` from `parsePath`
willrowe Aug 30, 2022
9ab9795
Add test for using namespaces in `source` function
willrowe Aug 30, 2022
3d6fed7
Expand any namespaces in paths passed to the `source` function
willrowe Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Call expandNamesapce from parsePath
  • Loading branch information
@willrowe
willrowe committed Aug 30, 2022
commit c5cd6c4cef25b0336c3dc401e7f52b58847b6c1d
29 changes: 5 additions & 24 deletions src/twig.path.js
View file
Open in desktop
Original file line nu A7E5 mber Diff line number Diff line change
Expand Up @@ -34,36 +34,17 @@ module.exports = function (Twig) {
* @return {string} The canonical version of the path
*/
Twig.path.parsePath = function (template, _file) {
let k = null;
const {namespaces} = template.options;
let file = _file || '';
const file = _file || '';
const hasNamespaces = namespaces && typeof namespaces === 'object';

if (hasNamespaces) {
for (k in namespaces) {
if (!file.includes(k)) {
continue;
}

// Check if keyed namespace exists at path's start
const colon = new RegExp('^' + k + '::');
const atSign = new RegExp('^@' + k + '/');
// Add slash to the end of path
const namespacePath = namespaces[k].replace(/([^/])$/, '$1/');
let path = (hasNamespaces ? Twig.path.expandNamespace(namespaces, file) : file);

if (colon.test(file)) {
file = file.replace(colon, namespacePath);
return file;
}

if (atSign.test(file)) {
file = file.replace(atSign, namespacePath);
return file;
}
}
if (path === file) {
path = Twig.path.relativePath(template, file);
}

return Twig.path.relativePath(template, file);
return path;
};

/**
Expand Down
0