tungsten 0.2.23 → 0.2.25

package/dist/Framework.js

@@ -2,8 +2,8 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 //import slash from 'slash'
-import rmfr from 'rmfr';
 import { join } from 'path';
+import { removeRecursive } from "./removeRecursive.js";
 import { filter as objectFilter, remap as objectRemap } from 'sxy-lib/objects.js';
 import { buildCodeSubPath, buildFolder, devBuildOuterFolder, prodBuildFolder, prodBuildCodeFolder, bundleFolder, staticSiteFolder } from "./settings.js";
 import { DevServer } from "./Servers/DevServer.js";
@@ -65,22 +65,22 @@ export class Framework {
     switch (mode) {
       case 'prod':
         {
-          await Promise.all([rmfr(join(projectDir, prodBuildFolder)), rmfr(join(projectDir, bundleFolder))]);
+          await Promise.all([removeRecursive(join(projectDir, prodBuildFolder)), removeRecursive(join(projectDir, bundleFolder))]);
           break;
         }
       case 'staticSite':
         {
-          await rmfr(join(projectDir, staticSiteFolder));
+          await removeRecursive(join(projectDir, staticSiteFolder));
           break;
         }
       case 'dev':
         {
-          await rmfr(join(projectDir, devBuildOuterFolder));
+          await removeRecursive(join(projectDir, devBuildOuterFolder));
           break;
         }
       default:
         {
-          await rmfr(join(projectDir, buildFolder));
+          await removeRecursive(join(projectDir, buildFolder));
           break;
         }
     }

package/dist/bin/commands/compile.js

@@ -1,6 +1,6 @@
 import { dirname, join, resolve } from 'path';
 import { promises as fsPromises } from 'fs';
-import rmfr from 'rmfr';
+import { removeRecursive } from "../../removeRecursive.js";
 import { compileJavascript } from "../../build/compileJavascript.js";
 import { compileStyles } from "../../build/compileStyles.js";
 import { copyAssets } from "../../build/copyAssets.js";
@@ -101,7 +101,7 @@ if (buildLocation.toLowerCase() === resolve(projectDir).toLowerCase()) {
   process.exit(1);
 }
 async function clearReadyFile() {
-  if (readyFileLocation !== undefined) await rmfr(readyFileLocation);
+  if (readyFileLocation !== undefined) await removeRecursive(readyFileLocation);
 }
 async function markReady() {
   if (readyFileLocation === undefined) return;
@@ -115,23 +115,23 @@ async function markReady() {
     targets: [...targets],
     updatedAt: new Date().toISOString()
   }));
-  await rmfr(readyFileLocation);
+  await removeRecursive(readyFileLocation);
   await fsPromises.rename(temporaryLocation, readyFileLocation);
 }
 await clearReadyFile();
 const cleanTasks = [];
 if (clean && targets.has('js')) {
-  cleanTasks.push(rmfr(buildCodeLocation), rmfr(join(buildLocation, componentCssFolder)), rmfr(join(buildLocation, packagesFolder)), rmfr(packagesCacheLocation));
+  cleanTasks.push(removeRecursive(buildCodeLocation), removeRecursive(join(buildLocation, componentCssFolder)), removeRecursive(join(buildLocation, packagesFolder)), removeRecursive(packagesCacheLocation));
 }
 if (clean && targets.has('css')) {
-  cleanTasks.push(rmfr(join(buildLocation, staticFolder)));
+  cleanTasks.push(removeRecursive(join(buildLocation, staticFolder)));
 }
 if (clean && targets.has('client')) {
-  cleanTasks.push(rmfr(join(buildLocation, clientFolder)), rmfr(join(buildLocation, '.tungsten.config.js')));
+  cleanTasks.push(removeRecursive(join(buildLocation, clientFolder)), removeRecursive(join(buildLocation, '.tungsten.config.js')));
 }
 if (clean) {
-  if (targets.has('assets')) cleanTasks.push(rmfr(join(buildLocation, assetsFolder)));
-  if (targets.has('public')) cleanTasks.push(rmfr(join(buildLocation, publicFolder)));
+  if (targets.has('assets')) cleanTasks.push(removeRecursive(join(buildLocation, assetsFolder)));
+  if (targets.has('public')) cleanTasks.push(removeRecursive(join(buildLocation, publicFolder)));
   cliOut(`Cleaning compile output: ${[...targets].join(', ')}`);
   await Promise.all(cleanTasks);
 }

