@plaudit/webpack-extensions 2.60.1 → 2.60.2

package/build/utils/php-writer.d.ts

@@ -25,12 +25,13 @@ export declare class PHPWriter {
     private readonly scopeStack;
     private readonly useList;
     private readonly allocatedGeneratedFunctionNames;
+    private readonly isSubwriter;
     private printingInPHP;
     private buffer;
     private indentation;
     private fileNamespace;
     private myOpenedScopes;
-    constructor(inlineFirstLine?: boolean, scopeStack?: string[][], useList?: string[], allocatedGeneratedFunctionNames?: Set<string>, printingInPHP?: boolean, initialIndentation?: number);
+    constructor(inlineFirstLine?: boolean, scopeStack?: string[][], useList?: string[], allocatedGeneratedFunctionNames?: Set<string>, isSubwriter?: boolean, printingInPHP?: boolean, initialIndentation?: number);
     createSubwriter(): PHPWriter;
     indent(): this;
     outdent(): this;
@@ -85,6 +86,7 @@ export declare class PHPWriter {
     }): this;
     toString(args?: {
         includeOpenPHP?: boolean;
+        includeNamespaceAndUse?: boolean;
     }): string;
     emitAsset(compilation: Compilation, file: string, assetInfo?: AssetInfo): void;
 }

package/build/utils/php-writer.js

@@ -25,21 +25,23 @@ class PHPWriter {
     scopeStack;
     useList;
     allocatedGeneratedFunctionNames;
+    isSubwriter;
     printingInPHP;
     buffer = [];
     indentation;
     fileNamespace = "";
     myOpenedScopes = 0;
-    constructor(inlineFirstLine = false, scopeStack = [], useList = [], allocatedGeneratedFunctionNames = new Set(), printingInPHP = true, initialIndentation = 0) {
+    constructor(inlineFirstLine = false, scopeStack = [], useList = [], allocatedGeneratedFunctionNames = new Set(), isSubwriter = false, printingInPHP = true, initialIndentation = 0) {
         this.inlineFirstLine = inlineFirstLine;
         this.scopeStack = scopeStack;
         this.useList = useList;
         this.allocatedGeneratedFunctionNames = allocatedGeneratedFunctionNames;
+        this.isSubwriter = isSubwriter;
         this.printingInPHP = printingInPHP;
         this.indentation = "\t".repeat(initialIndentation);
     }
     createSubwriter() {
-        return new PHPWriter(false, this.scopeStack, this.useList, this.allocatedGeneratedFunctionNames, this.printingInPHP, this.indentation.length)
+        return new PHPWriter(false, this.scopeStack, this.useList, this.allocatedGeneratedFunctionNames, true, this.printingInPHP, this.indentation.length)
             .setIndentation(this.indentation.length);
     }
     indent() {
@@ -127,13 +129,13 @@ class PHPWriter {
             }
             this.openPHP().openScope();
             const functionName = functionWriter.function(true, functionArgParameters, contents, { useVars, scopeActionDescription: `closing the function call for the ${name} ${type}.`, assignToName: true });
-            this.append(functionWriter.toString({ includeOpenPHP: false }).trim());
+            this.append(functionWriter.toString().trim());
             declarationFunctionText = functionName + "(...)";
             this.if(`doing_${type}(${Expr.convertJsonToPHP(name)})`).call(functionName, accountForAlreadyDoing === true ? [] : accountForAlreadyDoing);
         }
         else {
             functionWriter.function(false, functionArgParameters, contents, { useVars, scopeActionDescription: `closing the function call for the ${name} ${type}.` });
-            declarationFunctionText = functionWriter.toString({ includeOpenPHP: false }).trim();
+            declarationFunctionText = functionWriter.toString().trim();
         }
         // The trailing comma inside the first item is necessary
         const declarationComponents = [`${Expr.convertJsonToPHP(name)}`, declarationFunctionText];
@@ -307,19 +309,21 @@ class PHPWriter {
         }
         return this;
     }
-    toString(args = {}) {
+    toString(args = this.isSubwriter ? { includeOpenPHP: false, includeNamespaceAndUse: false } : {}) {
         if (this.myOpenedScopes) {
             console.trace("toString() was called on a PHPWriter that has a dangling scope");
         }
         const fileContents = [];
         let canInline = true;
-        if (this.fileNamespace) {
-            canInline = false;
-            fileContents.push(`namespace ${this.fileNamespace};`);
-        }
-        if (this.useList.length) {
-            canInline = false;
-            fileContents.push(...this.useList.map(use => `use ${use};`));
+        if (args.includeNamespaceAndUse !== false) {
+            if (this.fileNamespace) {
+                canInline = false;
+                fileContents.push(`namespace ${this.fileNamespace};`);
+            }
+            if (this.useList.length) {
+                canInline = false;
+                fileContents.push(...this.useList.map(use => `use ${use};`));
+            }
         }
         fileContents.push(...this.buffer);
         if (args.includeOpenPHP === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plaudit/webpack-extensions",
-  "version": "2.60.1",
+  "version": "2.60.2",
   "license": "UNLICENSED",
   "files": [
     "/build"