@itee/tasks 1.3.2 → 1.4.0

package/sources/tests/benchmarks/compute-benchmarks.task.mjs

@@ -21,10 +21,10 @@ import {
 }                                  from '../../utils/loggings.mjs'
 import {
     getUnscopedPackageName,
+    iteePackageSourcesDirectory,
     packageNodeModulesDirectory,
     packageSourcesDirectory,
-    packageTestsBenchmarksDirectory,
-    packageTestsDirectory
+    packageTestsBenchmarksDirectory
 }                                  from '../../utils/packages.mjs'
 import { getTaskConfigurationFor } from '../../utils/tasks.mjs'
 import { toCamelCase }             from '../../utils/texts.mjs'
@@ -82,18 +82,17 @@ const computeBenchmarksTask       = async ( done ) => {
                     return false
                 }
 
-                // We don't care that data bloc have comment they are unused to generate benchmarks
-                // const undocumented = data.undocumented
-                // if ( undocumented ) {
-                //     return false
-                // }
-
                 const scope = data.scope
                 if ( ![ 'global', 'static' ].includes( scope ) ) {
                     return false
                 }
 
-                if ( longName.includes( ' ' ) || longName.includes( '~' ) || usedLongnames.includes( longName ) ) {
+                if ( longName.startsWith( '_' ) || longName.includes( ' ' ) || longName.includes( '~' ) || usedLongnames.includes( longName ) ) {
+                    return false
+                }
+
+                const memberOf = data.memberof || ''
+                if ( memberOf.includes( '.' ) ) {
                     return false
                 }
 
@@ -153,9 +152,9 @@ const computeBenchmarksTask       = async ( done ) => {
             }
 
             // compute relative level to get import wrappers
-            const wrapperDirPath          = relative( benchDirPath, packageTestsDirectory )
-            const importBenchmarkFilePath = join( wrapperDirPath, 'import.benchmarks.js' )
-            const importTestingFilePath   = join( wrapperDirPath, 'import.testing.js' )
+            const wrapperDirPath          = relative( benchDirPath, iteePackageSourcesDirectory )
+            const importBenchmarkFilePath = join( wrapperDirPath, 'utils', 'benchmarks.js' )
+            const importTestingFilePath   = join( wrapperDirPath, 'utils', 'testing.js' )
 
             const template = '' +
                 `import * as ${ nsName } from '${ importFilePath }'` + '\n' +

package/sources/tests/units/compute-unit-tests.task.mjs

@@ -23,10 +23,11 @@ import {
 import {
     getPrettyPackageName,
     getUnscopedPackageName,
+    iteePackageSourcesDirectory,
     packageNodeModulesDirectory,
     packageSourcesDirectory,
     packageTestsUnitsDirectory
-}                                  from '../../utils/packages.mjs'
+} from '../../utils/packages.mjs'
 import { getTaskConfigurationFor } from '../../utils/tasks.mjs'
 import {
     Indenter,
@@ -473,11 +474,17 @@ const computeUnitTestsTask       = async ( done ) => {
 
             }
 
+            const wrapperDirPath          = relative( unitDirPath, iteePackageSourcesDirectory )
+            const importTestingFilePath   = join( wrapperDirPath, 'utils', 'testing.js' )
+
             const template = '' +
                 `import { expect }       from 'chai'` + '\n' +
-                `import { Testing }      from 'itee-utils/sources/testings/benchmarks.js'` + '\n' +
+                `import { getTestingPackage } from '${ importTestingFilePath }'` + '\n' +
+                // `import { Testing }      from 'itee-utils/sources/testings/benchmarks.js'` + '\n' +
                 `import * as ${ nsName } from '${ importFilePath }'` + '\n' +
                 '\n' +
+                `const Testing   = await getTestingPackage()` + '\n' +
+                '\n' +
                 `describe( '${ unitName }', function () {` + '\n' +
                 '\n' +
                 `${ I_ }let _dataMap` + '\n' +

package/sources/utils/benchmarks.js

@@ -0,0 +1,18 @@
+/* global Benchmark */
+
+async function getBenchmarkPackage() {
+
+    let _Benchmark
+
+    if (typeof Benchmark === 'undefined' || Benchmark === undefined) {
+        const benchmarkPackage = await import('benchmark')
+        _Benchmark = benchmarkPackage.default
+    } else {
+        _Benchmark = Benchmark
+    }
+
+    return _Benchmark
+
+}
+
+export { getBenchmarkPackage }

package/sources/utils/builds.mjs

@@ -73,16 +73,14 @@ function computeBannerFor( format ) {
     const packageName    = getPrettyPackageName( '.' )
     const packageVersion = getPrettyPackageVersion()
     const prettyFormat   = getPrettyFormatForBanner( format )
-
-    const figText = figlet.textSync(
-        `${ packageName } ${ packageVersion } - ${ prettyFormat }`,
-        {
-            font:             'Tmplr',
-            horizontalLayout: 'default',
-            verticalLayout:   'default',
-            whitespaceBreak:  true,
-        }
-    )
+    const figletText     = `${ packageName } ${ packageVersion } - ${ prettyFormat }`
+    const figletOptions  = {
+        font:             'Tmplr',
+        horizontalLayout: 'default',
+        verticalLayout:   'default',
+        whitespaceBreak:  true,
+    }
+    const figText        = figlet.textSync( figletText, figletOptions )
 
     return convertBannerIntoComment( figText )
 
@@ -146,19 +144,15 @@ function createRollupConfigs( options = {} ) {
 
     const configs = []
 
-    for ( let formatIndex = 0, numberOfFormats = formats.length ; formatIndex < numberOfFormats ; ++formatIndex ) {
+    for ( const format of formats ) {
+        for ( const env of envs ) {
 
-        for ( let envIndex = 0, numberOfEnvs = envs.length ; envIndex < numberOfEnvs ; envIndex++ ) {
-
-            const env        = envs[ envIndex ]
             const isProd     = ( env.includes( 'prod' ) )
-            const format     = formats[ formatIndex ]
             const extension  = getOutputFileExtensionBasedOnFileFormat( format )
             const outputPath = ( isProd )
                                ? join( output, `${ fileName }.min.${ extension }` )
                                : join( output, `${ fileName }.${ extension }` )
-
-            configs.push( {
+            const config = {
                 input:    input,
                 external: ( format === 'cjs' ) ? [
                     'fs'
@@ -218,10 +212,10 @@ function createRollupConfigs( options = {} ) {
                     indent:  '\t',
                     strict:  true
                 }
-            } )
+            }
 
+            configs.push(config)
         }
-
     }
 
     return configs

package/sources/utils/tasks.mjs

@@ -9,14 +9,13 @@ import {
     relative
 }                      from 'node:path'
 import {
-    blue,
     cyan,
-    magenta,
     red,
 }                      from './colors.mjs'
 import { getJsonFrom } from './files.mjs'
 import { log }         from './loggings.mjs'
 import {
+    iteePackageRootDirectory,
     iteePackageSourcesDirectory,
     packageRootDirectory,
     packageTasksConfigurationsDirectory,
@@ -33,21 +32,11 @@ async function getTasksFrom( taskFiles = [] ) {
 
             const module = await import(taskFile)
 
-            const exportStrings = []
             for ( const moduleKey in module ) {
                 const task = module[ moduleKey ]
                 tasks.push( task )
-
-                const name         = task.name ?? null
-                const displayName  = task.displayName ?? null
-                const fullName     = ( moduleKey !== name ) ? `${ blue( moduleKey ) }( ${ magenta( name ) } )` : `${ blue( name ) }`
-                const exportAs     = ( displayName ) ? ` as ${ cyan( displayName ) }` : ''
-                const exportString = fullName + exportAs
-                exportStrings.push( exportString )
             }
 
-            //log( 'Process ', green( relativeTaskFile ), `with task${ ( exportStrings.length > 1 ) ? 's' : '' }`, exportStrings.join( ', ' ) )
-
         } catch ( error ) {
 
             log( 'Error   ', red( relativeTaskFile ), error.message )
@@ -79,7 +68,7 @@ async function parallelizeTasksFrom( taskFiles = [] ) {
 function getTaskConfigurationPathFor( filename ) {
 
     // Get relative path of the task between internal or user defined
-    let relativeTaskPath = filename.includes( iteePackageSourcesDirectory )
+    let relativeTaskPath = filename.includes( iteePackageRootDirectory )
                            ? relative( iteePackageSourcesDirectory, filename )
                            : relative( packageTasksDirectory, filename )
 
@@ -93,23 +82,24 @@ function getTaskConfigurationPathFor( filename ) {
         '.conf.mjs',
     ]
 
-    const packageConfigurationPaths = []
-    const defaultConfigurationPaths = []
-
+    // Generate all potential config file paths
+    const configurationPaths = []
     for ( const replaceValue of replaceValues ) {
         const configurationLocation    = relativeTaskPath.replace( searchValue, replaceValue )
         const packageConfigurationPath = join( packageTasksConfigurationsDirectory, configurationLocation )
-        const defaultConfigurationPath = join( iteePackageSourcesDirectory, configurationLocation )
 
-        packageConfigurationPaths.push( packageConfigurationPath )
-        defaultConfigurationPaths.push( defaultConfigurationPath )
+        configurationPaths.push( packageConfigurationPath )
     }
 
     // Take care of the configuration search order (package first then default !)
-    const configurationPaths = [ ...packageConfigurationPaths, ...defaultConfigurationPaths ]
-    let configurationPath    = undefined
+    const defaultConfigFilename = filename.includes( '.task.' )
+                                  ? filename.replace( '.task.', '.conf.' )
+                                  : filename.replace( '.mjs', '.conf.mjs' )
+
+    configurationPaths.push( defaultConfigFilename )
 
     // Looking for existing configuration file
+    let configurationPath = undefined
     for ( const packageConfigurationPath of configurationPaths ) {
 
         if ( existsSync( packageConfigurationPath ) ) {

package/sources/utils/testing.js

@@ -0,0 +1,11 @@
+async function getTestingPackage() {
+
+    const testingPackage = ( typeof global === 'undefined' )
+                           ? await import('itee-utils/sources/testings/benchmarks.js')
+                           : await import('itee-utils/builds/itee-utils.cjs')
+
+    return testingPackage.Testing
+
+}
+
+export { getTestingPackage }

package/sources/utils/texts.mjs

@@ -1,5 +1,11 @@
 import { unstyle } from './colors.mjs'
 
+/**
+ *
+ * @param {string} text
+ * @param {number} width
+ * @returns {string}
+ */
 function alignTextCenter( text, width ) {
 
     const unstyledText = unstyle( text.repeat( 1 ) )
@@ -19,6 +25,12 @@ function alignTextCenter( text, width ) {
 
 }
 
+/**
+ *
+ * @param {string} text
+ * @param {number} width
+ * @returns {string}
+ */
 function alignTextLeft( text, width ) {
 
     const unstyledText = unstyle( text.repeat( 1 ) )
@@ -29,6 +41,12 @@ function alignTextLeft( text, width ) {
 
 }
 
+/**
+ *
+ * @param {string} text
+ * @param {number} width
+ * @returns {string}
+ */
 function alignTextRight( text, width ) {
 
     const unstyledText = unstyle( text.repeat( 1 ) )
@@ -55,8 +73,14 @@ function IndenterFactory( indentationChar = '\t', indentationLevel = 5 ) {
 
 }
 
+/**
+ * @param {string} string
+ * @returns {string}
+ */
 function toCamelCase( string ) {
 
+    if(typeof string !== 'string') throw new TypeError(`Invalid type '${typeof string}' expect string.`)
+
     return string
         .trim()
         .toLowerCase()