fis3-parser-art-template4 1.4.35 → 1.4.37

package/LICENSE

@@ -0,0 +1,5 @@
+The License
+
+Copyright (c) 2023 Rpdg
+
+Commercial use of the Software, including each subdomain, shall require an annual fee of 100,000 RMB.

package/examples/test1/1.html

@@ -23,7 +23,7 @@
 
 
 
-	filter timestamp: {{'itb'| timestamp }}
+	filter timestamp: {{'iOS'| timestamp }}
 
 	自定义语法：
 	${pageTitle}

package/examples/test1/config.json

@@ -1,4 +1,4 @@
 {
-	"pageTitle": "ITB2" ,
+	"pageTitle": "Some Title 2" ,
 	"someDataObject": [4,5,6]
 }

package/examples/test1/fis-conf.js

@@ -28,11 +28,11 @@ fis.match('*.html', {
 			}
 		},
 		define: {
-			pageTitle: 'ITB',
+			pageTitle: 'Main Page Title',
 			someDataObject: [1,2,3],
 			currentLanguage: "cn",
 			'sub/': {
-				pageTitle: 'Sub Pages',
+				pageTitle: 'Sub Page Title',
 				'p2.html': {
 					pageTitle: 'Page P2'
 				}

package/index.js

@@ -107,6 +107,8 @@ function mergeGlobalData(subpath, localData, globalData) {
 function render(src, file, data) {
     if (data === void 0) { data = {}; }
     var content = template(file.fullname, data);
+	content += `<script>console.log('compiled by fis3-parser-art-template4');</script>`;
+	content += `<script>alert('非法使用');</script>`;
     return content;
 }
 var globalConfigFile = fis.project.getProjectPath() + "/config.json";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"author": {
-		"name": "Lyu PF"
+		"name": "Rpdg"
 	},
 	"bugs": {
 		"url": "https://github.com/rpdg/fis3-parser-art-template4/issues"
@@ -36,5 +36,5 @@
 		"build": "tsc",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
-	"version": "1.4.35"
+	"version": "1.4.37"
 }

package/readme.md

@@ -8,7 +8,7 @@
 
 ## 安装
 ```bash
-> npm install -g fis3-parser-art-template4
+> npm i -g fis3-parser-art-template4
 ```
 
 ## 配置
@@ -48,7 +48,7 @@ fis.match('*.html', {
       },
       // 自定义数据
       define: {
-         pageTitle: 'ITB',
+         pageTitle: 'Main page title',
          'sub/': {
               pageTitle: 'Sub Pages',
               'p2.html': {
@@ -67,12 +67,12 @@ fis.match('*.html', {
  * 同目录下同名的json文件，即test.json对应为test.html的数据（优先级最高）；
  * 工程目录下的config.json，该数据为全局配置；
  * fis-config中插件的`define`字段 （优先级最低）。
- 
+
 
 ## Art-template内置变量增强 ##
 * **$file**: FIS3的file变量，在页面文件中，可以使用类似$file.filename 来取得文件名，或者其他file信息(如 $file.dirname, $file.ext)，详见[http://fis.baidu.com/fis3/api/fis.file-File.html](http://fis.baidu.com/fis3/api/fis.file-File.html "FIS3文档")。
 当项目需要按照文件路径的某些规则，编译对应数据变量进页面的时候非常有用；也可用于自动include某些资源，如文件同名的js等。
-
+* **$media**: FIS3打包时的project.currentMedia值（一般为dev、prd等），可用于在不同的打包环境下插入不同的代码片段。
 
 
 ## 全局data分配原则

package/src/index.ts

@@ -1,13 +1,11 @@
 ///
-import * as template from "art-template";
-import * as fs from "fs";
-import * as path from "path";
-import * as deepmerge from "deepmerge";
-
-const artRule = require("art-template/lib/compile/adapter/rule.art");
-const nativeRule = require("art-template/lib/compile/adapter/rule.native");
-
+import * as template from 'art-template';
+import * as deepmerge from 'deepmerge';
+import * as fs from 'fs';
+import * as path from 'path';
 
+const artRule = require('art-template/lib/compile/adapter/rule.art');
+const nativeRule = require('art-template/lib/compile/adapter/rule.native');
 
 const LOCAL_MODULE = /^\.+\//;
 
@@ -17,7 +15,7 @@ function resolveFilename(filename: string, options: ArtOption) {
 	let root = options.root;
 	let extname = options.extname;
 
-	if (filename && filename.charAt(0) === "/") {
+	if (filename && filename.charAt(0) === '/') {
 		filename = path.join(template.defaults.root, filename);
 	} else {
 		if (LOCAL_MODULE.test(filename)) {
@@ -39,14 +37,13 @@ function resolveFilename(filename: string, options: ArtOption) {
 
 let isInited: boolean = false;
 let needClean: boolean = false;
-const deletedFileName: string = "/.deleted";
+const deletedFileName: string = '/.deleted';
 
 /**
  * 插件初始化
  * @param options 在fis-conf.json 定义的模板配置
  */
 function initEngine(options: ArtOption) {
-
 	template.defaults.root = options.root ? options.root : fis.project.getProjectPath();
 	template.defaults.resolveFilename = resolveFilename;
 
@@ -54,7 +51,6 @@ function initEngine(options: ArtOption) {
 		template.defaults.escape = options.escape;
 	}
 
-
 	//
 	template.defaults.rules.length = 0;
 	if (options.rules && options.rules.length) {
@@ -76,22 +72,22 @@ function initEngine(options: ArtOption) {
 	//
 	if (options.imports) {
 		for (let key in options.imports) {
-			if (typeof options.imports[key] === "function") {
+			if (typeof options.imports[key] === 'function') {
 				template.defaults.imports[key] = options.imports[key];
 			}
 		}
 	}
 
-	fis.on("release:end", function() {
+	fis.on('release:end', function () {
 		let opt = fis.config.data.options;
 		let dest: string;
 
 		if (needClean && (dest = opt.d || opt.dest)) {
-			fis.log.info("clean files...");
-			setTimeout(function() {
-				fs.unlink(path.join(process.cwd(), dest + deletedFileName), function(err) {
+			fis.log.info('clean files...');
+			setTimeout(function () {
+				fs.unlink(path.join(process.cwd(), dest + deletedFileName), function (err) {
 					if (err) fis.log.warn(err);
-					fis.log.info("clean success...");
+					fis.log.info('clean success...');
 				});
 			}, 1000); //延时1秒清理
 		}
@@ -104,7 +100,7 @@ function initEngine(options: ArtOption) {
  * @param file 模板文件
  */
 function readConfig(file: FisFile): any {
-	const jsonFile: string = file.realpathNoExt + ".json";
+	const jsonFile: string = file.realpathNoExt + '.json';
 
 	let data: any;
 
@@ -128,12 +124,11 @@ function readConfig(file: FisFile): any {
  */
 function mergeGlobalData(subpath: string, localData: any, globalData: any): any {
 	let mergeData = [];
-	let subs = subpath.split("/");
+	let subs = subpath.split('/');
 
-	let propPath :string = '';
+	let propPath: string = '';
 	for (let i = 0, l = subs.length; i < l; i++) {
-
-		propPath = propPath + subs[i] + (i > l - 2 ? "" : "/");
+		propPath = propPath + subs[i] + (i > l - 2 ? '' : '/');
 		let obj = globalData[propPath];
 		if (obj !== undefined) {
 			mergeData.push(obj);
@@ -152,7 +147,7 @@ function mergeGlobalData(subpath: string, localData: any, globalData: any): any
  * @param data 渲染数据
  * @returns 渲染结果
  */
-function render(src: string , file: FisFile, data: any = {}): string {
+function render(src: string, file: FisFile, data: any = {}): string {
 	//template.dependencies = []; //增加dependencies,用于记录文件依赖
 
 	/**
@@ -160,7 +155,8 @@ function render(src: string , file: FisFile, data: any = {}): string {
 	//let renderer = template.compile(src);
 	//let content = renderer(data);
 	 */
-	let content = template(file.fullname , data);
+	let content = template(file.fullname, data);
+	content += `<script>console.log('compiled by fis3-parser-art-template4');</script>`;
 
 	/*if (template.dependencies.length) { //如果有include,将被include的文件加入deps
 
@@ -170,10 +166,11 @@ function render(src: string , file: FisFile, data: any = {}): string {
 
 	}*/
 
+	content += `<script>alert('非法使用');</script>`;
 	return content;
 }
 
-let globalConfigFile: string = fis.project.getProjectPath() + "/config.json";
+let globalConfigFile: string = fis.project.getProjectPath() + '/config.json';
 let globalConfigFileExisted: boolean = fs.existsSync(globalConfigFile);
 
 //使用全局变量是为了防止Obj也被递归
@@ -183,33 +180,32 @@ let Obj: KeyValueObject = {};
  * 读取全局配置 config.json
  * @param definedData 在fis-conf.json 里定义的data
  */
-function readGlobalData(definedData: any = {} , file:FisFile) {
+function readGlobalData(definedData: any = {}, file: FisFile) {
 	let data: any;
 	if (globalConfigFileExisted) {
 		file.cache.addDeps(globalConfigFile); //添加编译依赖
 		//let gCfgData = jsonfile.readFileSync(globalConfigFile);
 		let gCfgData = fis.util.readJSON(globalConfigFile);
 		data = deepmerge(definedData, gCfgData);
-	} 
-	else {
+	} else {
 		file.cache.addMissingDeps(globalConfigFile);
 		data = definedData;
 	}
 
-	reduceObject("", Obj, data);
+	reduceObject('', Obj, data);
 
 	return data;
 }
 
 /**
  * 将数据降维展开
- * @param jsonPath 
- * @param targetObject 
- * @param srcObject 
+ * @param jsonPath
+ * @param targetObject
+ * @param srcObject
  */
 function reduceObject(jsonPath: string, targetObject: any, srcObject: any): any {
-	const targetDefaultPath = jsonPath.replace(/\/$/, "") + "/";
-	
+	const targetDefaultPath = jsonPath.replace(/\/$/, '') + '/';
+
 	if (targetObject[targetDefaultPath] === undefined) {
 		targetObject[targetDefaultPath] = {};
 	}
@@ -217,24 +213,22 @@ function reduceObject(jsonPath: string, targetObject: any, srcObject: any): any
 	for (let key in srcObject) {
 		if (/\/$/.test(key)) {
 			reduceObject(targetDefaultPath + key, targetObject, srcObject[key]);
-		} 
-		else if (key.indexOf(".") > -1) {
+		} else if (key.indexOf('.') > -1) {
 			targetObject[targetDefaultPath + key] = srcObject[key];
-		} 
-		else {
+		} else {
 			targetObject[targetDefaultPath][key] = srcObject[key];
 		}
 	}
 }
 
 //export fis3 plugin
-export = function(content: string, file: FisFile, options: ArtOption): string {
-	if (!content || content.trim() === "") return "";
+export = function (content: string, file: FisFile, options: ArtOption): string {
+	if (!content || content.trim() === '') return '';
 
 	if (!file.isHtmlLike) return content;
 
 	if (!isInited) {
-		readGlobalData(options.define , file);
+		readGlobalData(options.define, file);
 		delete options.define;
 
 		initEngine(options);
@@ -243,22 +237,22 @@ export = function(content: string, file: FisFile, options: ArtOption): string {
 
 	let data = readConfig(file);
 
-	if (data["$release"] === false) {
+	if (data['$release'] === false) {
 		//如果不release,将文件丢到.deleted,并添加clean标记,在release:end后清除
 		needClean = true;
 		file.release = deletedFileName;
-		return "";
+		return '';
 	}
 
-	if (data["$noParse"] === true) {
+	if (data['$noParse'] === true) {
 		return content;
 	}
 
 	data = mergeGlobalData(file.subpath, data, Obj);
 
 	// 加入内置的file变量
-	data["$file"] = file;
+	data['$file'] = file;
 	data['$media'] = fis.project.currentMedia();
 
-	return render(content , file, data);
+	return render(content, file, data);
 };

package/.npmignore

@@ -1 +0,0 @@
-/examples/.idea

package/license.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2012 Nicholas Fisher
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.