v0.9.15

- fix: file collection containing file with name of template file not generating file
- upd: make useTemplate function accept an options object instead of raw boolean
towards bridge-core/editor#132

dist/Plugins/BuiltIn/GeneratorScripts/Module.d.ts

@@ -7,7 +7,11 @@ export interface IModuleOpts {
     fileSystem: FileSystem;
     console: Console;
 }
+interface IUseTemplateOptions {
+    omitTemplate?: boolean;
+}
 export declare function createModule({ generatorPath, omitUsedTemplates, fileSystem, console, }: IModuleOpts): {
-    useTemplate: (filePath: string, omitTemplate?: boolean) => Promise<any>;
+    useTemplate: (filePath: string, { omitTemplate }?: IUseTemplateOptions) => Promise<any>;
     createCollection: () => Collection;
 };
+export {};

dist/dash-compiler.bundled.es.js

@@ -7661,7 +7661,7 @@ function createModule({
   console: console2
 }) {
   return {
-    useTemplate: (filePath, omitTemplate = true) => {
+    useTemplate: (filePath, { omitTemplate = true } = {}) => {
       const templatePath = pathBrowserify.join(pathBrowserify.dirname(generatorPath), filePath);
       if (omitTemplate)
         omitUsedTemplates.add(templatePath);
@@ -7747,13 +7747,13 @@ const GeneratorScriptsPlugin = ({
         }
         return module.__default__;
       }
+    },
+    finalizeBuild(filePath, fileContent) {
       if (fileCollection.get(filePath)) {
         if (filePath.endsWith(".json") && typeof fileContent !== "string")
           return JSON.stringify(fileContent, null, "	");
         return fileContent;
       }
-    },
-    finalizeBuild(filePath, fileContent) {
       if (omitUsedTemplates.has(filePath))
         return null;
       if (isGeneratorScript(filePath)) {

dist/dash-compiler.es.js

@@ -1489,7 +1489,7 @@ function createModule({
   console: console2
 }) {
   return {
-    useTemplate: (filePath, omitTemplate = true) => {
+    useTemplate: (filePath, { omitTemplate = true } = {}) => {
       const templatePath = join(dirname(generatorPath), filePath);
       if (omitTemplate)
         omitUsedTemplates.add(templatePath);
@@ -1575,13 +1575,13 @@ const GeneratorScriptsPlugin = ({
         }
         return module.__default__;
       }
+    },
+    finalizeBuild(filePath, fileContent) {
       if (fileCollection.get(filePath)) {
         if (filePath.endsWith(".json") && typeof fileContent !== "string")
           return JSON.stringify(fileContent, null, "	");
         return fileContent;
       }
-    },
-    finalizeBuild(filePath, fileContent) {
       if (omitUsedTemplates.has(filePath))
         return null;
       if (isGeneratorScript(filePath)) {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dash-compiler",
-	"version": "0.9.14",
+	"version": "0.9.15",
 	"description": "A fast compiler for Minecraft Add-Ons",
 	"scripts": {
 		"build:types": "tsc --project tsconfig.json",

src/Plugins/BuiltIn/GeneratorScripts/Module.ts

@@ -10,14 +10,21 @@ export interface IModuleOpts {
 	console: Console
 }
 
+interface IUseTemplateOptions {
+	omitTemplate?: boolean
+}
+
 export function createModule({
 	generatorPath,
 	omitUsedTemplates,
 	fileSystem,
 	console,
 }: IModuleOpts) {
 	return {
-		useTemplate: (filePath: string, omitTemplate = true) => {
+		useTemplate: (
+			filePath: string,
+			{ omitTemplate = true }: IUseTemplateOptions = {}
+		) => {
 			const templatePath = join(dirname(generatorPath), filePath)
 			if (omitTemplate) omitUsedTemplates.add(templatePath)
 

src/Plugins/BuiltIn/GeneratorScripts/Plugin.ts

@@ -96,7 +96,10 @@ export const GeneratorScriptsPlugin: TCompilerPluginFactory<{}> = ({
 
 				return module.__default__
 			}
+		},
 
+		finalizeBuild(filePath, fileContent) {
+			// 1. Handle generated virtual files
 			if (fileCollection.get(filePath)) {
 				if (
 					filePath.endsWith('.json') &&
@@ -105,11 +108,11 @@ export const GeneratorScriptsPlugin: TCompilerPluginFactory<{}> = ({
 					return JSON.stringify(fileContent, null, '\t')
 				return fileContent
 			}
-		},
 
-		finalizeBuild(filePath, fileContent) {
+			// 2. Omit unused template
 			if (omitUsedTemplates.has(filePath)) return null
 
+			// 3. Handle transformed generator script
 			if (isGeneratorScript(filePath)) {
 				if (fileContent === null) return null