openharmony/third_party_weex-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_weex-loader synced 2024-11-23 07:20:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!74 element name repeate log

Browse Source 
Merge pull request !74 from 卡哥/elementlog
This commit is contained in:
openharmony_ci 2022-06-27 11:45:47 +00:00 committed by Gitee
commit a4ee0cb342
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/loader.js
View File

@ -31,7 +31,8 @@ import {
getRequireString,
stringifyLoaders,
logWarn,
loadBabelModule
loadBabelModule,
elements
}
from './util'
import { isReservedTag } from './templater/component_validator'
@ -180,6 +181,11 @@ function loader (source) {
const isEntry = resourceQuery.entry
const dirName = path.parse(this.resourcePath)
const name = isEntry ? dirName.name : resourceQuery.name || getNameByPath(this.resourcePath)
const parentName = resourceQuery.parentName || name;
if (isEntry) {
elements[name] = elements[name] || {};
elements[name][name] = true;
}
if (isReservedTag(name) && process.env.abilityType === 'page') {
logWarn(this, [{
reason: 'ERROR: The file name cannot contain reserved tag name: ' + name
@ -189,7 +195,7 @@ function loader (source) {
let output = ''
// import app.js
output += loadApp(this, name, isEntry, customLang, source)
output += loadPage(this, name, isEntry, customLang, source)
output += loadPage(this, name, isEntry, customLang, source, parentName);
return output
}
@ -262,7 +268,7 @@ function loadApp (_this, name, isEntry, customLang, source) {
}
}
function loadPage (_this, name, isEntry, customLang, source) {
function loadPage (_this, name, isEntry, customLang, source, parentName) {
let output = ''
if (path.extname(_this.resourcePath).match(/\.hml/)) {
const filename = _this.resourcePath.replace(path.extname(_this.resourcePath).toString(), '')
@ -272,7 +278,8 @@ function loadPage (_this, name, isEntry, customLang, source) {
const frag = parseFragment(source)
const elementNames = []
const elementLength = frag.element.length
output += loadPageCheckElementLength(_this, elementLength, frag, elementNames, resourcePath, customLang)
output += loadPageCheckElementLength(_this, elementLength, frag, elementNames, resourcePath,
customLang, parentName);
output += 'var $app_template$ = ' + getRequireString(_this, getLoaderString('template', {
customLang,
@ -299,7 +306,8 @@ function loadPage (_this, name, isEntry, customLang, source) {
return output
}
function loadPageCheckElementLength (_this, elementLength, frag, elementNames, resourcePath, customLang) {
function loadPageCheckElementLength (_this, elementLength, frag, elementNames, resourcePath,
customLang, parentName) {
let output = ''
if (elementLength) {
for (let i = 0; i < elementLength; i++) {
@ -320,6 +328,14 @@ function loadPageCheckElementLength (_this, elementLength, frag, elementNames, r
if (!element.name) {
element.name = path.parse(src).name
}
elements[parentName] = elements[parentName] || {};
if (elements[parentName][element.name]) {
logWarn(_this, [{
reason: `ERROR: The element name ${element.name} can not be repeated.`
}]);
} else {
elements[parentName][element.name] = true;
}
checkEntry(_this, filePath, element.src)
}
else {

1
src/util.js
View File

@ -28,6 +28,7 @@ import {
const { DEVICE_LEVEL } = require('./lite/lite-enum')
export const useOSFiles = new Set();
export const elements = {};
export function getNameByPath (resourcePath) {
return path.basename(resourcePath).replace(/\..*$/, '')