package/dist/build/compileStyles.js

@@ -209,7 +209,8 @@ export async function compileStyles(projectDir, config, styleImportBase, buildLo
   // C is needed by B,A
   // D is needed by C,B,A
   const cssFiles = {};
-  const sourceLocation = config.sourceDir ? join(projectDir, config.sourceDir) : join(projectDir, config.codeDir);
+  const sourceLocation = config.sourceDir // eslint-disable-line @typescript-eslint/strict-boolean-expressions
+  ? join(projectDir, config.sourceDir) : join(projectDir, config.codeDir);
   const staticLocation = join(buildLocation, staticFolder);
   const watchGlob = sourceLocation + '/**/*.{css,scss,sass,less}';
   const ignoreGlob = buildLocation + '/**/*';

package/dist/build/createClientFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createClientFiles.d.ts","sourceRoot":"","sources":["../../src/build/createClientFiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,IAAI,EACV,aAAa,CAAC,EAAE,MAAM,iBAgFzB"}
+{"version":3,"file":"createClientFiles.d.ts","sourceRoot":"","sources":["../../src/build/createClientFiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,EAAE,IAAI,EACV,aAAa,CAAC,EAAE,MAAM,iBAiFzB"}

package/dist/build/createClientFiles.js

@@ -11,11 +11,12 @@ export async function createClientFiles(config, mode, buildLocation) {
   const routesLocation = config.routesLocation;
   //if (routesLocation !== null) {
   const [routeFilePath, routesExportName] = routesLocation;
-  const promises = [
-  // ensure the folder exists
-  fsPromises.mkdir(join(specificBuildFolder, `${clientFolder}`), {
+  // ensure the folder exists -- must complete before anything below writes into it,
+  // so it can't just be another entry in the promises array (they all start eagerly)
+  await fsPromises.mkdir(join(specificBuildFolder, `${clientFolder}`), {
     recursive: true
-  }),
+  });
+  const promises = [
   // client.js file
   fsPromises.copyFile(join(frameworkDir, frameworkDistFolder, frameworkClientFolder, 'client.js'),
   // from

package/dist/build/processPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processPackage.d.ts","sourceRoot":"","sources":["../../src/build/processPackage.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,OAAO,EAAE,oBAAoB,EAA4D,MAAM,2BAA2B,CAAA;AAwB1H,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoGxK"}
+{"version":3,"file":"processPackage.d.ts","sourceRoot":"","sources":["../../src/build/processPackage.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG/D,OAAO,EAAE,oBAAoB,EAA4D,MAAM,2BAA2B,CAAA;AAwB1H,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoGxK"}

package/dist/build/processPackage.js

@@ -1,8 +1,8 @@
-import rmfr from 'rmfr';
 import { transform } from 'cjstoesm';
 import { promises as fsPromises } from 'fs';
 import fsExtra from 'fs-extra';
 import { packagesCacheFolder, packagesFolder } from "../settings.js";
+import { removeRecursive } from "../removeRecursive.js";
 import { cliLog } from "../cliOutput.js";
 //import { getFrameworkDir } from '../getFrameworkDir.js'
 //// Don't think we are using this
@@ -43,7 +43,7 @@ export async function processPackage(projectDir, packagesCacheInfo, packageName,
     console.log(`Didn't find ${packageAndVersion} in packages cached - proceeding`);
     //
     // check if package is esm or cjs?
-    const rmfrResult = await rmfr(targetLocation);
+    await removeRecursive(targetLocation);
     await fsPromises.mkdir(targetLocation);
     //console.log('json for ', packageName, json)
     if (packageJson.type === undefined && packageJson.type !== 'module') {
@@ -52,7 +52,7 @@ export async function processPackage(projectDir, packagesCacheInfo, packageName,
         const input = `${sourceLocation}/**/*`;
         /// change to cache loc
         //const outDir = targetLocation
-        const rmfrResult = await rmfr(cacheLocation);
+        await removeRecursive(cacheLocation);
         await fsPromises.mkdir(cacheLocation);
         await transform({
           input: input,

package/dist/helpers/getFetchCompatibleHeaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFetchCompatibleHeaders.d.ts","sourceRoot":"","sources":["../../src/helpers/getFetchCompatibleHeaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAKtC,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,OAAO,WAYrD"}
+{"version":3,"file":"getFetchCompatibleHeaders.d.ts","sourceRoot":"","sources":["../../src/helpers/getFetchCompatibleHeaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAKtC,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAY/D"}

package/dist/postcssPlugins/TransformCssNames.d.ts

@@ -1,2 +1,15 @@
-export declare const TransformCssNames: any;
+import type { Root } from 'postcss';
+import type { CssNames } from '../CssNames.js';
+type Opts = {
+    moduleName: string;
+    outNames: CssNames;
+};
+export declare const TransformCssNames: {
+    (opts: Opts): {
+        postcssPlugin: string;
+        Once(root: Root): void;
+    };
+    postcss: boolean;
+};
+export {};
 //# sourceMappingURL=TransformCssNames.d.ts.map

package/dist/postcssPlugins/TransformCssNames.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransformCssNames.d.ts","sourceRoot":"","sources":["../../src/postcssPlugins/TransformCssNames.ts"],"names":[],"mappings":"AAsFA,eAAO,MAAM,iBAAiB,KA6H5B,CAAA"}
+{"version":3,"file":"TransformCssNames.d.ts","sourceRoot":"","sources":["../../src/postcssPlugins/TransformCssNames.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,IAAI,EAAQ,MAAM,SAAS,CAAA;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAyD9C,KAAK,IAAI,GAAG;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;CACrB,CAAA;AAKD,eAAO,MAAM,iBAAiB;WAAU,IAAI;;mBAezB,IAAI;;;CAoHtB,CAAA"}

package/dist/postcssPlugins/TransformCssNames.js

@@ -9,8 +9,6 @@ extract classes -> localise
 .navItem    ->  NavItem_navItemf
 .span       ->  NavItem_span
 */
-//const path = require('path')
-import postcss from 'postcss';
 import { parseSelectorsRich } from "./parseSelectorsRich.js";
 import { componentBumpClass } from "../componentClassName.js";
 import { throwError } from "../throwError.js";
@@ -45,13 +43,13 @@ function transformTag(moduleName, tag) {
   };
 }
 //Page-poll#_div
+// why is this unused?
 function separatePseudo(selector) {
   const colonIndex = selector.indexOf(':');
   if (colonIndex === -1) return [selector, ''];else return [selector.slice(0, colonIndex), selector.slice(colonIndex)];
 }
 const bump = '.' + componentBumpClass + '.' + componentBumpClass + '.' + componentBumpClass;
-// !!! DEPRECATED
-export const TransformCssNames = postcss.plugin('postcss-transform-names', opts => {
+export const TransformCssNames = opts => {
   //console.log('TransformCssNames')
   if (!('moduleName' in opts)) {
     throw new Error(`PostcssTransformNames error - pass a moduleName prop to the` + ` plugin to receive transformed names map`);
@@ -59,100 +57,104 @@ export const TransformCssNames = postcss.plugin('postcss-transform-names', opts
   if (!('outNames' in opts)) {
     throw new Error(`PostcssTransformNames error - pass an outNames object to the` + ` plugin to receive transformed names map`);
   }
-  return root => {
-    const moduleName = opts.moduleName;
-    const names = opts.outNames;
-    names.moduleName = moduleName;
-    names.tags = {};
-    names.classes = {};
-    // Transform CSS AST here
-    root.walkRules(rule => {
-      const selectorLine = rule.selector;
-      const selectorGroups = selectorLine.split(',').map(x => x.trim());
-      const newSelectorGroups = [];
-      for (const selectorGroup of selectorGroups) {
-        debug('selectorGroup', selectorGroup);
-        //// Always explain your regex's
-        //// Split the string before a space, after a space, before a . or # within a sequence (e.g. foo.bar)
-        //// This splits the string into tags (foo), classes (.foo), IDs (#foo), and spaces ( )
-        //// The spaces are retained so that we can rebuild the string with the spaces as they were found
-        //const selectors = selectorGroup.split(/(?= )|(?<= )|(?<=\S)(?=[.#]\S)/)
-        // replace the regex with a parser. Easier
-        const selectors = parseSelectorsRich(selectorGroup);
-        const newSelectors = [];
-        for (const {
-          type,
-          content
-        } of selectors) {
-          debug('Sel: ', type + ':', content);
-          if (type === 'whitespace') {
-            newSelectors.push(' ');
-          } else if (type === 'grammar') {
-            newSelectors.push(content);
-          } else if (type === 'id') {
-            newSelectors.push(content);
-          } else if (type === 'class') {
-            const className = content.slice(1);
-            const newClassName = transformClass(moduleName, className);
-            newSelectors.push('.' + newClassName);
-            names.classes[className] = newClassName;
-          } else if (type === 'tag') {
-            const newName = transformTag(moduleName, content);
-            // newName.css === escaped version for css
-            // newName.jsx === unescaped ver for jsx
-            if (/^[A-Z]/.test(content)) {
-              // starts with uppercase - React el
-              newSelectors.push(bump + '.' + newName.css);
-            } else {
-              // lowercase - html el
-              newSelectors.push('.' + newName.css);
-            }
-            names.tags[content] = newName.jsx;
-          } else if (type === 'pseudo-class') {
-            // // REGEX:
-            // // :
-            // // multiple letters/numbers/-/_ [match group 1]
-            // // (
-            // // any chars (greedy / as many as possible) [match group 2]
-            // // )
-            // // e.g. :Match1(Match2)
-            // const pseudoClassRegex = /:([a-zA-Z0-9-_]+)\((.*)\)/
-            // REGEX:
-            // :
-            // multiple letters/numbers/-/_ [match group 1]
-            // optional section, non matching
-            //   (
-            //   any chars (greedy / as many as possible) [match group 2]
-            //   )
-            // e.g. :Match1(Match2)
-            const pseudoClassRegex = /:([a-zA-Z0-9-_]+)(?:\((.*)\))?/;
-            const results = pseudoClassRegex.exec(content);
-            if (results === null) throwError('TransformCssNames -> walkRules', 'pseudo-class selector did not match pseudo-class regex');
-            const label = results[1]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
-            // if it is :i(xxx) or :ignore(xxx), pass through the internal part
-            // otherwise pass all through unaffected
-            if (label === 'i' || label === 'ignore') {
-              const inner = results[2]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
-              if (inner !== undefined && inner !== '') {
-                newSelectors.push(inner);
+  return {
+    postcssPlugin: 'postcss-transform-names',
+    Once(root) {
+      const moduleName = opts.moduleName;
+      const names = opts.outNames;
+      names.moduleName = moduleName;
+      names.tags = {};
+      names.classes = {};
+      // Transform CSS AST here
+      root.walkRules(rule => {
+        const selectorLine = rule.selector;
+        const selectorGroups = selectorLine.split(',').map(x => x.trim());
+        const newSelectorGroups = [];
+        for (const selectorGroup of selectorGroups) {
+          debug('selectorGroup', selectorGroup);
+          //// Always explain your regex's
+          //// Split the string before a space, after a space, before a . or # within a sequence (e.g. foo.bar)
+          //// This splits the string into tags (foo), classes (.foo), IDs (#foo), and spaces ( )
+          //// The spaces are retained so that we can rebuild the string with the spaces as they were found
+          //const selectors = selectorGroup.split(/(?= )|(?<= )|(?<=\S)(?=[.#]\S)/)
+          // replace the regex with a parser. Easier
+          const selectors = parseSelectorsRich(selectorGroup);
+          const newSelectors = [];
+          for (const {
+            type,
+            content
+          } of selectors) {
+            debug('Sel: ', type + ':', content);
+            if (type === 'whitespace') {
+              newSelectors.push(' ');
+            } else if (type === 'grammar') {
+              newSelectors.push(content);
+            } else if (type === 'id') {
+              newSelectors.push(content);
+            } else if (type === 'class') {
+              const className = content.slice(1);
+              const newClassName = transformClass(moduleName, className);
+              newSelectors.push('.' + newClassName);
+              names.classes[className] = newClassName;
+            } else if (type === 'tag') {
+              const newName = transformTag(moduleName, content);
+              // newName.css === escaped version for css
+              // newName.jsx === unescaped ver for jsx
+              if (/^[A-Z]/.test(content)) {
+                // starts with uppercase - React el
+                newSelectors.push(bump + '.' + newName.css);
+              } else {
+                // lowercase - html el
+                newSelectors.push('.' + newName.css);
+              }
+              names.tags[content] = newName.jsx;
+            } else if (type === 'pseudo-class') {
+              // // REGEX:
+              // // :
+              // // multiple letters/numbers/-/_ [match group 1]
+              // // (
+              // // any chars (greedy / as many as possible) [match group 2]
+              // // )
+              // // e.g. :Match1(Match2)
+              // const pseudoClassRegex = /:([a-zA-Z0-9-_]+)\((.*)\)/
+              // REGEX:
+              // :
+              // multiple letters/numbers/-/_ [match group 1]
+              // optional section, non matching
+              //   (
+              //   any chars (greedy / as many as possible) [match group 2]
+              //   )
+              // e.g. :Match1(Match2)
+              const pseudoClassRegex = /:([a-zA-Z0-9-_]+)(?:\((.*)\))?/;
+              const results = pseudoClassRegex.exec(content);
+              if (results === null) throwError('TransformCssNames -> walkRules', 'pseudo-class selector did not match pseudo-class regex');
+              const label = results[1]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+              // if it is :i(xxx) or :ignore(xxx), pass through the internal part
+              // otherwise pass all through unaffected
+              if (label === 'i' || label === 'ignore') {
+                const inner = results[2]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+                if (inner !== undefined && inner !== '') {
+                  newSelectors.push(inner);
+                }
+              } else {
+                newSelectors.push(content);
               }
-            } else {
+            } else if (type === 'pseudo-element') {
+              newSelectors.push(content);
+            } else if (type === 'attribute') {
               newSelectors.push(content);
             }
-          } else if (type === 'pseudo-element') {
-            newSelectors.push(content);
-          } else if (type === 'attribute') {
-            newSelectors.push(content);
           }
+          newSelectorGroups.push(newSelectors.join(''));
         }
-        newSelectorGroups.push(newSelectors.join(''));
-      }
-      const newSelectorLine = newSelectorGroups.join(', ');
-      debug('new selector line', newSelectorLine);
-      debug('name for above line', names);
-      rule.selector = newSelectorLine;
-    });
-    //console.log("names", names)
-    //opts.outNames = names
+        const newSelectorLine = newSelectorGroups.join(', ');
+        debug('new selector line', newSelectorLine);
+        debug('name for above line', names);
+        rule.selector = newSelectorLine;
+      });
+      //console.log("names", names)
+      //opts.outNames = names
+    }
   };
-});
+};
+TransformCssNames.postcss = true;

package/dist/removeRecursive.d.ts

@@ -0,0 +1,2 @@
+export declare function removeRecursive(path: string): Promise<void>;
+//# sourceMappingURL=removeRecursive.d.ts.map

package/dist/removeRecursive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"removeRecursive.d.ts","sourceRoot":"","sources":["../src/removeRecursive.ts"],"names":[],"mappings":"AAOA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3D"}

package/dist/removeRecursive.js

@@ -0,0 +1,12 @@
+import { promises as fsPromises } from 'fs';
+// replaces the old rmfr dependency - node has covered this natively since 14.14
+// force: resolve quietly when the path is already gone, matching rm -rf
+// maxRetries: windows often holds handles on build output for a moment after a
+//   watcher or child process lets go, which surfaces as EBUSY/EPERM
+export function removeRecursive(path) {
+  return fsPromises.rm(path, {
+    recursive: true,
+    force: true,
+    maxRetries: 3
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "",
   "type": "module",
   "bin": {
@@ -98,7 +98,6 @@
     "@types/prop-types": "^15.7.15",
     "@types/react": "19.1.9",
     "@types/react-dom": "19.1.7",
-    "@types/rmfr": "^2.0.5",
     "@types/serialize-javascript": "^5.0.4",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",